Update Gradle, AGP, and dependencies (#83)

* Update Gradle, AGP, and dependencies * Update JDK to 17
solana-mobile · Oct 7, 2024 · 0b72f0a · 0b72f0a
1 parent 612792b
commit 0b72f0a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 28 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -17,10 +17,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'temurin'
           cache: gradle
 

diff --git a/build.gradle b/build.gradle
@@ -4,10 +4,10 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
-    id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
+    id 'com.android.application' version '8.7.0' apply false
+    id 'com.android.library' version '8.7.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
+    id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
 }
 
 nexusPublishing {

diff --git a/digitalassetlinks/build.gradle b/digitalassetlinks/build.gradle
@@ -4,18 +4,18 @@
 
 plugins {
     id 'com.android.library'
-    id 'com.google.protobuf' version "0.9.4"
+    id 'com.google.protobuf' version '0.9.4'
     id 'maven-publish'
     id 'signing'
 }
 
 android {
     namespace = 'com.solana.digitalassetlinks'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         minSdk 23
-        targetSdk 33
+        targetSdk 34
 
         consumerProguardFiles "consumer-rules.pro"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -107,14 +107,8 @@ signing {
 
 protobuf {
     protoc {
-        def archSuffix = ''
-        if (osdetector.os == "osx") {
-            // Workaround: there are no published protoc binaries for Apple Silicon-based macs.
-            // Apply a manual architecture to the artifact to select the osx-x86_64 variant, which
-            // runs fine with Rosetta.
-            archSuffix = ':osx-x86_64'
-        }
-        artifact = "com.google.protobuf:protoc:3.23.1$archSuffix"   // Download from repositories
+        def protoc_ver = '4.28.2'
+        artifact = "com.google.protobuf:protoc:$protoc_ver"   // Download from repositories
     }
     generateProtoTasks {
         all().each { task ->
@@ -147,13 +141,14 @@ tasks.whenTaskAdded { task ->
 }
 
 dependencies {
-    compileOnly 'androidx.annotation:annotation:1.6.0'
-    testImplementation 'com.google.protobuf:protobuf-java:3.25.2'
+    compileOnly 'androidx.annotation:annotation:1.8.2'
+    testImplementation 'androidx.annotation:annotation:1.8.2'
+    testImplementation 'com.google.protobuf:protobuf-java:4.28.2'
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-inline:5.2.0'
-    testImplementation 'org.robolectric:robolectric:4.11.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
+    testImplementation 'org.robolectric:robolectric:4.13'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
     androidTestImplementation 'junit:junit:4.13.2'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%