Android deps update

BearWare · Oct 6, 2023 · 60ee1d9 · 60ee1d9
1 parent 0474871
commit 60ee1d9
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 152 deletions.
diff --git a/Client/TeamTalkAndroid/build.gradle b/Client/TeamTalkAndroid/build.gradle
@@ -8,21 +8,25 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.2'
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion '30.0.3'
-    compileSdkVersion 33
+    buildToolsVersion '33.0.1'
+    compileSdkVersion 34
     namespace 'dk.bearware.gui'
 
+    buildFeatures {
+        buildConfig = true
+    }
+
     defaultConfig {
         applicationId "dk.bearware.gui"
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 124
         versionName '5.14'
 
@@ -62,15 +66,16 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.code.gson:gson:2.10'
-    implementation 'androidx.annotation:annotation:1.5.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'androidx.core:core:1.9.0'
-    implementation 'androidx.fragment:fragment:1.5.4'
+    implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'androidx.annotation:annotation:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.core:core:1.12.0'
+    implementation 'androidx.fragment:fragment:1.6.0'
     implementation 'androidx.media:media:1.6.0'
-    implementation 'androidx.preference:preference:1.2.0'
+    implementation 'androidx.preference:preference:1.2.1'
     implementation 'androidx.viewpager:viewpager:1.0.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
     api "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
     implementation files('libs/TeamTalk5.jar')
 

diff --git a/Client/TeamTalkAndroid/gradle.properties b/Client/TeamTalkAndroid/gradle.properties
@@ -1,3 +1,4 @@
 android.useAndroidX=true
 android.enableJetifier=true
+android.nonFinalResIds=false
 org.gradle.jvmargs=-Xmx2048M
diff --git a/Client/TeamTalkAndroid/gradle/wrapper/gradle-wrapper.jar b/Client/TeamTalkAndroid/gradle/wrapper/gradle-wrapper.jar
diff --git a/Client/TeamTalkAndroid/gradle/wrapper/gradle-wrapper.properties b/Client/TeamTalkAndroid/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sun Apr 30 07:17:03 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists