Update signing step

.travis.yml

@@ -19,6 +19,7 @@ cache:
     - "$HOME/.android/build-cache"
 before_install:
   - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./.travis/run_on_non_pull_requests.sh; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./.travis/run_on_before_deploy.sh; fi'
   - yes | sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}"
   - yes | sdkmanager "platform-tools"
   - yes | sdkmanager "tools"
@@ -29,11 +30,6 @@ before_install:
 script:
   - "./gradlew clean test build connectedCheck -Pbuild=prod"
 after_failure: cat $TRAVIS_BUILD_DIR/SWADroid/build/reports/lint-results.xml
-before_deploy:
-  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./.travis/run_on_before_deploy.sh; fi'
-  - "cd $TRAVIS_BUILD_DIR/SWADroid/build/outputs/apk/prod"
-  - "apksigner sign --ks ${TRAVIS_BUILD_DIR}/keystore.jks --ks-pass pass:$storepass --key-pass pass:$keypass --out SWADroid-release.apk SWADroid-prod-zipaligned.apk"
-  - "apksigner verify SWADroid-release.apk"
 deploy:
   provider: releases
   token:

SWADroid/build.gradle

@@ -75,11 +75,25 @@ android {
         buildConfigField "String", "SWAD_APP_KEY", getBuildConfigField("SWAD_APP_KEY")
     }
 
+    def signingPropertiesFile = rootProject.file("signing.properties")
+    def signingProperties = new Properties()
+    signingProperties.load(new FileInputStream(signingPropertiesFile))
+
+    signingConfigs {
+        release {
+            storeFile file(signingProperties['RELEASE_STORE_FILE'])
+            keyAlias signingProperties['RELEASE_KEY_ALIAS']
+            storePassword signingProperties['RELEASE_STORE_PASSWORD']
+            keyPassword signingProperties['RELEASE_KEY_PASSWORD']
+        }
+    }
+
     buildTypes {
         prod {
             minifyEnabled true
             zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
 }

signing.properties

@@ -0,0 +1,4 @@
+RELEASE_STORE_FILE=keystore.jks
+RELEASE_KEY_ALIAS=amab
+RELEASE_STORE_PASSWORD=$storepass
+RELEASE_KEY_PASSWORD=$keypass