From 86fca0e14bc45066822c2c693547dbdf9a360693 Mon Sep 17 00:00:00 2001 From: gdeluna-branch Date: Wed, 12 Jul 2023 11:53:51 -0700 Subject: [PATCH] chore(dep):Revert annotations version and update instrumented tests gh runner api level to 34 (#1075) --- .github/workflows/unit-and-instrumented-tests-action.yml | 7 ++++--- Branch-SDK/build.gradle.kts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/unit-and-instrumented-tests-action.yml b/.github/workflows/unit-and-instrumented-tests-action.yml index a5660c802..b3d38dd4c 100644 --- a/.github/workflows/unit-and-instrumented-tests-action.yml +++ b/.github/workflows/unit-and-instrumented-tests-action.yml @@ -2,7 +2,7 @@ name: unit-and-instrumented-tests on: [push] env: API_MIN: 21 - API_CURRENT: 33 + API_CURRENT: 34 JAVA_DISTRIBUTION: 'corretto' JAVA_VERSION: '17' jobs: @@ -96,8 +96,9 @@ jobs: - name: Create Android emulator run: | echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --licenses - echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install "system-images;android-"$API_CURRENT";google_apis;x86_64" - echo "no" | $ANDROID_HOME/tools/bin/avdmanager --verbose create avd --force --name test --package "system-images;android-"$API_CURRENT";google_apis;x86_64" + echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install "system-images;android-"$API_CURRENT";google_apis_playstore;x86_64" + echo "no" | $ANDROID_HOME/tools/bin/avdmanager list device + echo "no" | $ANDROID_HOME/tools/bin/avdmanager --verbose create avd --force --name test --package "system-images;android-"$API_CURRENT";google_apis_playstore;x86_64" # boots and waits for the emulator to be ready - name: Launch Emulator run: | diff --git a/Branch-SDK/build.gradle.kts b/Branch-SDK/build.gradle.kts index 98bacb818..d6c3c9bdd 100644 --- a/Branch-SDK/build.gradle.kts +++ b/Branch-SDK/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to "*.jar"))) implementation(kotlin("stdlib")) implementation(kotlin("stdlib-jdk8")) - implementation("androidx.annotation:annotation:1.6.0") + implementation("androidx.annotation:annotation:1.4.0") implementation("com.android.installreferrer:installreferrer:2.2") // --- optional dependencies -----