fastlane-plugin-match_keystore 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 554236b09184bb0b50f9209ae0de3ba469e58bd66a5c0cc28880e8e259f3721a
-  data.tar.gz: b6c33c5ec05a4f72e2cbc04db6e64b2048b361408bedbaa9fe58e52908cbc5b3
+  metadata.gz: 13f57b6db57c10e142d53885360cb1416f676402fd7f234b61a549720501d9c6
+  data.tar.gz: 2809854cf748f5ba4931fd4cbe8dfc6292cfea2f4e5d556a887ed422ebfcacc2
 SHA512:
-  metadata.gz: f99fe0dbb68617919711aaded1054d931a85dbc8730f2ac69fd289341389014fb02a25cc58b833c148991e85bb871cf360450821cff284427c60c6d7000f0f42
-  data.tar.gz: c9de35e3c6cae52e1dca0d78823079f1239bc890df3c5865fb288f1fbe666e181ddba39d5de9136bb82622bdfc380c79b5b045907ca2e5d5df95df87448222b4
+  metadata.gz: 97a47758d5a39ebf414ae7a232e8767cb0dfa6ac7c484f3180b8e3149d3e879fb3ce3b27d363eae444703e9f3a9bad5b4ddc5d66f2987ed5fa0ed29b04bd4c74
+  data.tar.gz: 2c27e6a39112bdef3c44c6ed8abd77a31e19c9ce52a002040562d9f4aee229b4cf0e60cbe868196493acc983ca61b39acdfadebd2914e5a9ba15d40dd1024751

data/README.md

