auto version codes

Tiebe · Feb 10, 2024 · 92a383f · 92a383f
1 parent f753569
commit 92a383f
Show file tree

Hide file tree

Showing 5 changed files with 82 additions and 6 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -2,6 +2,8 @@ name: Android CI
 
 on:
   workflow_dispatch:
+  push:
+    branches: [ "main" ]
 
 jobs:
   build:
@@ -21,6 +23,7 @@ jobs:
     - name: Assemble Release Bundle
       run: |
         ./gradlew bundleRelease
+
     - name: Sign Release Android
       uses: r0adkll/sign-android-release@v1
       id: sign_app_android
@@ -42,11 +45,20 @@ jobs:
         keyPassword: ${{ secrets.KEY_PASSWORD }}
 
 
-    - name: Upload release
+    - name: Upload release Android
       uses: r0adkll/upload-google-play@v1
       with:
         serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
         packageName: nl.tiebe.otarium
-        releaseFiles: ${{steps.sign_app_android.outputs.signedReleaseFile}},${{steps.sign_app_wear.outputs.signedReleaseFile}}
+        releaseFiles: ${{steps.sign_app_android.outputs.signedReleaseFile}}
         track: production
+        whatsNewDirectory: whatsNew
+
+    - name: Upload release Wear OS
+      uses: r0adkll/upload-google-play@v1
+      with:
+        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+        packageName: nl.tiebe.otarium
+        releaseFiles: ${{steps.sign_app_wear.outputs.signedReleaseFile}}
+        track: wear:production
         whatsNewDirectory: whatsNew
diff --git a/.github/workflows/android_internal.yml b/.github/workflows/android_internal.yml
@@ -0,0 +1,64 @@
+name: Android CI
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "dev" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Assemble Release Bundle
+      run: |
+        ./gradlew bundleRelease
+
+    - name: Sign Release Android
+      uses: r0adkll/sign-android-release@v1
+      id: sign_app_android
+      with:
+        releaseDirectory: androidApp/build/outputs/bundle/release
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        alias: ${{ secrets.ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+    - name: Sign Release Wear OS
+      uses: r0adkll/sign-android-release@v1
+      id: sign_app_wear
+      with:
+        releaseDirectory: wearApp/build/outputs/bundle/release
+        signingKeyBase64: ${{ secrets.SIGNING_KEY }}
+        alias: ${{ secrets.ALIAS }}
+        keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
+        keyPassword: ${{ secrets.KEY_PASSWORD }}
+
+
+    - name: Upload release Android
+      uses: r0adkll/upload-google-play@v1
+      with:
+        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+        packageName: nl.tiebe.otarium
+        releaseFiles: ${{steps.sign_app_android.outputs.signedReleaseFile}}
+        track: qa
+        whatsNewDirectory: whatsNew
+
+    - name: Upload release Wear OS
+      uses: r0adkll/upload-google-play@v1
+      with:
+        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+        packageName: nl.tiebe.otarium
+        releaseFiles: ${{steps.sign_app_wear.outputs.signedReleaseFile}}
+        track: wear:qa
+        whatsNewDirectory: whatsNew
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -13,7 +13,7 @@ android {
         applicationId = "nl.tiebe.otarium"
         minSdk = libs.versions.android.sdk.min.get().toInt()
         targetSdk = libs.versions.android.sdk.compile.get().toInt()
-        versionCode = libs.versions.app.version.code.get().toInt()
+        versionCode = (System.currentTimeMillis() / 1000).toInt()
         versionName = libs.versions.app.version.string.get()
     }
     buildTypes {

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -116,7 +116,7 @@ buildkonfig {
     packageName = "nl.tiebe.otarium"
 
     defaultConfigs {
-        buildConfigField(INT, "versionCode", libs.versions.app.version.code.get())
+        buildConfigField(INT, "versionCode", (System.currentTimeMillis() / 1000).toInt().toString())
     }
 }
 

diff --git a/wearApp/build.gradle.kts b/wearApp/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "nl.tiebe.otarium"
         minSdk = libs.versions.wear.sdk.min.get().toInt()
         targetSdk = libs.versions.wear.sdk.compile.get().toInt()
-        versionCode = libs.versions.app.version.code.get().toInt() + 100
-        versionName = libs.versions.app.version.string.get()
+        versionCode = (System.currentTimeMillis() / 1000).toInt()
+        versionName = libs.versions.app.version.string.get() + "-wear"
         vectorDrawables {
             useSupportLibrary = true
         }