Merge pull request #3571 from StoDevX/android-app-bundles

Enable Android "app bundles"

Author: hawkrives

.circleci/config.yml

@@ -345,8 +345,6 @@ jobs:
           command: bundle exec fastlane android ci-run | tee ./logs/build
           environment:
             GIT_COMMIT_DESC: $(git log --format=oneline -n 1 $CIRCLE_SHA1)
-      - store_artifacts:
-          path: ./android/app/build/outputs/apk/release/
       - danger
 
   android-nightly:

android/app/build.gradle

@@ -199,11 +199,21 @@ android {
         }
     }
 
-    android {
-        dexOptions {
-            // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
-            preDexLibraries = preDexEnabled && !ciBuild
+    bundle {
+        language {
+            enableSplit = true
         }
+        density {
+            enableSplit = true
+        }
+        abi {
+            enableSplit = true
+        }
+    }
+
+    dexOptions {
+        // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
+        preDexLibraries = preDexEnabled && !ciBuild
     }
 
     configurations.all {

fastlane/platforms/android.rb

@@ -8,7 +8,7 @@
 		build_status = 0
 		begin
 			propagate_version(track: options[:track])
-			gradle(task: 'assemble',
+			gradle(task: 'bundle',
 			       build_type: 'Release',
 			       print_command: true,
 			       print_command_output: true)
@@ -20,9 +20,9 @@
 		end
 
 		UI.message 'Generated files:'
-		UI.message lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS]
+		UI.message lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS]
 
-		output = lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS].to_json
+		output = lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS].to_json
 		File.open('../logs/products', 'w') { |file| file.write(output) }
 	end
 
@@ -38,13 +38,12 @@
 		matchesque
 		build(track: track)
 
-		lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] =
-			lane_context[SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS].select do |apk|
-			apk.end_with? '-release.apk'
-		end
+		lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS] =
+			lane_context[SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS].select do |apk|
+				apk.end_with? '-release.aab'
+			end
 
-		supply(track: track,
-		       check_superseded_tracks: true)
+		supply(track: track, check_superseded_tracks: true)
 
 		generate_sourcemap
 		upload_sourcemap_to_bugsnag
@@ -84,12 +83,12 @@
 		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"
+		signing_props_dest = "#{dest}/android/app/upload-keystore.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}/upload-keystore.properties", :to => signing_props_dest},
+			{:from => "#{src}/upload-keystore.keystore", :to => "#{dest}/android/app/upload-keystore.keystore"},
 			{:from => "#{src}/play-private-key.json", :to => "#{dest}/fastlane/play-private-key.json"},
 		]