Merge pull request #3569 from StoDevX/print-gradle-version

Fix signed Gradle builds

Author: hawkrives

.circleci/config.yml

@@ -327,6 +327,7 @@ jobs:
           command: ./scripts/should-skip-build && circleci step halt || echo "Build continuing."
       - run: node --version
       - run: yarn --version
+      - run: cd android && ./gradlew --version
       - set-ruby-version
       - workspace-attach-node_modules
       - bundler-restore

CHANGELOG.md

@@ -67,6 +67,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Fixed DatePicker by removing an unnecessary call to getDerivedStateFromProps (#3382)
 - Fixed the balances view from refreshing if the user has not agreed to the alert (#3509)
 - Fixed course search crash (#3564)
+- Building signed Android APKs was broken after RN 0.59; now it is fixed (#3569)
 
 ### Removed
 - Removed the `prepare` script patching `ScrollEnabled` inside `RCTMultilineTextInputView` (#3337)

android/app/build.gradle

@@ -97,6 +97,11 @@ def enableSeparateBuildPerCPUArchitecture = false
  */
 def enableProguardInReleaseBuilds = false
 
+/**
+ * Fetch the keystore file's path from the environment
+ */
+String keystorePath = System.getenv("KEYSTORE_FILE")
+
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
 
@@ -122,8 +127,31 @@ android {
     }
 
     signingConfigs {
-        // the signingConfig is configured below
-        release
+        // originally derived from https://gist.github.com/gabrielemariotti/6856974
+        if (keystorePath == null) {
+            logger.warn "env['KEYSTORE_FILE'] not set"
+            release
+            return
+        } else {
+            logger.warn "env['KEYSTORE_FILE'] = ${keystorePath}"
+        }
+
+        def propFile = new File(keystorePath)
+        if (!propFile.canRead()) {
+            logger.warn "${keystorePath} is not readable"
+            release
+            return
+        }
+
+        def props = new Properties()
+        props.load(new FileInputStream(propFile))
+
+        release {
+            storeFile file(props['STORE_FILE'])
+            storePassword props['STORE_PASSWORD']
+            keyAlias props['KEY_ALIAS']
+            keyPassword props['KEY_PASSWORD']
+        }
     }
 
     splits {
@@ -145,7 +173,9 @@ android {
 
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig signingConfigs.release
+            if (keystorePath != null) {
+                signingConfig signingConfigs.release
+            }
         }
     }
 
@@ -186,41 +216,6 @@ android {
     }
 }
 
-// borrowed from https://gist.github.com/gabrielemariotti/6856974
-def propFile = new File('android/app/signing.properties')
-if (propFile.canRead()) {
-    Properties props = new Properties()
-    props.load(new FileInputStream(propFile))
-
-    bool hasFile = props != null && props.containsKey('STORE_FILE');
-    bool hasPassword = props != null && props.containsKey('STORE_PASSWORD');
-    bool hasAlias = props != null && props.containsKey('KEY_ALIAS');
-    bool hasKeyPass = props != null && props.containsKey('KEY_PASSWORD');
-
-    if (hasFile && hasPassword && hasAlias && hasKeyPass) {
-        logger.info 'android/app/signing.properties is fully functional.'
-        android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
-        android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
-        android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
-        android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
-    } else {
-        println 'android/app/signing.properties found, but some entries are missing.'
-        if (props == null) {
-            logger.warn '`props` was null'
-        } else {
-            logger.warn "has STORE_FILE [y/n]: ${props.containsKey('STORE_FILE')}"
-            logger.warn "has STORE_PASSWORD [y/n]: ${props.containsKey('STORE_PASSWORD')}"
-            logger.warn "has KEY_ALIAS [y/n]: ${props.containsKey('KEY_ALIAS')}"
-            logger.warn "has KEY_PASSWORD [y/n]: ${props.containsKey('KEY_PASSWORD')}"
-        }
-        android.buildTypes.release.signingConfig = null
-    }
-} else {
-    logger.warn 'android/app/signing.properties not found.'
-    logger.warn "cwd: ${new File(".").absolutePath}"
-    android.buildTypes.release.signingConfig = null
-}
-
 dependencies {
     // please keep this list sorted
     implementation project(':bugsnag-react-native')

fastlane/platforms/android.rb

@@ -78,20 +78,25 @@
 	lane :matchesque do
 		match_dir = clone_match
 
-		# don't forget --- lanes run inside of ./fastlane
-		gradle_file = 'signing.properties'
-		keystore_name = 'my-release-key.keystore'
-		play_store_key = 'play-private-key.json'
-
+		# we'll be copying files out of the tempdir from the git-clone operation
 		src = "#{match_dir}/android"
-
-		# FastlaneCore::CommandExecutor.execute(command: "pwd", print_all: true, print_command: true)
-		UI.command "cp #{src}/#{gradle_file} ../android/app/#{gradle_file}"
-		FileUtils.cp("#{src}/#{gradle_file}", "../android/app/#{gradle_file}")
-		UI.command "cp #{src}/#{keystore_name} ../android/app/#{keystore_name}"
-		FileUtils.cp("#{src}/#{keystore_name}", "../android/app/#{keystore_name}")
-		UI.command "cp #{src}/#{play_store_key} ../fastlane/#{play_store_key}"
-		FileUtils.cp("#{src}/#{play_store_key}", "../fastlane/#{play_store_key}")
+		# don't forget: lanes run inside of ./fastlane, so we go up a level for our basedir
+		dest = File.expand_path('..', '.')
+
+		# we export this variable so that Gradle knows where to find the .properties file
+		signing_props_dest = "#{dest}/android/app/signing.properties"
+		ENV['KEYSTORE_FILE'] = signing_props_dest
+
+		pairs = [
+			{:from => "#{src}/signing.properties", :to => signing_props_dest},
+			{:from => "#{src}/my-release-key.keystore", :to => "#{dest}/android/app/my-release-key.keystore"},
+			{:from => "#{src}/play-private-key.json", :to => "#{dest}/fastlane/play-private-key.json"},
+		]
+
+		pairs.each do |pair|
+			UI.command "cp #{pair[:from]} #{pair[:to]}"
+			FileUtils.cp(pair[:from], pair[:to])
+		end
 
 		remove_match_clone(dir: match_dir)
 	end