Release 1.1.1

djkovrik · Jun 27, 2023 · 7a4ba42 · 7a4ba42
1 parent 218edae
commit 7a4ba42
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/GooglePlayDeploy.yml b/.github/workflows/GooglePlayDeploy.yml
@@ -3,7 +3,7 @@ name: Deploy to Prod
 on:
   push:
     branches:
-      - release/
+      - release/*
 
 jobs:
   deploy:
@@ -21,9 +21,6 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Build
-        run: ./gradlew build
-
       - name: Assemble Release Bundle
         run: ./gradlew bundleRelease
 
@@ -42,6 +39,7 @@ jobs:
           echo "Tagging release with tag $version_name"
           git tag $version_name release/$version_name
           git push origin --tags
+
       - name: Create service_account.json
         run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
 
@@ -50,7 +48,7 @@ jobs:
         with:
           serviceAccountJson: service_account.json
           packageName: com.sedsoftware.blinktracker
-          releaseFile: app/build/outputs/bundle/release/com.sedsoftware.blinktracker-release.aab
+          releaseFiles: app/build/outputs/bundle/release/com.sedsoftware.blinktracker-release.aab
           mappingFile: app/build/outputs/mapping/release/mapping.txt
           track: production
           whatsNewDirectory: distribution/whatsnew
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -23,8 +23,8 @@ android {
         applicationId = "com.sedsoftware.blinktracker"
         minSdk = 26
         targetSdk = 33
-        versionCode = 100001
-        versionName = "1.0.1"
+        versionCode = 100101
+        versionName = "1.1.1"
         setProperty("archivesBaseName", applicationId)
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -49,7 +49,9 @@ android {
             proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
         }
         release {
-            signingConfig = signingConfigs[if (useReleaseKeystore) "release" else "debug"]
+            if (useReleaseKeystore) {
+                signingConfig = signingConfigs["release"]
+            }
             isShrinkResources = true
             isMinifyEnabled = true
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

diff --git a/distribution/whatsnew/whatsnew-en-US b/distribution/whatsnew/whatsnew-en-US
@@ -1 +1 @@
-Initial release
+Minor bugfixes
diff --git a/distribution/whatsnew/whatsnew-ru-RU b/distribution/whatsnew/whatsnew-ru-RU
@@ -1 +1 @@
-Начальный релиз
+Различные исправления