RubyGems - fastlane-plugin-android_versioning - Versions diffs - 0.5.0 → 0.5.5 - Mend

fastlane-plugin-android_versioning 0.5.0 → 0.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c15697ef9a7304587fb5cbdbf519012d6cceb0d
-  data.tar.gz: f7ac71706010a1df57618e567bf7899b10b938ce
+SHA256:
+  metadata.gz: 745f98d04151c9106b767f1ae9ee53afdaf6218770019a24353f9f1c493313a4
+  data.tar.gz: 170a3ec0baa8a0fe69ea096646b963b9c4887901e8e5330420af1cd76d33681b
 SHA512:
-  metadata.gz: ce8936e9d2c2db095bc2a1986de3e73c3973800e63d64453220cd03e59e48b5276668ffb12bbc763a5dd52ef994b3ef97733bb89364a07e719a8df9603ff745a
-  data.tar.gz: 2006d4219e8775f5010fcf642a0ece4787965569283439bfe6c3c5050aa5fda263ceb4db13f3d7dfcbd34c8da397c0d1ca96926381ac849af42dd06b86c6195d
+  metadata.gz: 564d266aa0efe79e43e4339e63897826f622711c709cb78030b099fb6ae72d1b3a67727081268ea39320391b122c14deb384e563620bed3a16753165740c6824
+  data.tar.gz: e8ab43c7135842e3b1e382bce3a944600c5ed9505b9b162c2e4b54333d8774cca0056c8591a3b0c1fdacdec3ce2b3f6b3c15d8a0d891d7fadd94da276eaf0ed1

data/lib/fastlane/plugin/android_versioning/actions/get_value_from_build.rb CHANGED Viewed

@@ -6,12 +6,34 @@ module Fastlane
       def self.run(params)
         app_project_dir ||= params[:app_project_dir]
         regex = Regexp.new(/(?<key>#{params[:key]}\s+)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\.\_]*)(?<right>[\'\"]?)(?<comment>.*)/)
+        flavor = params[:flavor]
+        flavorSpecified = !(flavor.nil? or flavor.empty?)
+        regex_flavor = Regexp.new(/[ \t]#{flavor}[ \t]/)
         value = ""
         found = false
+        flavorFound = false
+        productFlavorsSection = false
         Dir.glob("#{app_project_dir}/build.gradle") do |path|
+          UI.verbose("path: #{path}")
+          UI.verbose("absolute_path: #{File.expand_path(path)}")
           begin
             File.open(path, 'r') do |file|
               file.each_line do |line|
+                if flavorSpecified and !productFlavorsSection
+                  unless line.include? "productFlavors"
+                    next
+                  end
+                  productFlavorsSection = true
+                end
+                if flavorSpecified and !flavorFound
+                  unless line.match(regex_flavor)
+                    next
+                  end
+                  flavorFound = true
+                end
                 unless line.match(regex) and !found
                   next
                 end
@@ -36,6 +58,11 @@ module Fastlane
                                   optional: true,
                                       type: String,
                              default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String),
           FastlaneCore::ConfigItem.new(key: :key,
                                description: "The property key",
                                       type: String)

data/lib/fastlane/plugin/android_versioning/actions/get_version_code.rb CHANGED Viewed

@@ -6,6 +6,7 @@ module Fastlane
       def self.run(params)
         GetValueFromBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionCode"
         )
       end
@@ -20,7 +21,12 @@ module Fastlane
                                  description: "The path to the application source folder in the Android project (default: android/app)",
                                     optional: true,
                                         type: String,
-                               default_value: "android/app")
+                               default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String)
         ]
       end

data/lib/fastlane/plugin/android_versioning/actions/get_version_name.rb CHANGED Viewed

@@ -6,6 +6,7 @@ module Fastlane
       def self.run(params)
         GetValueFromBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionName"
         )
       end
@@ -20,7 +21,12 @@ module Fastlane
                                  description: "The path to the application source folder in the Android project (default: android/app)",
                                     optional: true,
                                         type: String,
-                               default_value: "android/app")
+                               default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String)
         ]
       end

