Merge branch 'develop'

keymapperorg · Sep 18, 2023 · aaffef7 · aaffef7
2 parents a6bde0e + a6144a7
commit aaffef7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -53,13 +53,8 @@ jobs:
           GOOGLE_PLAY_SERVICE_ACCOUNT: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT }}
         run: echo "$GOOGLE_PLAY_SERVICE_ACCOUNT" > google-play-service-account.json
 
-      - name: Save keystore credentials
+      - name: Build apk with fastlane
+        run: bundle exec fastlane prod
         env:
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
-          KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
-        run: |
-          export KEYSTORE_PASSWORD=$KEYSTORE_PASSWORD
-          export KEY_PASSWORD=$KEY_PASSWORD
-
-      - name: Build apk with fastlane
-        run: bundle exec fastlane prod
+          KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,7 +8,7 @@ apply plugin: "org.jetbrains.kotlin.plugin.parcelize"
 android {
 
     namespace 'io.github.sds100.keymapper'
-    compileSdkVersion 33
+    compileSdk 33
     buildToolsVersion = '33.0.1'
 
     def versionProperties = new Properties()