fastlane-plugin-match_keystore 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02c4f28a1cdddaa21db5cc775e6e13b18317043120db76d70ef935d7947ad4e3
-  data.tar.gz: 81e444d74c3ffdc4ae3abb799ab449d2d3be0f66070d72826eec33e9223795ad
+  metadata.gz: f1078f38dbd52c6280d7c2324cb3d286ffe3792462797bf9f9eadb130cf5ae1c
+  data.tar.gz: 06e54a20de90f151ee42f796c40b7f33ffc102697136656ff15f8684e5926ae1
 SHA512:
-  metadata.gz: 1dd9655b85a8744dc702d0208e9644cc6ecac754dc56759a46bd17c851c23b22e0f95d439d74e6d4f49b2e3b4229d39bbec89caf90329dd1014b9aefb7ae469e
-  data.tar.gz: 7ba84196c4c15b18ab5e4868fc8f85191bb0828973c35c64c431ae613fa66776cc543fb091ed78ec9795bb053b09461c335da18dd37749b8cec7cb193e5591a8
+  metadata.gz: de5fc0acdd46b143953957646016be3df6fbb0238157332f949fee5ca137e73e9f9bc0d636031d50df2fd2ba0c2d442ad4c0a93e12c223904c29a058222c3439
+  data.tar.gz: 203b48b2df41b4e8acc2f97c68cc5a694e1dcaa543039a2bfac2c38ba2706281d6717de2aaf51e1fa57245cbf593c6ee30c39a8876adc209e08e585794e6d2dc

data/README.md

@@ -16,6 +16,22 @@ Easily sync your Android keystores across your team
 
 **Note to author:** Add a more detailed description about this plugin here. If your plugin contains multiple actions, make sure to mention them here.
 
+## How to use
+
+```ruby
+  lane :release_and_sign do |options|
+
+  	gradle(task: "clean")
+    gradle(task: 'assemble', build_type: 'Release')
+
+    match_keystore(
+      git_url: "https://github.com/<GITHUB_USERNAME>/keystores.git",
+      package_name: "com.your.package.name",
+      apk_path: "/app/build/outputs/apk/app-release.apk"
+    )
+  end
+```
+
 ## 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

@@ -76,7 +76,7 @@ module Fastlane
         if zip_align == true
           apk_path_aligned = apk_path.gsub(".apk", "-aligned.apk")
           puts `rm -f #{apk_path_aligned}`
-          puts `#{build_tools_path}zipalign -v 4 #{apk_path} #{apk_path_aligned}`
+          puts `#{build_tools_path}zipalign 4 #{apk_path} #{apk_path_aligned}`
         else
           apk_path_aligned = apk_path
         end
@@ -92,6 +92,20 @@ module Fastlane
         apk_path_signed
       end
 
+      def self.resolve_apk_path(apk_path)
+        if !apk_path.to_s.end_with?(".apk") 
+          pattern = File.join(apk_path, '*.apk')
+          files = Dir[pattern]
+          for file in files
+            if file.to_s.end_with?(".apk") && !file.to_s.end_with?("-signed.apk")  
+              apk_path = file
+              break
+            end
+          end
+        end
+        apk_path
+      end
+
       def self.run(params)
 
         git_url = params[:git_url]
@@ -218,9 +232,13 @@ module Fastlane
         Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_NAME] = alias_name
         Actions.lane_context[SharedValues::MATCH_KEYSTORE_ALIAS_PASSWORD] = alias_password
 
+        output_signed_apk = ''
+        apk_path = self.resolve_apk_path(apk_path)
+        UI.message("APK to sign: " + apk_path)
+
         if File.file?(keystore_path)
           UI.message("Signing the APK...")
-          self.sign_apk(
+          output_signed_apk = self.sign_apk(
             apk_path, 
             keystore_path, 
             key_password, 
@@ -230,6 +248,8 @@ module Fastlane
           )
         end 
 
+        output_signed_apk
+
       end
 
       def self.description
@@ -272,7 +292,7 @@ module Fastlane
                                        type: String),
           FastlaneCore::ConfigItem.new(key: :apk_path,
                                    env_name: "MATCH_KEYSTORE_APK_PATH",
-                                description: "Path of the APK file ot sign with Keystore",
+                                description: "Path of the APK file to sign",
                                    optional: false,
                                        type: String),
            FastlaneCore::ConfigItem.new(key: :override_keystore,

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

@@ -1,5 +1,5 @@
 module Fastlane
   module MatchKeystore
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-match_keystore
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Christopher NEY