data/lib/fastlane/plugin/android_versioning/actions/increment_version_code.rb CHANGED Viewed

@@ -21,6 +21,7 @@ module Fastlane
         SetValueInBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionCode",
           value: new_version_code
         )
@@ -39,6 +40,11 @@ module Fastlane
                                          optional: true,
                                          type: String,
                                          default_value: "android/app"),
+            FastlaneCore::ConfigItem.new(key: :flavor,
+                                         env_name: "ANDROID_VERSIONING_FLAVOR",
+                                         description: "The product flavor name (optional)",
+                                         optional: true,
+                                         type: String),
             FastlaneCore::ConfigItem.new(key: :version_code,
                                          env_name: "ANDROID_VERSIONING_VERSION_CODE",
                                          description: "Change to a specific version (optional)",

data/lib/fastlane/plugin/android_versioning/actions/increment_version_name.rb CHANGED Viewed

@@ -31,6 +31,7 @@ module Fastlane
         end
         SetValueInBuildAction.run(
           app_project_dir: params[:app_project_dir],
+          flavor: params[:flavor],
           key: "versionName",
           value: new_version
         )
@@ -49,6 +50,11 @@ module Fastlane
                                   optional: true,
                                       type: String,
                              default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String),
           FastlaneCore::ConfigItem.new(key: :bump_type,
                                   env_name: "ANDROID_VERSIONING_BUMP_TYPE",
                                description: "Change to a specific type (optional)",

data/lib/fastlane/plugin/android_versioning/actions/set_value_in_build.rb CHANGED Viewed

@@ -6,13 +6,35 @@ module Fastlane
     class SetValueInBuildAction < Action
       def self.run(params)
         app_project_dir ||= params[:app_project_dir]
-        regex = Regexp.new(/(?<key>#{params[:key]}\s+)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\.\_]*)(?<right>[\'\"]?)(?<comment>.*)/)
+        regex = Regexp.new(/(?<key>#{params[:key]}\s+)(?<left>[\'\"]?)(?<value>[a-zA-Z0-9\-\.\_]*)(?<right>[\'\"]?)(?<comment>.*)/)
+        flavor = params[:flavor]
+        flavorSpecified = !(flavor.nil? or flavor.empty?)
+        regex_flavor = Regexp.new(/[ \t]#{flavor}[ \t]/)
         found = false
+        productFlavorsSection = false
+        flavorFound = false
         Dir.glob("#{app_project_dir}/build.gradle") do |path|
           begin
             temp_file = Tempfile.new('versioning')
             File.open(path, 'r') do |file|
               file.each_line do |line|
+                if flavorSpecified and !productFlavorsSection
+                  unless line.include? "productFlavors" or productFlavorsSection
+                    temp_file.puts line
+                    next
+                  end
+                  productFlavorsSection = true
+                end
+                if flavorSpecified and !flavorFound
+                  unless line.match(regex_flavor)
+                    temp_file.puts line
+                    next
+                  end
+                  flavorFound = true
+                end
                 unless line.match(regex) and !found
                   temp_file.puts line
                   next
@@ -42,6 +64,11 @@ module Fastlane
                                   optional: true,
                                       type: String,
                              default_value: "android/app"),
+          FastlaneCore::ConfigItem.new(key: :flavor,
+                                    env_name: "ANDROID_VERSIONING_FLAVOR",
+                                 description: "The product flavor name (optional)",
+                                    optional: true,
+                                        type: String),
           FastlaneCore::ConfigItem.new(key: :key,
                                description: "The property key",
                                       type: String),

data/lib/fastlane/plugin/android_versioning/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidVersioning
-    VERSION = "0.5.0"
+    VERSION = "0.5.5"
   end
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_versioning
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors:
 - Manabu OHTAKE
-autorequire:
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-27 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.17.0
-description:
+description:
 email: manabu2783@hotmail.com
 executables: []
 extensions: []
@@ -114,7 +114,7 @@ homepage: https://github.com/otkmnb2783/fastlane-plugin-android_versioning
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,9 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.1
-signing_key:
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Allows to set/get app version name and version code directly to/from build.gradle
 test_files: []