fastlane-plugin-flutter 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3285411bae73b95137074776448187327f176908
-  data.tar.gz: ea813359aba6ea098d16aff0483e1c75c2617dbc
+  metadata.gz: 47d53bc585a939cb6dc95ab9b5772b209e94fbdc
+  data.tar.gz: ebb83498b3c1ca6ab2b24d6d599669425080bea3
 SHA512:
-  metadata.gz: ce2458bb2d0243aefe7779e0e56483721773de4c19a89893ce14d845b635791b8a8e988cef934f398a8a7a4e13693d7f53a7039a1d65afbb8879faf84762633b
-  data.tar.gz: b67967887ab9bd14b65b9eb0a02b8f12f334406b8163b30d7ab593e6dbca04c9274b8bd77ea7a26cfaf3af454324646a1b5cd1c541d54abb8e62d282db65197f
+  metadata.gz: f27e2b916851836e9d94e4110a8e833a938c3e95a548998191e7a9eba97ba98d7e3468d7a12c0185a06b3ee254584e23d59448724b5dc5ac7e1273754a79b0ca
+  data.tar.gz: 5683a49532741a8511130f9fed57b7090af7a197464e92fb9a6f31c531b127a4d34c24a9ef55a79f54905ce84986ca9ef24aaa3f61ffd7f2cd506d624de13f3c

data/lib/fastlane/plugin/flutter/actions/flutter_action.rb

@@ -250,9 +250,11 @@ module Fastlane
             description: <<-'DESCRIPTION',
               Override build name in pubspec.yaml. Can be either a string, or a
               schema definition, ex.: vcs* (take from VCS, add "*" for dirty
-              tree), vcs (take from VCS, no dirty mark).
-              NOTE: for App Store, must be in the format of at most 3 integeres
-                    separated by a dot (".").
+              tree), vcs (take from VCS, no dirty mark), ^vcs (take from the
+              latest VCS tag which must be in the form X.Y, and add the number
+              of commits since that tag as the third number, unless it's zero).
+              NOTE: for App Store, build name must be in the format of at most 3
+                    integeres separated by a dot (".").
             DESCRIPTION
             optional: true,
             verify_block: Helper::FlutterHelper.method(:build_name),

data/lib/fastlane/plugin/flutter/helper/flutter_helper.rb

@@ -88,9 +88,30 @@ module Fastlane
       end
 
       def self.build_name(schema)
-        if schema && schema.start_with?('vcs')
-          dirty_mark = schema['vcs'.size..-1]
-          Actions.sh(*%W(git describe --tags --dirty=#{dirty_mark})).strip
+        if schema && schema =~ /^(\^)?vcs(.*)$/
+          schema_caret = $1
+          schema_dirty_mark = $2
+          vcs_version = Actions.sh(
+            *%W(git describe --tags --dirty=#{schema_dirty_mark})
+          ).strip
+
+          # We try to match, otherwise assume vcs_version = $TAG, which means
+          # that there are 0 commits since the latest tag.
+          if schema_caret && vcs_version =~ /^
+                  (\d+[.]\d+)-
+                  (\d+)-
+                  g.*?
+                  (#{Regexp.quote(schema_dirty_mark)})?
+                $/x
+
+            vcs_version = "#{$1}.#{$2}"
+            # Making the best guess whether it's dirty.
+            if $3
+              vcs_version += schema_dirty_mark
+            end
+          end
+
+          vcs_version
         else
           schema
         end
@@ -127,7 +148,7 @@ module Fastlane
           end
         end
 
-        download_android_dependencies
+        Dir.chdir('android') { Actions.sh('./gradlew', 'dependencies') }
       end
 
       def self.android_sdk_root!
@@ -139,35 +160,6 @@ module Fastlane
         end
       end
 
-      def self.download_android_dependencies
-        Tempfile.create('resolveDependencies.gradle') do |init_script|
-          init_script.puts(<<-GRADLE)
-          allprojects {
-              task resolveDependencies {
-                  doLast {
-                      project.configurations.each { configuration ->
-                          if (configuration.isCanBeResolved()) {
-                              configuration.resolve()
-                          }
-                      }
-                      project.buildscript.configurations.each { configuration ->
-                          if (configuration.isCanBeResolved()) {
-                              configuration.resolve()
-                          }
-                      }
-                  }
-              }
-          }
-          GRADLE
-          init_script.flush
-
-          Dir.chdir('android') do
-            Actions.sh('./gradlew', '--init-script', init_script.path,
-                       '--', ':resolveDependencies')
-          end
-        end
-      end
-
       # https://stackoverflow.com/a/5471032/8584735
       def self.which(cmd)
         exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Artem Sheremet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry