From 4340c905de22c568007a5285b2dd59f5f6a93af5 Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 13:43:54 -0500 Subject: [PATCH 1/8] Add 'Welcome to BeePlus' message to MainActivity UI --- Android/BeePlus/app/src/main/res/layout/activity_main.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Android/BeePlus/app/src/main/res/layout/activity_main.xml b/Android/BeePlus/app/src/main/res/layout/activity_main.xml index cf7fe8a..724cfc8 100644 --- a/Android/BeePlus/app/src/main/res/layout/activity_main.xml +++ b/Android/BeePlus/app/src/main/res/layout/activity_main.xml @@ -78,6 +78,14 @@ android:layout_margin="12dp" android:orientation="vertical"> + + Date: Wed, 5 Nov 2025 13:47:46 -0500 Subject: [PATCH 2/8] Update Java version to 17 in GitHub Actions workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bab42f1..c696bee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle From a989d64675e5ff8a0a5e3281200861c5094c3a5e Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 13:52:48 -0500 Subject: [PATCH 3/8] Remove Firebase App Distribution plugin --- Android/BeePlus/app/build.gradle | 17 +++-------------- Android/BeePlus/build.gradle | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Android/BeePlus/app/build.gradle b/Android/BeePlus/app/build.gradle index 65df91e..4ec32f5 100644 --- a/Android/BeePlus/app/build.gradle +++ b/Android/BeePlus/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: 'com.android.application' -apply plugin: 'com.google.firebase.appdistribution' + android { compileSdkVersion 33 @@ -15,21 +15,10 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - firebaseAppDistribution { - appId="1:461235515410:android:c883034d281eb56a" - artifactType="APK" - releaseNotes="hi" - testers="abarone@google.com" - groups="mallard-group" - } + } debug { - firebaseAppDistribution { - // This app has AAB uploads enabled - appId="1:1095562434941:android:502210c4f11e5466269414" - testCases="case1,case2" - testDevices="model=MediumPhone.arm,version=34,orientation=portrait,locale=en_US" - } + } } namespace 'dev.firebase.beeplus' diff --git a/Android/BeePlus/build.gradle b/Android/BeePlus/build.gradle index e7981c4..5f14a2a 100644 --- a/Android/BeePlus/build.gradle +++ b/Android/BeePlus/build.gradle @@ -9,7 +9,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.3.2' classpath 'com.google.gms:google-services:4.4.2' - classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0' + // NOTE: Do not place your application dependencies here; they belong From 2e53378cf9c4764edb6b1e0978080745c2cffcf8 Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 13:59:47 -0500 Subject: [PATCH 4/8] Add step to run firebase command after build --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c696bee..3dc39c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,3 +23,9 @@ jobs: - name: Build with Gradle run: cd Android/BeePlus && ./gradlew build + + - name: Install Firebase CLI + run: npm install -g firebase-tools + + - name: Run Firebase command + run: firebase foobar Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk From a072a2c73f344989b72391604900070deb118f5e Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 14:04:44 -0500 Subject: [PATCH 5/8] Update Firebase command to appdistribution:test --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dc39c2..e9d91f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,4 +28,4 @@ jobs: run: npm install -g firebase-tools - name: Run Firebase command - run: firebase foobar Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk + run: firebase appdistribution:test --app 1:454576928400:android:7934c2af24bbeaca6eca15 --apk Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk From d7a79b6ad165f6888be98eaeab51d036229fda0d Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 14:12:29 -0500 Subject: [PATCH 6/8] Correct Firebase appdistribution:distribute command arguments --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e9d91f9..434d7ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,4 +28,4 @@ jobs: run: npm install -g firebase-tools - name: Run Firebase command - run: firebase appdistribution:test --app 1:454576928400:android:7934c2af24bbeaca6eca15 --apk Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk + run: firebase appdistribution:distribute Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk --app 1:454576928400:android:7934c2af24bbeaca6eca15 --test-devices "model=tokay,version=36,locale=en,orientation=portrait;" --test-case-ids=smoke-test From 356aeb34579ce7a90d21db9cad15267c50bc62f7 Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 14:19:51 -0500 Subject: [PATCH 7/8] Add Firebase authentication step to GitHub Actions workflow --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 434d7ac..0d8ace7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,5 +27,10 @@ jobs: - name: Install Firebase CLI run: npm install -g firebase-tools + - name: Authenticate with Google Cloud + uses: google-github-actions/auth@v2 + with: + credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATA }} + - name: Run Firebase command run: firebase appdistribution:distribute Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk --app 1:454576928400:android:7934c2af24bbeaca6eca15 --test-devices "model=tokay,version=36,locale=en,orientation=portrait;" --test-case-ids=smoke-test From 8353b1eeb0e5e0adbc4e103a537e918b4da0a35b Mon Sep 17 00:00:00 2001 From: Kevin Elko Date: Wed, 5 Nov 2025 14:25:28 -0500 Subject: [PATCH 8/8] Update Firebase App Distribution app ID --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d8ace7..efa0d41 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,4 +33,4 @@ jobs: credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATA }} - name: Run Firebase command - run: firebase appdistribution:distribute Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk --app 1:454576928400:android:7934c2af24bbeaca6eca15 --test-devices "model=tokay,version=36,locale=en,orientation=portrait;" --test-case-ids=smoke-test + run: firebase appdistribution:distribute Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk --app 1:1027195595844:android:db96d3a226103bb1aca011 --test-devices "model=tokay,version=36,locale=en,orientation=portrait;" --test-case-ids=smoke-test