fastlane-plugin-match_keystore 0.1.18 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a109e0eb2a91578a04778376e7a615618e06a85e4b62f303bb05e02b17475d82
-  data.tar.gz: 1d1c7e90bded78f03eb4056e5a1789f06de6e47fa8b1c0d53eb70e2f5a7c224a
+  metadata.gz: 554236b09184bb0b50f9209ae0de3ba469e58bd66a5c0cc28880e8e259f3721a
+  data.tar.gz: b6c33c5ec05a4f72e2cbc04db6e64b2048b361408bedbaa9fe58e52908cbc5b3
 SHA512:
-  metadata.gz: 1da211c6429b73a41c3f997215902de7329d397e8976e42bbb79c4a61663bf4843ea1872e3a9756bb112039c7d11e0f42ec9f3d2346f7c4e0071fe0f190d92a4
-  data.tar.gz: 1c6abba20d95cd5b01659fd787c6e0fbbb718fc62cb4785781c3710bc6289933f6454fc54d67bd03c5dae4e47c03690b94992713c1ca18cdd0a2a4c52d975e84
+  metadata.gz: f99fe0dbb68617919711aaded1054d931a85dbc8730f2ac69fd289341389014fb02a25cc58b833c148991e85bb871cf360450821cff284427c60c6d7000f0f42
+  data.tar.gz: c9de35e3c6cae52e1dca0d78823079f1239bc890df3c5865fb288f1fbe666e181ddba39d5de9136bb82622bdfc380c79b5b045907ca2e5d5df95df87448222b4

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

@@ -16,10 +16,8 @@ module Fastlane
 
     class MatchKeystoreAction < Action
 
-      def self.openssl_path
-        path = "/usr/local/opt/openssl@1.1/bin"
-        path
-      end
+      KEY_VERSION = "2"
+      OPENSSL_BIN_PATH_MAC = "/usr/local/opt/openssl@1.1/bin"
 
       def self.to_md5(value)
         hash_value = Digest::MD5.hexdigest value
@@ -120,8 +118,7 @@ module Fastlane
 
       def self.openssl(forceOpenSSL)
         if forceOpenSSL
-          path = openssl_path
-          output = "#{path}/openssl"
+          output = "#{self::OPENSSL_BIN_PATH_MAC}/openssl"
         else
           output = "openssl"
         end
@@ -256,46 +253,47 @@ module Fastlane
         build_tools_path = self.get_build_tools(version_targeted)
         UI.message("Build-tools path: #{build_tools_path}")
 
-        # https://developer.android.com/studio/command-line/zipalign
-        if zip_align != false
-          apk_path_aligned = apk_path.gsub(".apk", "-aligned.apk")
-          `rm -f '#{apk_path_aligned}'`
-          UI.message("Aligning APK (zipalign): #{apk_path}")
-          output = `#{build_tools_path}zipalign -v 4 '#{apk_path}' '#{apk_path_aligned}'`
-          puts ""
-          puts output
-
-          if !File.file?(apk_path_aligned)
-            raise "Aligned APK not exists!"
-          end
-
-        else
-          UI.message("No zip align - deactivated via parameter!")
-          apk_path_aligned = apk_path
-        end
+        # https://developer.android.com/studio/command-line/apksigner
         apk_path_signed = apk_path.gsub(".apk", "-signed.apk")
         apk_path_signed = apk_path_signed.gsub("unsigned", "")
         apk_path_signed = apk_path_signed.gsub("--", "-")
-
-        # https://developer.android.com/studio/command-line/apksigner
         `rm -f '#{apk_path_signed}'`
-        UI.message("Signing APK: #{apk_path_aligned}")
+
+        UI.message("Signing APK (input): #{apk_path}")
         apksigner_opts = ""
         build_tools_version = self.get_build_tools_version(version_targeted)
         UI.message("Build-tools version: #{build_tools_version}")
         if Gem::Version.new(build_tools_version) >= Gem::Version.new('30')
           apksigner_opts = "--v4-signing-enabled false "
         end
