diff --git a/.github/workflows/build-testing.yaml b/.github/workflows/build-testing.yaml index 2a778571..9e7a8d20 100644 --- a/.github/workflows/build-testing.yaml +++ b/.github/workflows/build-testing.yaml @@ -36,4 +36,4 @@ jobs: uses: actions/upload-artifact@v4 with: name: numberhub-app-debug-apks - path: app/build/outputs/apk/fdroid/debug/app-*-debug.apk \ No newline at end of file + path: app/build/outputs/apk/*/debug/app-*-debug.apk diff --git a/.github/workflows/release-app-github.yaml b/.github/workflows/release-app-github.yaml index 7cfaafce..68914ab7 100644 --- a/.github/workflows/release-app-github.yaml +++ b/.github/workflows/release-app-github.yaml @@ -1,4 +1,4 @@ -name: Build and publish app +name: Build and publish app (F-Droid variant) on: release: diff --git a/.github/workflows/release-app-google-play.yaml b/.github/workflows/release-app-google-play.yaml new file mode 100644 index 00000000..94b728b8 --- /dev/null +++ b/.github/workflows/release-app-google-play.yaml @@ -0,0 +1,46 @@ +name: Build and publish app to Google Play (Google Play variant) + +on: + release: + types: [ published ] + +jobs: + release-app-google-play: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - uses: gradle/wrapper-validation-action@v2 + + - name: Write KeyStore 🗝️ + uses: ./.github/actions/prepare-keystore + with: + signingStorePassword: ${{ secrets.SIGNING_STORE_PASSWORD }} + signingKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }} + signingKeyAlias: ${{ secrets.SIGNING_KEY_ALIAS }} + keyStoreBase64: ${{ secrets.KEYSTORE }} + + - name: Setup Java + uses: actions/setup-java@v4 + with: + distribution: 'adopt' + java-version: 21 + cache: 'gradle' + + - name: Build Bundles 📱 + run: ./gradlew bundleRelease + + - name: Rename APK + run: mv app/build/outputs/bundle/playStoreRelease/app-playStore-release.aab NumberHub.aab + + - name: Upload Bundles 🚀 + uses: r0adkll/upload-google-play@v1 + with: + serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_STORE_SERVICE_ACCOUNT }} + packageName: app.myzel394.numberhub + releaseFiles: NumberHub.aab + track: production + status: inProgress + userFraction: 0.5 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 02d20d48..42a81fa5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,17 +1,17 @@ [versions] -versionCode = "3" +versionCode = "4" versionName = "NumberHub" androidxBrowserBrowser = "1.8.0" androidGradlePlugin = "8.3.2" androidxActivityActivityCompose = "1.9.0" androidxAppCompatAppCompat = "1.6.1" -androidxCompose = "1.6.6" +androidxCompose = "1.6.7" androidxComposeCompiler = "1.5.9" androidxComposeMaterial3 = "1.2.1" -androidxCoreCoreKts = "1.13.0" +androidxCoreCoreKts = "1.13.1" androidxGlanceGlance = "1.0.0" -androidxDatastoreDatastorePreferences = "1.1.0" +androidxDatastoreDatastorePreferences = "1.1.1" androidxEspresso = "3.5.1" androidxHiltHiltNavigationCompose = "1.2.0" androidxMacroBenchmark = "1.2.4"