update gradle 8.2.0 and kotlin 1.9.21 (#3438)

* update kotlin 1.9.21 and gradle 8.2.0 * update kotlincompiler 1.5.6 * Modify override method
dhis2 · Dec 15, 2023 · 3a9ad89 · 3a9ad89
1 parent b1f5872
commit 3a9ad89
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 23 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -183,6 +183,7 @@ android {
         compose = true
         dataBinding = true
         viewBinding = true
+        buildConfig = true
     }
 
     configurations.all {

diff --git a/app/src/androidTest/java/org/dhis2/common/coroutine/DispatcherTestingModule.kt b/app/src/androidTest/java/org/dhis2/common/coroutine/DispatcherTestingModule.kt
diff --git a/app/src/androidTest/java/org/dhis2/common/preferences/PreferencesTestingModule.kt b/app/src/androidTest/java/org/dhis2/common/preferences/PreferencesTestingModule.kt
@@ -12,7 +12,7 @@ class PreferencesTestingModule : PreferenceModule() {
 
     @Provides
     @Singleton
-    override fun preferenceProvider(context: Context): PreferenceProvider {
+    fun providePreferenceProvider(context: Context): PreferenceProvider {
         return PreferenceTestingImpl(context)
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -34,6 +34,5 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 
 android.suppressUnsupportedCompileSdk=32
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,10 +4,10 @@ sdk = "34"
 minSdk = "21"
 vCode = "128"
 vName = "2.9.1-DEV"
-kotlinCompilerExtensionVersion = "1.5.4"
+kotlinCompilerExtensionVersion = "1.5.6"
 
-gradle = "8.1.3"
-kotlin = '1.9.20'
+gradle = "8.2.0"
+kotlin = '1.9.21'
 hilt = '2.47'
 hiltCompiler = '1.0.0'
 jacoco = '0.8.10'