-        output = `#{build_tools_path}apksigner sign --ks '#{keystore_path}' --ks-key-alias '#{alias_name}' --ks-pass pass:'#{key_password}' --key-pass pass:'#{alias_password}' --v1-signing-enabled true --v2-signing-enabled true #{apksigner_opts}--out '#{apk_path_signed}' '#{apk_path_aligned}'`
+        output = `#{build_tools_path}apksigner sign --ks '#{keystore_path}' --ks-key-alias '#{alias_name}' --ks-pass pass:'#{key_password}' --key-pass pass:'#{alias_password}' --v1-signing-enabled true --v2-signing-enabled true #{apksigner_opts}--out '#{apk_path_signed}' '#{apk_path}'`
         puts ""
         puts output
 
-        UI.message("Verifing APK signature: #{apk_path_signed}")
+        UI.message("Verifing APK signature (output): #{apk_path_signed}")
         output = `#{build_tools_path}apksigner verify '#{apk_path_signed}'`
         puts ""
         puts output
+
+
+        # https://developer.android.com/studio/command-line/zipalign
         if zip_align != false
+          apk_path_aligned = apk_path_signed.gsub(".apk", "-aligned.apk")
           `rm -f '#{apk_path_aligned}'`
+          UI.message("Aligning APK (zipalign): #{apk_path_signed}")
+          output = `#{build_tools_path}zipalign -v 4 '#{apk_path_signed}' '#{apk_path_aligned}'`
+          puts ""
+          puts output
+
+          if !File.file?(apk_path_aligned)
+            raise "Aligned APK not exists!"
+          end
+
+          `rm -f '#{apk_path_signed}'`
+          apk_path_signed = apk_path_aligned
+  
+        else
+          UI.message("No zip align - deactivated via parameter!")
         end
 
         apk_path_signed
@@ -400,6 +398,11 @@ module Fastlane
         # Check OpenSSL:
         self.check_ssl_version(false)
 
+        # Check is backward-compatibility is required:
+        if !compat_key.to_s.strip.empty?
+          UI.message("Compatiblity version: #{compat_key}")
+        end
+
         # Init workign local directory:
         dir_name = ENV['HOME'] + '/.match_keystore'
         unless File.directory?(dir_name)
@@ -408,7 +411,11 @@ module Fastlane
         end
 
         # Init 'security password' for AES encryption:
-        key_name = "#{self.to_md5(git_url)}.hex"
+        if compat_key == "1"
+          key_name = "#{self.to_md5(git_url)}.hex"
+        else
+          key_name = "#{self.to_md5(git_url)}-#{self::KEY_VERSION}.hex"
+        end
         key_path = File.join(dir_name, key_name)
         # UI.message(key_path)
         if !File.file?(key_path)
@@ -456,14 +463,10 @@ module Fastlane
         gitDir = File.join(repo_dir, '/.git')
         if !File.directory?(gitDir)
           UI.message("Cloning remote Keystores repository...")
-          puts ''
           `git clone #{git_url} #{repo_dir}`
-          puts ''
         else
           UI.message("Pulling remote Keystores repository...")
-          puts ''
           `cd #{repo_dir} && git pull`
-          puts ''
         end
 
         # Load parameters from JSON for CI or Unit Tests:
@@ -564,7 +567,7 @@ module Fastlane
           self.decrypt_file(properties_encrypt_path, properties_path, key_path, false)
 
           properties = self.load_properties(properties_path)
-          Pry::ColorPrinter.pp(properties)
+          # Pry::ColorPrinter.pp(properties)
           key_password = properties['keyPassword']
           alias_name = properties['aliasName']
           alias_password = properties['aliasPassword']

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-match_keystore
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.2.0
 platform: ruby
 authors:
 - Christopher NEY
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2021-03-17 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.0.3
+rubygems_version: 3.2.6
 signing_key: 
 specification_version: 4
 summary: Easily sync your Android keystores across your team