fix test apps

faberNovel · Dec 1, 2023 · c2f165c · c2f165c
1 parent af0d14d
commit c2f165c
Show file tree

Hide file tree

Showing 44 changed files with 21 additions and 1,064 deletions.
diff --git a/.ci/images_matrix.json b/.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"

diff --git a/tests/run_tests.sh b/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,13 @@ 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
-
-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
+  echo "Run android tests on Firebase Test Lab"
+  cd "$script_path"/test-firebase-test-lab
 
-  jenv global 17
-fi
+  setup_gradle_version
 
+  bundle install
+  bundle exec fastlane android integrated_test
+fi
 exit 0
diff --git a/tests/test-app-jdk-8/.gitignore b/tests/test-app-jdk-8/.gitignore
diff --git a/tests/test-app-jdk-8/.ruby-version b/tests/test-app-jdk-8/.ruby-version
diff --git a/tests/test-app-jdk-8/Gemfile b/tests/test-app-jdk-8/Gemfile
diff --git a/tests/test-app-jdk-8/Gemfile.lock b/tests/test-app-jdk-8/Gemfile.lock
diff --git a/tests/test-app-jdk-8/app/.gitignore b/tests/test-app-jdk-8/app/.gitignore
diff --git a/tests/test-app-jdk-8/app/build.gradle b/tests/test-app-jdk-8/app/build.gradle
diff --git a/tests/test-app-jdk-8/app/proguard-rules.pro b/tests/test-app-jdk-8/app/proguard-rules.pro
diff --git a/...test-app-jdk-8/app/src/androidTest/java/com/fabernovel/testapp/ExampleInstrumentedTest.kt b/...test-app-jdk-8/app/src/androidTest/java/com/fabernovel/testapp/ExampleInstrumentedTest.kt