gradle update + fixed compilation issues

tinode · Oct 3, 2023 · 3774084 · 3774084
1 parent cb472ab
commit 3774084
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -87,7 +87,8 @@ dependencies {
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
-    implementation 'androidx.emoji2:emoji2:1.4.0'
+    // noinspection GradleDependency: 1.4 requires API 34
+    implementation 'androidx.emoji2:emoji2:1.3.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'androidx.fragment:fragment:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
@@ -131,5 +132,8 @@ dependencies {
 configurations {
     configureEach {
         exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
+        resolutionStrategy {
+            force 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10'
+        }
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         maven { url 'https://maven.google.com/' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
 
         // For FCM push notifications
         classpath 'com.google.gms:google-services:4.4.0'

diff --git a/gradle.properties b/gradle.properties
@@ -16,4 +16,7 @@ org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryErr
 # 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
-android.useAndroidX=true
+android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Mar 26 18:06:59 PDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME