fix android build

Flutterando · Jan 15, 2024 · c8f9f93 · c8f9f93
1 parent 1e4b50b
commit c8f9f93
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -27,16 +27,15 @@ jobs:
       run: flutter pub get
 
     - name: Decode Keystore File
-      run: echo "${{ secrets.KEYSTORE }}" | base64 -d > ${{ github.workspace }}/key.jks
+      run: echo "${{ secrets.KEYSTORE }}" | base64 -d > ${{ github.workspace }}/android/app/key.jks
       env:
         KEYSTORE: ${{ secrets.KEYSTORE }}
 
     - name: Build APK
       run: flutter build apk --release --flavor prod
       env:
-        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWD }}
-        KEY_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
-        KEY_PASSWORD: ${{ secrets.KEYSTORE_PASSWD }}
+        KEYSTORE_PASSWD: ${{ secrets.KEYSTORE_PASSWD }}
+        KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
 
     - name: Upload Artifact
       uses: actions/upload-artifact@v2

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -22,13 +22,6 @@ if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
 
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
-
 android {
     namespace "br.com.flutterando.yuno"
     compileSdkVersion flutter.compileSdkVersion
@@ -72,10 +65,10 @@ android {
 
     signingConfigs {
         release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
+            keyAlias System.getenv('KEYSTORE_ALIAS')
+            keyPassword System.getenv('KEYSTORE_PASSWD')
+            storeFile file('key.jks')
+            storePassword System.getenv('KEYSTORE_PASSWD')
         }
     }