update kotlin and gradle

YouROK · Jan 13, 2024 · fc79839 · fc79839
1 parent 1785ecb
commit fc79839
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,7 +13,6 @@ android {
         minSdkVersion 17
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 28
-        // for older androids
         multiDexEnabled true
         versionCode 129
         versionName "MatriX.129.Client"
@@ -35,6 +34,9 @@ android {
         resources.excludes += "DebugProbesKt.bin"
     }
     namespace 'ru.yourok.torrserve'
+    buildFeatures {
+        buildConfig true
+    }
 }
 
 dependencies {
@@ -48,15 +50,20 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.tvprovider:tvprovider:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
-    implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
+    def lifecycleVersion = '2.6.2' // 2.6.2 last api17 compatible
+    //noinspection GradleDependency
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:${lifecycleVersion}"
+    //noinspection GradleDependency
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${lifecycleVersion}"
+    //noinspection GradleDependency
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:${lifecycleVersion}"
+    //noinspection GradleDependency
+    implementation "androidx.lifecycle:lifecycle-process:${lifecycleVersion}"
     implementation 'com.google.android.material:material:1.11.0'
     implementation 'com.google.android.flexbox:flexbox:3.0.0'
     implementation('org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3')
     // http client/parser
-    //noinspection GradleDependency 1.16.2, 1.17.1 thorow java.lang.VerifyError on api19
+    //noinspection GradleDependency 1.16.2, 1.17.1, 1.17.2 thorow java.lang.VerifyError on api19
     implementation 'org.jsoup:jsoup:1.16.1'
     // json serializer
     //noinspection GradleDependency 2.10.1 thorow java.lang.VerifyError on api17

diff --git a/build.gradle b/build.gradle
@@ -1,20 +1,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.9.0"
+    ext.kotlin_version = "1.9.22"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"
         classpath 'com.google.gms:google-services:4.4.0'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
     }
 }
 
 plugins {
-    id 'com.google.devtools.ksp' version "${kotlin_version}-1.0.13" apply false
+    id 'com.google.devtools.ksp' version "${kotlin_version}-1.0.16" apply false
     id 'org.jetbrains.kotlin.android' version "${kotlin_version}" apply false
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,6 +17,5 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false