Merge pull request #1032 from ZeusWPI/chore/bump-v35

Bump to API level 35
ZeusWPI · Jan 12, 2025 · 1d689ae · 1d689ae
2 parents ee543cd + e8b6b44
commit 1d689ae
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,6 +18,9 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: 'gradle'
+      # TODO: remove once no longer using RC
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Test with Gradle
         run: ./gradlew ${{ matrix.command }}
   lint:
@@ -31,6 +34,9 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: 'gradle'
+      # TODO: remove once no longer using RC
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Lint with Gradle
         run: ./gradlew lint
   build:
@@ -47,6 +53,9 @@ jobs:
           java-version: 17
           distribution: temurin
           cache: 'gradle'
+      # TODO: remove once no longer using RC
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
       - name: Set up secrets.properties
         run: echo "$SECRETS_PROPERTIES" | base64 --decode > app/secrets.properties
         env:

diff --git a/android-versions.toml b/android-versions.toml
@@ -3,7 +3,7 @@
 # IMPORTANT: this file is read as a "Java Properties file" by Gradle
 #            AND as a "TOML file" by Nix. So it needs to be valid in both.
 # Since properties strings are not quoted, we unquote the values in Gradle.
-cmdLineToolsVersion = "12.0-rc15"
-platformToolsVersion = "34.0.5"
-buildToolsVersions = "34.0.0"
-platformVersions = "34"
+cmdLineToolsVersion = "16.0-rc01"
+platformToolsVersion = "35.0.2"
+buildToolsVersions = "35.0.0-rc4"
+platformVersions = "35"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -45,7 +45,7 @@ android {
         compileSdk = versions.getProperty("platformVersions").toInt()
         applicationId = "be.ugent.zeus.hydra"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 37300
         versionName = "3.7.3"
         vectorDrawables.useSupportLibrary = true

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -26,7 +26,7 @@
             platformToolsVersion = androidVersions.platformToolsVersion;
             buildToolsVersions = [ androidVersions.buildToolsVersions ];
             includeEmulator = true;
-            emulatorVersion = "34.1.9";
+            emulatorVersion = "35.2.5";
             includeSystemImages = true;
             systemImageTypes = [ "google_apis_playstore" ];
             abiVersions = [ "x86_64" ];
@@ -49,7 +49,7 @@
           hydra-android = pkgs.devshell.mkShell {
             name = "hydra-android";
             packages = [
-              androidComposition.androidsdk pkgs.jdk11 pkgs.git pkgs.androidStudioPackages.beta
+              androidComposition.androidsdk pkgs.jdk11 pkgs.git
             ];
             env = [
               {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,15 +5,15 @@ livedata = '2.8.7'
 okhttp3 = '4.12.0'
 recordbuilder = '44'
 room = '2.6.1'
-buildtool = '8.5.2'
+buildtool = "8.7.3"
 
 [libraries]
 android-build-tool = { module = 'com.android.tools.build:gradle', version.ref = 'buildtool' }
 androidx-appcompat = { module = 'androidx.appcompat:appcompat', version = '1.7.0' }
 androidx-browser = { module = 'androidx.browser:browser', version = '1.8.0' }
 androidx-cardview = { module = 'androidx.cardview:cardview', version = '1.0.0' }
 androidx-constraintlayout = { module = 'androidx.constraintlayout:constraintlayout', version = '2.2.0' }
-androidx-core = { module = 'androidx.core:core', version = '1.13.1' }
+androidx-core = { module = 'androidx.core:core', version = '1.15.0' }
 androidx-core-testing = { module = 'androidx.arch.core:core-testing', version = '2.2.0' }
 androidx-espresso-contrib = { module = 'androidx.test.espresso:espresso-contrib', version.ref = 'espresso' }
 androidx-espresso-core = { module = 'androidx.test.espresso:espresso-core', version.ref = 'espresso' }
@@ -50,7 +50,7 @@ junit = { module = 'junit:junit', version = '4.13.2' }
 leakcanary = { module = 'com.squareup.leakcanary:leakcanary-android', version = '2.14' }
 material = { module = 'com.google.android.material:material', version = '1.12.0' }
 materialvalues = { module = 'com.github.esnaultdev:MaterialValues', version = 'v1.1.1' }
-mockito-core = { module = 'org.mockito:mockito-core', version = '5.14.2' }
+mockito-core = { module = 'org.mockito:mockito-core', version = '5.15.2' }
 mockito-inline = { module = 'org.mockito:mockito-inline', version = '5.2.0' }
 moshi = { module = 'com.squareup.moshi:moshi', version = '1.15.2' }
 okhttp3 = { module = 'com.squareup.okhttp3:okhttp', version.ref = 'okhttp3' }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME