diff --git a/.github/workflows/android-debug-build-release.yml b/.github/workflows/android-debug-build-release.yml index b1a7b8e99..9fa6a1096 100644 --- a/.github/workflows/android-debug-build-release.yml +++ b/.github/workflows/android-debug-build-release.yml @@ -39,10 +39,20 @@ jobs: - name: Set up Android SDK uses: android-actions/setup-android@v3 + - name: Decode signing keystore + if: ${{ env.ANDROID_KEYSTORE_BASE64 != '' }} + env: + ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + run: echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > ${{ github.workspace }}/archon-debug.keystore + - name: Build Android debug APK working-directory: ./apps/react-wallet env: CI: true + ANDROID_KEYSTORE_FILE: ${{ github.workspace }}/archon-debug.keystore + ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} + ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} + ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} run: npm run android:build - name: Upload debug APK artifact diff --git a/.github/workflows/android-debug-build.yml b/.github/workflows/android-debug-build.yml index 5169c05b8..9104e741e 100644 --- a/.github/workflows/android-debug-build.yml +++ b/.github/workflows/android-debug-build.yml @@ -35,10 +35,20 @@ jobs: - name: Set up Android SDK uses: android-actions/setup-android@v3 + - name: Decode signing keystore + if: ${{ env.ANDROID_KEYSTORE_BASE64 != '' }} + env: + ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }} + run: echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > ${{ github.workspace }}/archon-debug.keystore + - name: Build Android debug APK working-directory: ./apps/react-wallet env: CI: true + ANDROID_KEYSTORE_FILE: ${{ github.workspace }}/archon-debug.keystore + ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} + ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }} + ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }} run: npm run android:build - name: Upload debug APK diff --git a/.gitignore b/.gitignore index 41983f2c8..5d8d87aab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ node_modules/ +*.keystore tmp/ .env custodials diff --git a/apps/react-wallet/android/app/build.gradle b/apps/react-wallet/android/app/build.gradle index a0d5bfa36..2442ce6d7 100644 --- a/apps/react-wallet/android/app/build.gradle +++ b/apps/react-wallet/android/app/build.gradle @@ -16,10 +16,31 @@ android { ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' } } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + if (System.getenv("ANDROID_KEYSTORE_FILE")) { + signingConfigs { + ci { + storeFile file(System.getenv("ANDROID_KEYSTORE_FILE")) + storePassword System.getenv("ANDROID_KEYSTORE_PASSWORD") + keyAlias System.getenv("ANDROID_KEY_ALIAS") + keyPassword System.getenv("ANDROID_KEY_PASSWORD") + } + } + buildTypes { + debug { + signingConfig signingConfigs.ci + } + release { + signingConfig signingConfigs.ci + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + } else { + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } } } } diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 1aa49c00d..5cbaaedc6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 0feb4c7dd..5cbaaedc6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index edd2f9dc5..5cbaaedc6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 95214a2bf..5cbaaedc6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/apps/react-wallet/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher.png index e4917db57..488baa0c1 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png index b999324d4..488baa0c1 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png and b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png index bf9e3f8f7..488baa0c1 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png and b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png index ff5757a6e..488baa0c1 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png and b/apps/react-wallet/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 755adb381..711237533 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index 5b990d7b5..711237533 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index be9f02a33..711237533 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index fc5eb9a19..711237533 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/apps/react-wallet/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index de9a7c9a3..9b3402dfe 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index adf064785..9b3402dfe 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index b90c6330c..9b3402dfe 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index c430a9579..9b3402dfe 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 0f7515aa9..a829c46d6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index 5da73954f..a829c46d6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 4c88f5092..a829c46d6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index e1a053daf..a829c46d6 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index d162493cd..625288b5e 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 62d0494ea..625288b5e 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index f3dfb143f..625288b5e 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 78050878b..625288b5e 100644 Binary files a/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/apps/react-wallet/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