Update gradle and dependencies

WSTxda · Sep 29, 2024 · bab8e76 · bab8e76
1 parent d83dd6f
commit bab8e76
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 31 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,28 +11,28 @@ buildscript {
     ext.appcompatVersion = '1.7.0'
     ext.biometricVersion = '1.1.0'
     ext.coreVersion = '1.13.1'
-    ext.fragmentVersion = '1.8.2'
-    ext.lifecycleVersion = '2.8.4'
+    ext.fragmentVersion = '1.8.3'
+    ext.lifecycleVersion = '2.8.6'
     ext.loaderVersion = '1.1.0'
     ext.materialVersion = '1.12.0'
     ext.mediarouterVersion = '1.7.0'
     ext.multidexVersion = '2.0.1'
-    ext.navigationVersion = '2.7.7'
+    ext.navigationVersion = '2.8.1'
     ext.preferenceVersion = '1.2.1'
     ext.recyclerviewVersion = '1.3.2'
-    ext.webkitVersion = '1.11.0'
+    ext.webkitVersion = '1.12.0'
 
     ext.coroutineVersion = '1.8.1'
-    ext.kotlinVersion = '2.0.0'
+    ext.kotlinVersion = '2.0.20'
 
     ext.cronetVersion = '119.6045.31'
     ext.okhttpVersion = '4.12.0'
     ext.slf4jVersion = '2.0.16'
     ext.volleyVersion = '1.2.1'
     ext.wearableVersion = '0.1.1'
-    ext.wireVersion = '5.0.0'
+    ext.wireVersion = '5.1.0'
 
-    ext.androidBuildGradleVersion = '8.5.1'
+    ext.androidBuildGradleVersion = '8.6.0'
 
     ext.androidBuildVersionTools = '34.0.0'
 

diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle
@@ -27,7 +27,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services-auth-base/build.gradle b/play-services-auth-base/build.gradle
@@ -18,7 +18,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services-auth/build.gradle b/play-services-auth/build.gradle
@@ -18,7 +18,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle
@@ -34,7 +34,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 

diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle
@@ -46,7 +46,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
         buildConfigField "int", "VERSION_CODE", "$appVersionCode"

diff --git a/play-services-cast-framework/build.gradle b/play-services-cast-framework/build.gradle
@@ -18,7 +18,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 

diff --git a/play-services-cast/build.gradle b/play-services-cast/build.gradle
@@ -21,7 +21,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services-conscrypt-provider-core/build.gradle b/play-services-conscrypt-provider-core/build.gradle
@@ -18,7 +18,6 @@ android {
     buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
@@ -89,9 +89,6 @@ android {
         }
     }
 
-    lintOptions {
-        disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'UniquePermission'
-    }
 
     buildTypes {
         release {
@@ -121,10 +118,15 @@ android {
     }
 
     packagingOptions {
-        exclude 'META-INF/ASL2.0'
         jniLibs {
             useLegacyPackaging true
         }
+        resources {
+            excludes += ['META-INF/ASL2.0']
+        }
+    }
+    lint {
+        disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag', 'UniquePermission'
     }
 }
 

diff --git a/play-services-core/microg-ui-tools/build.gradle b/play-services-core/microg-ui-tools/build.gradle
@@ -23,7 +23,6 @@ android {
     buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 
@@ -35,13 +34,12 @@ android {
         targetCompatibility = 1.8
     }
 
-    lintOptions {
-        // TODO: Remove MissingTranslation once we have stable strings and proper translations.
-        disable 'MissingTranslation'
-    }
     buildFeatures {
         buildConfig true
     }
+    lint {
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {

diff --git a/play-services-gcm/build.gradle b/play-services-gcm/build.gradle
@@ -12,7 +12,6 @@ android {
     buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 

diff --git a/play-services-gmscompliance/build.gradle b/play-services-gmscompliance/build.gradle
@@ -18,7 +18,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services-iid/build.gradle b/play-services-iid/build.gradle
@@ -16,7 +16,6 @@ android {
     }
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
 

diff --git a/play-services-tasks/build.gradle b/play-services-tasks/build.gradle
@@ -14,7 +14,6 @@ android {
     buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }

diff --git a/play-services/build.gradle b/play-services/build.gradle
@@ -23,7 +23,6 @@ android {
     buildToolsVersion "$androidBuildVersionTools"
 
     defaultConfig {
-        versionName version
         minSdkVersion androidMinSdk
         targetSdkVersion androidTargetSdk
     }
@@ -32,10 +31,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    lintOptions {
+    lint {
         disable 'InvalidPackage'
     }
+
 }
 
 dependencies {