Update SDK to 34 (#2322)

app/build.gradle

@@ -20,13 +20,13 @@ apply from: 'hooks.gradle'
 
 android {
     namespace 'io.github.wulkanowy'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "io.github.wulkanowy"
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 133
         versionName "2.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -199,9 +199,9 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.10.1"
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.core:core-splashscreen:1.0.1'
-    implementation "androidx.activity:activity-ktx:1.7.2"
+    implementation "androidx.activity:activity-ktx:1.8.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.fragment:fragment-ktx:1.6.1"
     implementation "androidx.annotation:annotation:1.7.0"

app/jacoco.gradle

@@ -1,16 +1,16 @@
 apply plugin: "jacoco"
 
 jacoco {
-    toolVersion "0.8.7"
+    toolVersion "0.8.10"
     reportsDirectory.set(file("$buildDir/reports"))
 }
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
-task jacocoTestReport(type: JacocoReport) {
+tasks.register('jacocoTestReport', JacocoReport) {
 
     group = "Reporting"
     description = "Generate Jacoco coverage reports"

app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedFragment.kt

@@ -35,7 +35,7 @@ class AdvancedFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_advanced, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/settings/advanced/AdvancedPresenter.kt

@@ -18,7 +18,8 @@ class AdvancedPresenter @Inject constructor(
         Timber.i("Settings advanced view was initialized")
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
         analytics.logEvent("setting_changed", "name" to key)
     }

app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearanceFragment.kt

@@ -39,7 +39,7 @@ class AppearanceFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_appearance, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/settings/appearance/AppearancePresenter.kt

@@ -22,7 +22,8 @@ class AppearancePresenter @Inject constructor(
         Timber.i("Settings appearance view was initialized")
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
 
         preferencesRepository.apply {

app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsFragment.kt

@@ -114,7 +114,7 @@ class NotificationsFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_notifications, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/settings/notifications/NotificationsPresenter.kt

@@ -38,7 +38,8 @@ class NotificationsPresenter @Inject constructor(
         Timber.i("Settings notifications view was initialized")
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
 
         preferencesRepository.apply {

app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncFragment.kt

@@ -52,7 +52,7 @@ class SyncFragment : PreferenceFragmentCompat(),
         setPreferencesFromResource(R.xml.scheme_preferences_sync, rootKey)
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
         presenter.onSharedPreferenceChanged(key)
     }
 

app/src/main/java/io/github/wulkanowy/ui/modules/settings/sync/SyncPresenter.kt

@@ -31,7 +31,8 @@ class SyncPresenter @Inject constructor(
         setSyncDateInView()
     }
 
-    fun onSharedPreferenceChanged(key: String) {
+    fun onSharedPreferenceChanged(key: String?) {
+        key ?: return
         Timber.i("Change settings $key")
 
         preferencesRepository.apply {
@@ -52,10 +53,12 @@ class SyncPresenter @Inject constructor(
                         Timber.i("Setting sync now started")
                         analytics.logEvent("sync_now", "status" to "started")
                     }
+
                     WorkInfo.State.SUCCEEDED -> {
                         showMessage(syncSuccessString)
                         analytics.logEvent("sync_now", "status" to "success")
                     }
+
                     WorkInfo.State.FAILED -> {
                         showError(
                             syncFailedString,
@@ -66,6 +69,7 @@ class SyncPresenter @Inject constructor(
                         )
                         analytics.logEvent("sync_now", "status" to "failed")
                     }
+
                     else -> Timber.d("Sync now state: ${workInfo?.state}")
                 }
                 if (workInfo?.state?.isFinished == true) {

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
     ext {
         kotlin_version = '1.9.10'
-        about_libraries = '10.9.0'
+        about_libraries = '10.9.1'
-        hilt_version = "2.48"
+        hilt_version = '2.48.1'
     }
     repositories {
         mavenCentral()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -130,11 +130,14 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
+fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then

settings.gradle

@@ -1,4 +1 @@
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
-}
 include ':app'