fastlane-plugin-android_versioning 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d58c9d85d39b8503d7ee40abca62f2c07950785
-  data.tar.gz: 14dbee51039e198aef515cded31ee201c30089e9
+  metadata.gz: 82b09a7fe923b9f8ea150119279f720113464ac0
+  data.tar.gz: 3b549baf3c47f66b91aa11c72c0c49662278eec2
 SHA512:
-  metadata.gz: e367118d9378586d998c9800863f2f73e73868ae94227afefd07e3c68fc2e87247501aa9b5837ac8c764738bf675c4dbef73db5442831b9bfc390f828a064566
-  data.tar.gz: c3f2f17a0752f4bb72d52b133a0926907f03662278f940736724361ffbfebf00788a98544470934449c1141afd4f221b1847bacdff50636af3286f6892121dbd
+  metadata.gz: cda70a5d6148c970c49f6f6f4fbe716becc2a0a7374485c406e2441255598a086914925c2d43986c2694cb24e41d6dc5d4b0c5d84a90869f5d5779d0c3a87e5b
+  data.tar.gz: b8c01e2954e8d08c91318d3fc7db8d6d33d436e5da3f1eb4fa64b0df91a624f49deb4cfa9f6312b0c0004447c3e7a44211ed35c68c5745712231cdf07e87ba92

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

@@ -6,14 +6,33 @@ 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?)
         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.include? " #{flavor} "
+                    next
+                  end
+                  flavorFound = true
+                end
+
                 unless line.match(regex) and !found
                   next
                 end
@@ -38,6 +57,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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -7,12 +7,33 @@ 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?)
         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.include? " #{flavor} "
+                    temp_file.puts line
+                    next
+                  end
+                  flavorFound = true
+                end
+
                 unless line.match(regex) and !found
                   temp_file.puts line
                   next
@@ -42,6 +63,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

@@ -1,5 +1,5 @@
 module Fastlane
   module AndroidVersioning
-    VERSION = "0.5.1"
+    VERSION = "0.5.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-android_versioning
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Manabu OHTAKE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2020-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry