diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 39e9d0a55..a7389320b 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -12,7 +12,8 @@ on: jobs: build: runs-on: ubuntu-20.04 - + env: + GPLAY_KEYSTORE_PASSWORD: ${{ GPLAY_KEYSTORE_PASSWORD }} steps: - uses: actions/checkout@v2 with: @@ -86,7 +87,10 @@ jobs: ./gradlew :app_pojavlauncher:assembleDebug mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug.apk # mv app_pojavlauncher/build/intermediates/merged_native_libs/debug/out/lib out/debug_lib - + - name: Build AAB for Google Play + run: | + ./gradlew :app_pojavlauncher:bundleGplay + mv app_pojavlauncher/gplay/app_pojavlauncher-gplay.aab out/app-gplay.aab - name: Build APK without runtime run: | rm -r app_pojavlauncher/src/main/assets/components/jre @@ -98,7 +102,14 @@ jobs: with: name: app-debug path: out/app-debug.apk - + - name: Upload onto the Google Play testing track + uses: r0adkll/upload-google-play@v1 + with: + serviceAccountJson: ${{ GPLAY_SERVICE_JSON }} + packageName: net.kdt.pojavlaunch + releaseFiles: out/app-gplay.aab + track: internal + inAppUpdatePriority: 2 - name: Upload APK (without runtime) uses: actions/upload-artifact@v2 with: diff --git a/app_pojavlauncher/build.gradle b/app_pojavlauncher/build.gradle index 541630774..130fe66b3 100644 --- a/app_pojavlauncher/build.gradle +++ b/app_pojavlauncher/build.gradle @@ -45,13 +45,19 @@ android { keyAlias "androiddebugkey" keyPassword "android" } + googlePlayBuild { + storeFile file("upload.jks") + storePassword System.getenv("GPLAY_KEYSTORE_PASSWORD") + keyAlias "upload" + keyPassword System.getenv("GPLAY_KEYSTORE_PASSWORD") + } } defaultConfig { applicationId "net.kdt.pojavlaunch" minSdkVersion 21 targetSdkVersion 29 - versionCode 156253 + versionCode new Date().getSeconds() versionName getVersionName() multiDexEnabled true //important } @@ -72,6 +78,10 @@ android { // multiDexEnabled = true // debuggable = true } + gplay { + initWith release + signingConfig signingConfigs.googlePlayBuild + } } externalNativeBuild { diff --git a/app_pojavlauncher/upload.jks b/app_pojavlauncher/upload.jks new file mode 100644 index 000000000..d4c188c3d Binary files /dev/null and b/app_pojavlauncher/upload.jks differ