From d6350afe3a83e17313b34340e8ff3bd4d56ae63f Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 12 Jul 2025 14:01:05 +0300 Subject: [PATCH] Upgrade target sdk --- app/build.gradle | 4 ++-- app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt | 4 +++- .../koitharu/kotatsu/core/ui/dialog/RememberCheckListener.kt | 2 +- .../org/koitharu/kotatsu/reader/ui/ScrollTimerControlView.kt | 2 +- .../koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt | 2 +- .../kotlin/org/koitharu/kotatsu/stats/ui/StatsActivity.kt | 4 ++-- gradle/libs.versions.toml | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 77039c78a..8c4c64798 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,14 +11,14 @@ plugins { } android { - compileSdk = 35 + compileSdk = 36 buildToolsVersion = '35.0.0' namespace = 'org.koitharu.kotatsu' defaultConfig { applicationId 'org.koitharu.kotatsu' minSdk = 21 - targetSdk = 35 + targetSdk = 36 versionCode = 1023 versionName = '9.0.1' generatedDensities = [] diff --git a/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt b/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt index ba3af3868..5c5718522 100644 --- a/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt +++ b/app/src/debug/kotlin/org/koitharu/kotatsu/KotatsuApp.kt @@ -56,7 +56,9 @@ class KotatsuApp : BaseApp() { detectLeakedSqlLiteObjects() detectLeakedClosableObjects() detectLeakedRegistrationObjects() - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) detectContentUriWithoutPermission() + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + detectContentUriWithoutPermission() + } detectFileUriExposure() penaltyLog() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && notifier != null) { diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/RememberCheckListener.kt b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/RememberCheckListener.kt index 572fbee70..14ea7e52e 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/RememberCheckListener.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/core/ui/dialog/RememberCheckListener.kt @@ -10,7 +10,7 @@ class RememberCheckListener( var isChecked: Boolean = initialValue private set - override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { + override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { this.isChecked = isChecked } } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ScrollTimerControlView.kt b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ScrollTimerControlView.kt index dba4d8838..eefee8574 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ScrollTimerControlView.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/reader/ui/ScrollTimerControlView.kt @@ -105,7 +105,7 @@ class ScrollTimerControlView @JvmOverloads constructor( updateDescription() } - override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { + override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { scrollTimer?.setActive(isChecked) } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt index e7ca825e0..1addb5ff3 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/settings/protect/ProtectSetupActivity.kt @@ -81,7 +81,7 @@ class ProtectSetupActivity : } } - override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { + override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { viewModel.setBiometricEnabled(isChecked) } diff --git a/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsActivity.kt b/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsActivity.kt index f0684ad35..f2b789971 100644 --- a/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsActivity.kt +++ b/app/src/main/kotlin/org/koitharu/kotatsu/stats/ui/StatsActivity.kt @@ -129,8 +129,8 @@ class StatsActivity : BaseActivity(), } } - override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) { - val category = buttonView?.tag as? FavouriteCategory ?: return + override fun onCheckedChanged(buttonView: CompoundButton, isChecked: Boolean) { + val category = buttonView.tag as? FavouriteCategory ?: return viewModel.setCategoryChecked(category, isChecked) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 717cbb7b2..c5b4478cb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ desugar = "2.1.5" diskLruCache = "1.5" documentfile = "1.1.0" fragment = "1.8.8" -gradle = "8.10.1" +gradle = "8.11.1" guava = "33.4.8-android" hilt = "1.2.0" json = "20250517" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef77a4518..8591e54d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,6 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists