diff --git a/.github/workflows/run-mobileboost-tests.yml b/.github/workflows/run-mobileboost-tests.yml new file mode 100644 index 000000000..d69779cbe --- /dev/null +++ b/.github/workflows/run-mobileboost-tests.yml @@ -0,0 +1,40 @@ +name: Run MobileBoost Tests on PR + +on: + pull_request: + types: [opened, reopened] + workflow_dispatch: + +jobs: + build-and-test: + runs-on: macos-latest + + steps: + - name: Check out repository code + uses: actions/checkout@v2 + + - name: Navigate to TestBed Directory + run: cd Branch-SDK-TestBed + + - name: Setup java for gradle + uses: actions/setup-java@v3 + with: + distribution: ${{ env.JAVA_DISTRIBUTION }} + java-version: ${{ env.JAVA_VERSION }} + + - name: Build Android App + run: ./gradlew Branch-SDK-TestBed:assembleDebug + + - name: Build Android App + run: ./gradlew Liking-Testbeds/DelayedInitTest:assembleDebug + + - name: Upload APK to Mobile Boost and Run Tests + run: | + curl -s https://app.mobileboost.io/cli.sh | tr -d '\r' | /bin/bash -s -- "$PWD/Branch-SDK-TestBed/build/outputs/apk/debug/Branch-SDK-TestBed-debug.apk" android + + curl -s https://app.mobileboost.io/cli.sh | tr -d '\r' | /bin/bash -s -- "$PWD/Liking-Testbeds/DelayedInitTest/build/outputs/apk/debug/DelayedInitTest-debug.apk" android + env: + API_ORG_KEY: ${{ secrets.MOBILEBOOST_API_ORG_KEY }} + API_KEY: ${{ secrets.MOBILEBOOST_API_ORG_KEY }} + TEST_TAGS: Android + shell: bash \ No newline at end of file diff --git a/.gitignore b/.gitignore index 78d51e209..e7e57561a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ Branch-SDK-TestBed/gradlew.bat Branch-SDK-TestBed/gradle/wrapper/gradle-wrapper.properties -.direnv \ No newline at end of file +.direnv +.secrets diff --git a/Branch-SDK-Automation-TestBed/build.gradle b/Branch-SDK-Automation-TestBed/build.gradle index 730c84a64..88c772163 100644 --- a/Branch-SDK-Automation-TestBed/build.gradle +++ b/Branch-SDK-Automation-TestBed/build.gradle @@ -17,7 +17,7 @@ android { } defaultConfig { applicationId "io.branch.branchandroiddemo" - minSdk 21 + minSdk 23 targetSdk 33 versionCode 1 versionName "1.0" diff --git a/Branch-SDK-TestBed/branchandroidtestbed.apk b/Branch-SDK-TestBed/branchandroidtestbed.apk new file mode 100644 index 000000000..ad14d83cb Binary files /dev/null and b/Branch-SDK-TestBed/branchandroidtestbed.apk differ diff --git a/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java b/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java index cc7d1a4d2..cacd97130 100644 --- a/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java +++ b/Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java @@ -451,6 +451,13 @@ public void onClick(View v) { } }); + findViewById(R.id.force_quit_btn).setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + System.exit(0); + } + }); + ((ToggleButton) findViewById(R.id.tracking_cntrl_btn)).setOnCheckedChangeListener((buttonView, isChecked) -> { Branch.getInstance().disableTracking(isChecked, (trackingDisabled, referringParams, error) -> { if (trackingDisabled) { diff --git a/Branch-SDK-TestBed/src/main/res/drawable/baseline_power_settings_new_24.xml b/Branch-SDK-TestBed/src/main/res/drawable/baseline_power_settings_new_24.xml new file mode 100644 index 000000000..ef216d231 --- /dev/null +++ b/Branch-SDK-TestBed/src/main/res/drawable/baseline_power_settings_new_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Branch-SDK-TestBed/src/main/res/layout/main_activity.xml b/Branch-SDK-TestBed/src/main/res/layout/main_activity.xml index 648c485c4..4d114b2f8 100644 --- a/Branch-SDK-TestBed/src/main/res/layout/main_activity.xml +++ b/Branch-SDK-TestBed/src/main/res/layout/main_activity.xml @@ -150,6 +150,14 @@ android:drawableStart="@drawable/ic_baseline_settings_24" android:layout_marginBottom="20dp" android:text="Settings" /> + +