Migrate gradle 8.2 => 8.5.2

BiglySoftware · Aug 17, 2024 · 347baf6 · 347baf6
1 parent ddba0eb
commit 347baf6
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 9 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/Android-DirectoryChooser b/Android-DirectoryChooser
diff --git a/BiglyBT-plugin-aercm b/BiglyBT-plugin-aercm
diff --git a/BiglyBT-plugin-mlDHT b/BiglyBT-plugin-mlDHT
diff --git a/BiglyBT-plugin-mlDHT-Java6/build.gradle b/BiglyBT-plugin-mlDHT-Java6/build.gradle
@@ -14,6 +14,7 @@ android {
     compileOptions {
         encoding = "UTF-8"
 
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -35,5 +36,6 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs_nio:${desugarVersion}"
     implementation project(path: ':core')
 }
diff --git a/app/build.gradle b/app/build.gradle
@@ -92,6 +92,7 @@ android {
     namespace 'com.biglybt.android.client'
     buildFeatures {
         aidl true
+        buildConfig true
     }
     bundle {
         language {

diff --git a/build.gradle b/build.gradle
@@ -31,7 +31,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.5.2'
         // https://github.com/KeepSafe/dexcount-gradle-plugin
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlin_version}"

diff --git a/gradle.properties b/gradle.properties
@@ -3,6 +3,5 @@ org.gradle.jvmargs=-Xmx5632M
 android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.warning.mode=all
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Aug 22 21:17:02 PDT 2023
+#Tue Aug 13 20:23:00 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/modules-with-root-src/aercm/build.gradle b/modules-with-root-src/aercm/build.gradle
@@ -15,6 +15,7 @@ android {
     compileOptions {
         encoding = "UTF-8"
 
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -54,5 +55,6 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs_nio:${desugarVersion}"
     implementation project(path: ':core')
 }
diff --git a/modules-with-root-src/azutp/build.gradle b/modules-with-root-src/azutp/build.gradle
@@ -22,6 +22,7 @@ android {
     compileOptions {
         encoding = "UTF-8"
 
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -55,5 +56,6 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs_nio:${desugarVersion}"
     implementation project(path: ':core')
 }
diff --git a/modules-with-root-src/xmwebui/build.gradle b/modules-with-root-src/xmwebui/build.gradle
@@ -22,6 +22,7 @@ android {
     compileOptions {
         encoding = "UTF-8"
 
+        coreLibraryDesugaringEnabled true
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
@@ -56,5 +57,6 @@ android {
 }
 
 dependencies {
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs_nio:${desugarVersion}"
     implementation project(path: ':core')
 }
+11 −0		com/aelitis/plugins/rcmplugin/RelatedContentUISWT.java
+147 −22		com/aelitis/plugins/rcmplugin/SBC_RCMView.java
+6 −5		com/aelitis/plugins/rcmplugin/columns/ColumnRC_Hash.java
+6 −1		com/aelitis/plugins/rcmplugin/columns/ColumnRC_New.java
+5 −1		com/aelitis/plugins/rcmplugin/internat/Messages.properties
+1 −1		plugin.properties