diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e3d31f0a..e8c14c697 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,19 +65,34 @@ jobs: echo "FGA_VERSION_NAME=$VERSION_NAME" >>${GITHUB_ENV} - name: Build Android Package - run: ./gradlew assembleCi --scan --parallel --no-daemon + run: | + if [[ ${{ github.ref }} == "refs/heads/master ]]; then + ./gradlew assembleCi --scan --parallel --no-daemon + else + ./gradlew assembleAlpha --scan --parallel --no-daemon + fi - name: Upload APK uses: actions/upload-artifact@v4 with: name: apk - path: app/build/outputs/apk/ci/app-ci.apk + path: | + if [[ ${{ github.ref }} == "refs/heads/master ]]; then + app/build/outputs/apk/ci/app-ci.apk + else + app/build/outputs/apk/alpha/app-alpha.apk + fi - name: Upload De-obfuscation mapping file uses: actions/upload-artifact@v4 with: name: mapping-ci - path: app/build/outputs/mapping/ci/mapping.txt + path: | + if [[ ${{ github.ref }} == "refs/heads/master ]]; then + app/build/outputs/mapping/ci/mapping.txt + else + app/build/outputs/mapping/alpha/mapping.txt + fi # Release master branch canary: diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 815878908..f34c8dd92 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -75,6 +75,17 @@ android { applicationIdSuffix = ".debug" signingConfig = signingConfigs.getByName("debug") + ndk { + //noinspection ChromeOsAbiSupport + abiFilters.add("armeabi-v7a") + abiFilters.add("arm64-v8a") + } + } + create("alpha") { + initWith(getByName("release")) + applicationIdSuffix = ".debug" + signingConfig = signingConfigs.getByName("debug") + ndk { //noinspection ChromeOsAbiSupport abiFilters.add("armeabi-v7a") diff --git a/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..036d09bc5 --- /dev/null +++ b/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 000000000..036d09bc5 --- /dev/null +++ b/app/src/alpha/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/alpha/res/mipmap-hdpi/ic_launcher.png b/app/src/alpha/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..d01e88ccc Binary files /dev/null and b/app/src/alpha/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/alpha/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/alpha/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..e5efd7788 Binary files /dev/null and b/app/src/alpha/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/alpha/res/mipmap-hdpi/ic_launcher_round.png b/app/src/alpha/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..48231abee Binary files /dev/null and b/app/src/alpha/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/alpha/res/mipmap-mdpi/ic_launcher.png b/app/src/alpha/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..94acb0aca Binary files /dev/null and b/app/src/alpha/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/alpha/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/alpha/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..44e118b8f Binary files /dev/null and b/app/src/alpha/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/alpha/res/mipmap-mdpi/ic_launcher_round.png b/app/src/alpha/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..bd1544423 Binary files /dev/null and b/app/src/alpha/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/alpha/res/mipmap-xhdpi/ic_launcher.png b/app/src/alpha/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..f76bef49b Binary files /dev/null and b/app/src/alpha/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/alpha/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/alpha/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..06a226cb7 Binary files /dev/null and b/app/src/alpha/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/alpha/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/alpha/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..6afee749b Binary files /dev/null and b/app/src/alpha/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/alpha/res/mipmap-xxhdpi/ic_launcher.png b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..1f50f3545 Binary files /dev/null and b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..dd9e99d4a Binary files /dev/null and b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..69eead93b Binary files /dev/null and b/app/src/alpha/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..7f07cb210 Binary files /dev/null and b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..22f035a8e Binary files /dev/null and b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..629063e4d Binary files /dev/null and b/app/src/alpha/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/alpha/res/values/ic_launcher_background.xml b/app/src/alpha/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..c5d5899fd --- /dev/null +++ b/app/src/alpha/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/alpha/res/values/strings.xml b/app/src/alpha/res/values/strings.xml new file mode 100644 index 000000000..82d146fa4 --- /dev/null +++ b/app/src/alpha/res/values/strings.xml @@ -0,0 +1,3 @@ + + FGA (Alpha) + \ No newline at end of file