From 5b8e8d76c0206526d2c6ff4cdfb66694f254ac1d Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 19 Sep 2020 17:27:45 +0300 Subject: [PATCH] Update target sdk --- .travis.yml | 6 ++--- app/build.gradle | 6 ++--- .../kotatsu/ui/browser/BrowserClient.kt | 2 +- gradle.properties | 22 ++++++++----------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index d115074a6..134c73e58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ jdk: android: components: - tools - - platform-tools-29.0.6 - - build-tools-29.0.3 - - android-29 + - platform-tools-30.0.3 + - build-tools-30.0.2 + - android-30 licenses: - android-sdk-preview-license-.+ - android-sdk-license-.+ diff --git a/app/build.gradle b/app/build.gradle index 0afaa2f91..7e067da10 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,13 +8,13 @@ plugins { def gitCommits = 'git rev-list --count HEAD'.execute([], rootDir).text.trim().toInteger() android { - compileSdkVersion 29 - buildToolsVersion '29.0.3' + compileSdkVersion 30 + buildToolsVersion '30.0.2' defaultConfig { applicationId 'org.koitharu.kotatsu' minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 30 versionCode gitCommits versionName '0.5.1' diff --git a/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt b/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt index 842c712f6..8245b2dbd 100644 --- a/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt +++ b/app/src/main/java/org/koitharu/kotatsu/ui/browser/BrowserClient.kt @@ -27,7 +27,7 @@ class BrowserClient(private val callback: BrowserCallback) : WebViewClient(), Ko override fun onPageCommitVisible(view: WebView, url: String?) { super.onPageCommitVisible(view, url) - callback.onTitleChanged(view.title, url) + callback.onTitleChanged(view.title.orEmpty(), url) } override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?) = false diff --git a/gradle.properties b/gradle.properties index 9bb9f66db..0f9f36415 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,18 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit +## For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app"s APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Automatically convert third-party libraries to use AndroidX +#Sat Sep 19 17:19:33 EEST 2020 android.enableJetifier=true -# Kotlin code style for this project: "official" or "obsolete": +android.nonTransitiveRClass=true +android.useAndroidX=true kotlin.code.style=official -android.nonTransitiveRClass=true \ No newline at end of file +org.gradle.jvmargs=-Xmx1536M -Dkotlin.daemon.jvm.options\="-Xmx1536M"