forked from workadventure/workadventure
-
Notifications
You must be signed in to change notification settings - Fork 9
feat(android): add mobile shell and Play internal-track workflow #21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ScottShao
wants to merge
5
commits into
BAWES-Universe:universe
Choose a base branch
from
ScottShao:feat/mobile-android
base: universe
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
90a4504
feat(android): add mobile shell and release workflow
7a12caf
chore(android): make lockfile portable
8d4786e
fix(android): tighten mobile release config
eb43a17
fix(android): add media permissions for in-app calls
84af543
chore(android): normalize gradlew.bat line endings
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| name: Android Build & Deploy | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: [universe] | ||
| paths: | ||
| - 'mobile/android/**' | ||
| - 'mobile/fastlane/**' | ||
| - 'mobile/Gemfile' | ||
| - 'mobile/package.json' | ||
| - 'mobile/package-lock.json' | ||
| - '.github/workflows/android-build.yml' | ||
| push: | ||
| branches: [universe] | ||
| paths: | ||
| - 'mobile/android/**' | ||
| - 'mobile/fastlane/**' | ||
| - 'mobile/Gemfile' | ||
| - 'mobile/package.json' | ||
| - 'mobile/package-lock.json' | ||
| - '.github/workflows/android-build.yml' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| test: | ||
| name: Android unit tests | ||
| runs-on: ubuntu-latest | ||
| defaults: | ||
| run: | ||
| working-directory: mobile | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '20' | ||
|
|
||
| - run: npm ci | ||
|
|
||
| - run: npx cap sync android | ||
|
|
||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: '17' | ||
|
|
||
| - uses: ruby/setup-ruby@v1 | ||
| with: | ||
| ruby-version: '3.2' | ||
| bundler-cache: true | ||
| working-directory: mobile | ||
|
|
||
| - run: bundle exec fastlane android test | ||
|
|
||
| build_release: | ||
| name: Build signed Android bundle | ||
| runs-on: ubuntu-latest | ||
| needs: test | ||
| if: github.event_name != 'pull_request' | ||
| defaults: | ||
| run: | ||
| working-directory: mobile | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
|
|
||
| - uses: actions/setup-node@v4 | ||
| with: | ||
| node-version: '20' | ||
|
|
||
| - run: npm ci | ||
|
|
||
| - run: npx cap sync android | ||
|
|
||
| - uses: actions/setup-java@v4 | ||
| with: | ||
| distribution: temurin | ||
| java-version: '17' | ||
|
|
||
| - uses: ruby/setup-ruby@v1 | ||
| with: | ||
| ruby-version: '3.2' | ||
| bundler-cache: true | ||
| working-directory: mobile | ||
|
|
||
| - name: Materialize signing secrets | ||
| env: | ||
| ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} | ||
| GOOGLE_PLAY_JSON_KEY: ${{ secrets.GOOGLE_PLAY_JSON_KEY }} | ||
| run: | | ||
| if [ -z "$ANDROID_KEYSTORE_BASE64" ] || [ -z "$GOOGLE_PLAY_JSON_KEY" ]; then | ||
| echo "Missing Android release secrets; skipping signed bundle build." | ||
| exit 0 | ||
| fi | ||
| printf '%s' "$ANDROID_KEYSTORE_BASE64" | base64 --decode > android/release.keystore | ||
| printf '%s' "$GOOGLE_PLAY_JSON_KEY" > fastlane/google-play-key.json | ||
|
|
||
| - name: Build signed AAB | ||
| env: | ||
| ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} | ||
| STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }} | ||
| KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} | ||
| KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} | ||
| KEYSTORE_PATH: android/release.keystore | ||
| SUPPLY_JSON_KEY_DATA: ${{ secrets.GOOGLE_PLAY_JSON_KEY }} | ||
| run: | | ||
| if [ -z "$ANDROID_KEYSTORE_BASE64" ] || [ -z "$STORE_PASSWORD" ] || [ -z "$KEY_ALIAS" ] || [ -z "$KEY_PASSWORD" ]; then | ||
| echo "Missing Android signing secrets; skipping signed bundle build." | ||
| exit 0 | ||
| fi | ||
| bundle exec fastlane android build | ||
|
|
||
| - name: Upload AAB artifact | ||
| if: hashFiles('mobile/android/app/build/outputs/bundle/release/*.aab') != '' | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: bawes-universe-android-aab | ||
| path: mobile/android/app/build/outputs/bundle/release/*.aab | ||
|
|
||
| - name: Deploy to Play internal track | ||
| if: github.event_name == 'workflow_dispatch' | ||
| env: | ||
| ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} | ||
| STORE_PASSWORD: ${{ secrets.ANDROID_STORE_PASSWORD }} | ||
| KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} | ||
| KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} | ||
| KEYSTORE_PATH: android/release.keystore | ||
| SUPPLY_JSON_KEY_DATA: ${{ secrets.GOOGLE_PLAY_JSON_KEY }} | ||
| run: | | ||
| if [ -z "$ANDROID_KEYSTORE_BASE64" ] || [ -z "$STORE_PASSWORD" ] || [ -z "$KEY_ALIAS" ] || [ -z "$KEY_PASSWORD" ] || [ -z "$SUPPLY_JSON_KEY_DATA" ]; then | ||
| echo "Missing Play Store deployment secrets; skipping deploy." | ||
| exit 0 | ||
| fi | ||
| bundle exec fastlane android deploy | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| # Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore | ||
|
|
||
| # Built application files | ||
| *.apk | ||
| *.aar | ||
| *.ap_ | ||
| *.aab | ||
|
|
||
| # Files for the ART/Dalvik VM | ||
| *.dex | ||
|
|
||
| # Java class files | ||
| *.class | ||
|
|
||
| # Generated files | ||
| bin/ | ||
| gen/ | ||
| out/ | ||
| # Uncomment the following line in case you need and you don't have the release build type files in your app | ||
| # release/ | ||
|
|
||
| # Gradle files | ||
| .gradle/ | ||
| build/ | ||
|
|
||
| # Local configuration file (sdk path, etc) | ||
| local.properties | ||
|
|
||
| # Proguard folder generated by Eclipse | ||
| proguard/ | ||
|
|
||
| # Log Files | ||
| *.log | ||
|
|
||
| # Android Studio Navigation editor temp files | ||
| .navigation/ | ||
|
|
||
| # Android Studio captures folder | ||
| captures/ | ||
|
|
||
| # IntelliJ | ||
| *.iml | ||
| .idea/workspace.xml | ||
| .idea/tasks.xml | ||
| .idea/gradle.xml | ||
| .idea/assetWizardSettings.xml | ||
| .idea/dictionaries | ||
| .idea/libraries | ||
| # Android Studio 3 in .gitignore file. | ||
| .idea/caches | ||
| .idea/modules.xml | ||
| # Comment next line if keeping position of elements in Navigation Editor is relevant for you | ||
| .idea/navEditor.xml | ||
|
|
||
| # Keystore files | ||
| # Uncomment the following lines if you do not want to check your keystore files in. | ||
| #*.jks | ||
| #*.keystore | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| # External native build folder generated in Android Studio 2.2 and later | ||
| .externalNativeBuild | ||
| .cxx/ | ||
|
|
||
| # Google Services (e.g. APIs or Firebase) | ||
| # google-services.json | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
|
|
||
| # Freeline | ||
| freeline.py | ||
| freeline/ | ||
| freeline_project_description.json | ||
|
|
||
| # fastlane | ||
| fastlane/report.xml | ||
| fastlane/Preview.html | ||
| fastlane/screenshots | ||
| fastlane/test_output | ||
| fastlane/readme.md | ||
|
|
||
| # Version control | ||
| vcs.xml | ||
|
|
||
| # lint | ||
| lint/intermediates/ | ||
| lint/generated/ | ||
| lint/outputs/ | ||
| lint/tmp/ | ||
| # lint/reports/ | ||
|
|
||
| # Android Profiling | ||
| *.hprof | ||
|
|
||
| # Cordova plugins for Capacitor | ||
| capacitor-cordova-android-plugins | ||
|
|
||
| # Copied web assets | ||
| app/src/main/assets/public | ||
|
|
||
| # Generated Config files | ||
| app/src/main/assets/capacitor.config.json | ||
| app/src/main/assets/capacitor.plugins.json | ||
| app/src/main/res/xml/config.xml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| /build/* | ||
| !/build/.npmkeep |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| namespace = "net.bawes.universe" | ||
| compileSdk = rootProject.ext.compileSdkVersion | ||
| defaultConfig { | ||
| applicationId "net.bawes.universe" | ||
| minSdkVersion rootProject.ext.minSdkVersion | ||
| targetSdkVersion rootProject.ext.targetSdkVersion | ||
| versionCode 1 | ||
| versionName "1.0" | ||
| testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" | ||
| aaptOptions { | ||
| // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. | ||
| // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 | ||
| ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' | ||
| } | ||
|
coderabbitai[bot] marked this conversation as resolved.
Outdated
|
||
| } | ||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| repositories { | ||
| flatDir{ | ||
| dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs' | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation fileTree(include: ['*.jar'], dir: 'libs') | ||
| implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" | ||
| implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion" | ||
| implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion" | ||
| implementation project(':capacitor-android') | ||
| testImplementation "junit:junit:$junitVersion" | ||
| androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion" | ||
| androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion" | ||
| implementation project(':capacitor-cordova-android-plugins') | ||
| } | ||
|
|
||
| apply from: 'capacitor.build.gradle' | ||
|
|
||
| try { | ||
| def servicesJSON = file('google-services.json') | ||
| if (servicesJSON.text) { | ||
| apply plugin: 'com.google.gms.google-services' | ||
| } | ||
| } catch(Exception e) { | ||
| logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work") | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN | ||
|
|
||
| android { | ||
| compileOptions { | ||
| sourceCompatibility JavaVersion.VERSION_21 | ||
| targetCompatibility JavaVersion.VERSION_21 | ||
| } | ||
| } | ||
|
|
||
| apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" | ||
| dependencies { | ||
| implementation project(':capacitor-push-notifications') | ||
| implementation project(':capacitor-splash-screen') | ||
|
|
||
| } | ||
|
|
||
|
|
||
| if (hasProperty('postBuildExtras')) { | ||
| postBuildExtras() | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Add project specific ProGuard rules here. | ||
| # You can control the set of applied configuration files using the | ||
| # proguardFiles setting in build.gradle. | ||
| # | ||
| # For more details, see | ||
| # http://developer.android.com/guide/developing/tools/proguard.html | ||
|
|
||
| # If your project uses WebView with JS, uncomment the following | ||
| # and specify the fully qualified class name to the JavaScript interface | ||
| # class: | ||
| #-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
| # public *; | ||
| #} | ||
|
|
||
| # Uncomment this to preserve the line number information for | ||
| # debugging stack traces. | ||
| #-keepattributes SourceFile,LineNumberTable | ||
|
|
||
| # If you keep the line number information, uncomment this to | ||
| # hide the original source file name. | ||
| #-renamesourcefileattribute SourceFile |
26 changes: 26 additions & 0 deletions
26
mobile/android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package net.bawes.universe; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| import android.content.Context; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import androidx.test.platform.app.InstrumentationRegistry; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| /** | ||
| * Instrumented test, which will execute on an Android device. | ||
| * | ||
| * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> | ||
| */ | ||
| @RunWith(AndroidJUnit4.class) | ||
| public class ExampleInstrumentedTest { | ||
|
|
||
| @Test | ||
| public void useAppContext() throws Exception { | ||
| // Context of the app under test. | ||
| Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); | ||
|
|
||
| assertEquals("net.bawes.universe", appContext.getPackageName()); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Decouple build secrets from deployment secrets.
The "Materialize signing secrets" step requires both
ANDROID_KEYSTORE_BASE64andGOOGLE_PLAY_JSON_KEY, but the build step (lines 99-112) only needs the keystore and signing credentials, not the Play key. On push touniverse(not PR, notworkflow_dispatch), the workflow builds a signed AAB but doesn't deploy, so the Play key is unnecessary. This prevents build-only workflow runs when the Play key is unavailable.Split the secret materialization: create the keystore unconditionally when
ANDROID_KEYSTORE_BASE64is present, and only materialize the Play key when deploying (onworkflow_dispatch).♻️ Proposed fix to separate build and deploy secrets
🤖 Prompt for AI Agents