diff --git a/.github/workflows/Android_Release_CD.yml b/.github/workflows/Android_Release_CD.yml index c67b3f33..db99752b 100644 --- a/.github/workflows/Android_Release_CD.yml +++ b/.github/workflows/Android_Release_CD.yml @@ -1,4 +1,4 @@ -name: Android PR Builder +name: Android Release New Version 🎉 on: push: @@ -6,14 +6,14 @@ on: - "v*.*.*" jobs: - CI_Android_Release: - uses: ./.github/workflows/Android_Release_CI.yml - secrets: inherit +# CI_Android_Release: +# uses: ./.github/workflows/Android_Release_CI.yml +# secrets: inherit Distribution_To_PlayStore: name: CD Release Builder runs-on: ubuntu-latest - needs: [ CI_Android_Release ] +# needs: [ CI_Android_Release ] steps: - uses: actions/checkout@v4 @@ -77,34 +77,35 @@ jobs: env: KEY_STORE: ${{secrets.RELEASE_KEY_STORE}} run: | - touch ./keystore/poke_key.jks - echo "$KEY_STORE" | base64 -d > ./keystore/poke_key.jks + touch ./keystore/poke_key.keystore + echo "$KEY_STORE" | base64 -d > ./keystore/poke_key.keystore working-directory: android - name: Grant execute permission for gradlew run: chmod +x gradlew working-directory: android - - name: Build Release APK - run: ./gradlew assembleRelease - working-directory: android - - - name: Upload Release Build to Artifacts - uses: actions/upload-artifact@v3 - with: - name: release-artifacts - path: android/app/build/outputs/apk/release/ - if-no-files-found: error - - - name: Create Github Release - uses: softprops/action-gh-release@v1 - with: - generate_release_notes: true - files: | - android/app/build/outputs/apk/release/app-release.apk +# - name: Build Release APK +# run: ./gradlew assembleRelease +# working-directory: android +# +# - name: Upload Release Build to Artifacts +# uses: actions/upload-artifact@v3 +# with: +# name: release-artifacts +# path: android/app/build/outputs/apk/release/ +# if-no-files-found: error +# +# - name: Create Github Release +# uses: softprops/action-gh-release@v1 +# with: +# generate_release_notes: true +# files: | +# android/app/build/outputs/apk/release/app-release.apk - name: Build release aab run: ./gradlew bundleRelease + working-directory: android - name: Upload artifact to Google Play Store uses: r0adkll/upload-google-play@v1 @@ -112,4 +113,4 @@ jobs: serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }} packageName: poke.rogue.helper releaseFiles: android/app/build/outputs/bundle/release/app-release.aab - track: production \ No newline at end of file + track: internal \ No newline at end of file diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 3a2db40e..f0084fe6 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -29,7 +29,7 @@ android { create("release") { keyAlias = properties.getProperty("KEY_ALIAS") keyPassword = properties.getProperty("KEY_PASSWORD") - storeFile = file("${project.rootDir.absolutePath}/keystore/poke_key.jks") + storeFile = file("${project.rootDir.absolutePath}/keystore/poke_key.keystore") storePassword = properties.getProperty("STORE_PASSWORD") } } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index b0ff5848..b4098c19 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -5,8 +5,8 @@ koin = "4.0.0" minSdk = "26" robolectric = "4.13" targetSdk = "34" -appVersion = "9.0.1" -versionCode = "901000" +appVersion = "9.0.2" +versionCode = "901002" agp = "8.3.2" # kotlin