Add support for API 34

.ci/images_matrix.json

@@ -1,13 +1,5 @@
 {
     "android_api": [
-        {
-            "api": 28,
-            "build_tools": "28.0.3"
-        },
-        {
-            "api": 29,
-            "build_tools": "29.0.3"
-        },
         {
             "api": 30,
             "build_tools": "30.0.3"
@@ -24,6 +16,10 @@
         {
             "api": 33,
             "build_tools": "33.0.1"
+        },
+        {
+            "api": 34,
+            "build_tools": "34.0.0"
         }
     ],
     "android_ndk": [

.github/workflows/daily_runner.yml

@@ -10,7 +10,7 @@ jobs:
       options: --name=runner
     strategy:
       matrix:
-        android_api: [{ "api": 30, "build_tools": "30.0.3" }, { "api": 31, "build_tools": "32.0.0" }]
+        android_api: [{ "api": 33, "build_tools": "33.0.1" }, { "api": 34, "build_tools": "34.0.0" }]
         android_ndk: ["--android-ndk"]
     steps:
       - name: Checkout

Dockerfile

@@ -99,10 +99,10 @@ RUN if [ "$gcloud" = true ] ; \
 ## Install Android SDK
 ARG sdk_version=commandlinetools-linux-6200805_latest.zip
 ARG android_home=/opt/android/sdk
-ARG android_api=android-33
-ARG android_build_tools=33.0.1
+ARG android_api=android-34
+ARG android_build_tools=34.0.0
 ARG android_ndk=false
-ARG ndk_version=25.1.8937393
+ARG ndk_version=26.1.10909125
 ARG cmake=3.22.1
 RUN mkdir -p ${android_home} && \
     wget --quiet --output-document=/tmp/${sdk_version} https://dl.google.com/android/repository/${sdk_version} && \

tests/run_tests.sh

@@ -64,7 +64,6 @@ export BUILD_TOOLS_VERSION="$android_build_tools"
 export MIN_SDK_VERSION=21
 export TARGET_SDK_VERSION="$android_api"
 export NDK_VERSION="21.0.6113669"
-jenv global 17
 
 setup_gradle_version() {
   if grep -q "distributionUrl" ./gradle/wrapper/gradle-wrapper.properties; then
@@ -88,6 +87,7 @@ exec_test() {
 ruby -v
 eval "$(jenv init -)"
 
+jenv global 17
 if [ "$android_ndk" = true ]; then
   echo "Running tests with ndk"
   exec_test "$script_path"/test-app-ndk
@@ -97,22 +97,12 @@ else
 fi
 
 if [ "$large_test" = true ]; then
-    echo "Run android tests on Firebase Test Lab"
-    cd "$script_path"/test-firebase-test-lab
-
-    setup_gradle_version
-
-    bundle install
-    bundle exec fastlane android integrated_test
-fi
+  echo "Run android tests on Firebase Test Lab"
+  cd "$script_path"/test-firebase-test-lab
 
-if (( "$android_api" < 31 )); then
-  export GRADLE_VERSION="5.6.4"
-  export ANDROID_GRADLE_TOOLS_VERSION="3.6.1"
-  jenv global 1.8
-  exec_test "$script_path"/test-app-jdk-8
+  setup_gradle_version
 
-  jenv global 17
+  bundle install
+  bundle exec fastlane android integrated_test
 fi
-
 exit 0