@@ -50,6 +50,8 @@ The keystore properties are encrypted with AES in order to secure sensitive data
   end
 ```
 
+You can build aab files as well by providing an `aab_path` instead of an `apk_path`.
+
 ## Example
 
 Check out the [example `Fastfile`](fastlane/Fastfile) to see how to use this plugin. Try it by cloning the repo, running `fastlane install_plugins` and `bundle exec fastlane test`.

data/lib/fastlane/plugin/match_keystore/actions/match_keystore_action.rb

@@ -12,6 +12,7 @@ module Fastlane
       MATCH_KEYSTORE_PATH = :MATCH_KEYSTORE_PATH
       MATCH_KEYSTORE_ALIAS_NAME = :MATCH_KEYSTORE_ALIAS_NAME
       MATCH_KEYSTORE_APK_SIGNED = :MATCH_KEYSTORE_APK_SIGNED
+      MATCH_KEYSTORE_AAB_SIGNED = :MATCH_KEYSTORE_AAB_SIGNED
     end
 
     class MatchKeystoreAction < Action
@@ -299,6 +300,22 @@ module Fastlane
         apk_path_signed
       end 
 
+      def self.sign_aab(aab_path, keystore_path, key_password, alias_name, alias_password)
+
+        aab_path_signed = aab_path.gsub('.aab', '-signed.aab')
+        aab_path_signed = aab_path_signed.gsub('unsigned', '')
+        aab_path_signed = aab_path_signed.gsub('--', '-')
+        `rm -f '#{aab_path_signed}'`
+
+        UI.message("Signing AAB (input): #{aab_path}")
+        aabsigner_opts = ""
+        output = `jarsigner -keystore '#{keystore_path}' -storepass '#{key_password}' -keypass '#{alias_password}' -signedjar '#{aab_path_signed}' '#{aab_path}' '#{alias_name}'`
+        puts ""
+        puts output
+
+        aab_path_signed
+      end
+
       def self.resolve_dir(path)
         if !File.directory?(path)
           path = File.join(Dir.pwd, path)
@@ -322,6 +339,34 @@ module Fastlane
         data
       end
 
+      def self.resolve_aab_path(aab_path)
+
+        # Set default AAB path if not set:
+        if aab_path.to_s.strip.empty?
+          aab_path = '/app/build/outputs/bundle/release/'
+        end
+
+        if !aab_path.to_s.end_with?('.aab')
+
+          aab_path = self.resolve_dir(aab_path)
+
+          pattern = File.join(aab_path, '*.aab')
+          files = Dir[pattern]
+
+          for file in files
+            if file.to_s.end_with?('.aab') && !file.to_s.end_with?("-signed.aab")
+              apk_path = file
+              break
+            end
+          end
+
+        else
+          aab_path = self.resolve_file(aab_path)
+        end
+
+        aab_path
+      end
+
       def self.resolve_apk_path(apk_path)
 
         # Set default APK path if not set:
@@ -366,6 +411,7 @@ module Fastlane
         git_url = params[:git_url]
         package_name = params[:package_name]
         apk_path = params[:apk_path]
+        aab_path = params[:aab_path]
         existing_keystore = params[:existing_keystore]
         match_secret = params[:match_secret]
         override_keystore = params[:override_keystore]
@@ -575,13 +621,13 @@ module Fastlane
           File.delete(properties_path)
         end
 
-        # Resolve path to the APK to sign:
-        output_signed_apk = ''
-        apk_path = self.resolve_apk_path(apk_path)
-
         # Sign APK:
-        if File.file?(apk_path)
+        if apk_path && File.file?(apk_path)
           UI.message("APK to sign: " + apk_path)
+        
+          # Resolve path to the APK to sign:
+          output_signed_apk = ''
+          apk_path = self.resolve_apk_path(apk_path)
 
           if File.file?(keystore_path)
 
@@ -598,16 +644,44 @@ module Fastlane
             )
             puts ''
           end 
-        else
-          UI.message("No APK file found at: #{apk_path}")
-        end
 
-        # Prepare contect shared values for next lanes:
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_PATH] = keystore_path
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_NAME] = alias_name
-        Actions.lane_context[SharedValues::MATCH_KEYSTORE_APK_SIGNED] = output_signed_apk
+          # Prepare contect shared values for next lanes:
+          Actions.lane_context[SharedValues::MATCH_KEYSTORE_PATH] = keystore_path
+          Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_NAME] = alias_name
+          Actions.lane_context[SharedValues::MATCH_KEYSTORE_APK_SIGNED] = output_signed_apk
 
-        output_signed_apk
+          output_signed_apk
+        # Sign AAB
+        elsif aab_path && File.file?(aab_path)
+          UI.message('AAB to sign: '+ aab_path)
+
+          # Resolve path to the AAB to sign:
+          output_signed_aab = ''
+          aab_path = self.resolve_aab_path(aab_path)
+
+          if File.file?(keystore_path)
+
+            UI.message("Signing the AAB...")
+            puts ''
+            output_signed_aab = self.sign_aab(
+              aab_path, 
+              keystore_path, 
+              key_password, 
+              alias_name, 
+              alias_password
+            )
+            puts ''
+          end 
+
+          # Prepare contect shared values for next lanes:
+          Actions.lane_context[SharedValues::MATCH_KEYSTORE_PATH] = keystore_path
+          Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_NAME] = alias_name
+          Actions.lane_context[SharedValues::MATCH_KEYSTORE_AAB_SIGNED] = output_signed_aab
+
+          output_signed_aab
+        else
+          UI.message("No APK or AAB file found")
+        end
       end
 
       def self.description
@@ -615,7 +689,7 @@ module Fastlane
       end
 
       def self.authors
-        ["Christopher NEY"]
+        ["Christopher NEY", "Simon Scherzinger"]
       end
 
       def self.return_value
@@ -626,7 +700,8 @@ module Fastlane
         [
           ['MATCH_KEYSTORE_PATH', 'File path of the Keystore fot the App.'],
           ['MATCH_KEYSTORE_ALIAS_NAME', 'Keystore Alias Name.'],
-          ['MATCH_KEYSTORE_APK_SIGNED', 'Path of the signed APK.']
+          ['MATCH_KEYSTORE_APK_SIGNED', 'Path of the signed APK.'],
+          ['MATCH_KEYSTORE_AAB_SIGNED', 'Path of the signed AAB.']
         ]
       end
 
@@ -652,6 +727,11 @@ module Fastlane
                                 description: "Path of the APK file to sign",
                                    optional: true,
                                        type: String),
+          FastlaneCore::ConfigItem.new(key: :aab_path,
+                                   env_name: "MATCH_KEYSTORE_AAB_PATH",
+                                description: "Path of the AAB file to sign",
+                                   optional: true,
+                                       type: String),
           FastlaneCore::ConfigItem.new(key: :match_secret,
                                    env_name: "MATCH_KEYSTORE_SECRET",
                                 description: "Secret to decrypt keystore.properties file (CI)",

data/lib/fastlane/plugin/match_keystore/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module MatchKeystore
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-match_keystore
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Christopher NEY
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.6
+rubygems_version: 3.2.17
 signing_key: 
 specification_version: 4
 summary: Easily sync your Android keystores across your team