fastlane-plugin-flutter 0.4.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1103e664db0814cd15485b5749b0e8a99acfd3bad2ca56d5657b4faac8ed167b
-  data.tar.gz: 3f0c48ae721b5a8224a23cedfd89f2c604d16de58c0400d30b18a89751828944
+  metadata.gz: 850e54c27628397e666fc6891f194099be8c0ab99ae465c58b33f2735ece8b53
+  data.tar.gz: 99e0b65d86165f064d9db289511629c5afd15854f3b12c7b7cae3992d3f51060
 SHA512:
-  metadata.gz: 206bcbb624408a2cc7dc21a940e3374caaa8f74d1e20dff50773a8b4dcc200431829a6ec408f56b611fecc70ad293b7546cde4a6456ca0f07301c002d2ed440f
-  data.tar.gz: 100a47609d3a003219771d792576787e1707d6894fc96685ad6a39ad5afbcd2f61e2e6bad7b246cf8bd548f27d0176bb6c6f40a5866b4f3d750e412dcc98b07a
+  metadata.gz: 84dd37b21ceba829ee3500fc2696e6d63da9036a23efa9bc84bc919032b05db10b64bf0f8c6caeda65ab70de2ecbc7589a7eb5014877ac78ad0914f4888525f6
+  data.tar.gz: ac0c75e59ca975897caee138e093a98a5ea2da7208548cc8fd957945a960a1f6b9ab86afcf8c02b1612d0a32f414f6a56ee8b39cd32a69d46d857348cda422e4

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

@@ -34,7 +34,7 @@ module Fastlane
         else
           Helper::FlutterHelper.git(
             'clone', # no --depth limit to keep Flutter tag-based versioning.
-            "--branch=#{flutter_channel || 'beta'}",
+            "--branch=#{flutter_channel || 'stable'}",
             '--quiet',
             '--',
             FLUTTER_REMOTE_REPOSITORY,

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

@@ -52,16 +52,7 @@ module Fastlane
 
         Helper::FlutterHelper.flutter('build', *build_args) do |status, res|
           if status.success?
-            artifacts = res.scan(/Built (.*?)(:? \([^)]*\))?\.$/).
-                        map { |path| File.absolute_path(path[0]) }
-            if artifacts.size == 1
-              lane_context[SharedValues::FLUTTER_OUTPUT] = artifacts.first
-            elsif artifacts.size > 1
-              # Could be the result of "flutter build apk --split-per-abi".
-              lane_context[SharedValues::FLUTTER_OUTPUT] = artifacts
-            else
-              UI.important('Cannot parse built file path from "flutter build"')
-            end
+            process_build_output(res, build_args)
             # gym (aka build_ios_app) action call may follow build; let's help
             # it identify the project, since Flutter project structure is
             # usually standard.
@@ -125,6 +116,21 @@ form instead.
         end
       end
 
+      def self.process_build_output(output, build_args)
+        artifacts = output.scan(/Built (.*?)(:? \([^)]*\))?\.$/).
+                    map { |path| File.absolute_path(path[0]) }
+        if artifacts.size == 1
+          lane_context[SharedValues::FLUTTER_OUTPUT] = artifacts.first
+        elsif artifacts.size > 1
+          # Could be the result of "flutter build apk --split-per-abi".
+          lane_context[SharedValues::FLUTTER_OUTPUT] = artifacts
+        elsif build_args.include?('--config-only')
+          UI.message('Config-only "build" detected, no output file name')
+        else
+          UI.important('Cannot parse built file path from "flutter build"')
+        end
+      end
+
       def self.description
         'Run "flutter build" to build a Flutter application'
       end

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

@@ -13,32 +13,47 @@ module Fastlane
       end
 
       def self.flutter_sdk_root
+        # Support flutterw and compatible projects.
+        # Prefixing directory name with "." has a nice effect that Flutter tools
+        # such as "format" and "lint" will not recurse into this subdirectory
+        # while analyzing the project itself. This works immensely better than
+        # e.g. vendor/flutter.
+        pinned_flutter_path = File.join(Dir.pwd, '.flutter')
+
         @flutter_sdk_root ||= File.expand_path(
-          if ENV.include?('FLUTTER_SDK_ROOT')
-            UI.deprecated(
-              'FLUTTER_SDK_ROOT environment variable is deprecated. ' \
-              'To point to a Flutter installation directory, use ' \
-              'FLUTTER_ROOT instead.'
-            )
-            ENV['FLUTTER_SDK_ROOT']
+          if flutter_installed?(pinned_flutter_path)
+            UI.message("Determined Flutter location as #{pinned_flutter_path}" \
+              " because 'flutter' executable exists there.")
+            pinned_flutter_path
           elsif ENV.include?('FLUTTER_ROOT')
             # FLUTTER_ROOT is a standard environment variable from Flutter.
+            UI.message("Determined Flutter location as #{ENV['FLUTTER_ROOT']}" \
+              " because environment variable FLUTTER_ROOT points there" \
+              " (current directory is #{Dir.pwd}).")
             ENV['FLUTTER_ROOT']
           elsif flutter_binary = FastlaneCore::CommandExecutor.which('flutter')
-            File.dirname(File.dirname(flutter_binary))
+            location = File.dirname(File.dirname(flutter_binary))
+            UI.message("Determined Flutter location as #{location} because"\
+              " 'flutter' executable in PATH is located there" \
+              " (current directory is #{Dir.pwd}).")
+            location
           else
-            File.join(Dir.pwd, 'vendor', 'flutter')
+            # Where we'd prefer to install flutter.
+            UI.message("Determined desired Flutter location as" \
+              " #{pinned_flutter_path} because that's where this fastlane" \
+              " plugin would install Flutter by default.")
+            pinned_flutter_path
           end
         )
       end
 
-      def self.flutter_installed?
+      def self.flutter_installed?(custom_flutter_root = nil)
         # Can't use File.executable? because on Windows it has to be .exe.
-        File.exist?(flutter_binary)
+        File.exist?(flutter_binary(custom_flutter_root))
       end
 
-      def self.flutter_binary
-        File.join(flutter_sdk_root, 'bin', 'flutter')
+      def self.flutter_binary(custom_flutter_root = nil)
+        File.join(custom_flutter_root || flutter_sdk_root, 'bin', 'flutter')
       end
 
       def self.dev_dependency?(package)

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

@@ -1,5 +1,5 @@
 module Fastlane
   module Flutter
-    VERSION = '0.4.2'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-flutter
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Artem Sheremet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -188,7 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Flutter actions plugin for Fastlane