fastlane-plugin-flutter 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: befee442f822fcd72b0f03757ea9dab1c6e46928
-  data.tar.gz: c5b82f37810c5339f365bb4e29e4eeeb9deb8e8b
+  metadata.gz: 3285411bae73b95137074776448187327f176908
+  data.tar.gz: ea813359aba6ea098d16aff0483e1c75c2617dbc
 SHA512:
-  metadata.gz: 1ae9f15d861ee0ecfcf1c463479c095e0d10b879c8e895931f26c132ef75a18f498b032b00c0df226692b07d6440a11a58590dfb5fd766bf6029631393197caa
-  data.tar.gz: 67f0085577d0ed74738b57559c99e7a16ad392e2c5ecd2356ed43dd946d5d5daf0309558bebfc617326cd3b3606d3bd28405081640f604172360c5e5414fb2ad
+  metadata.gz: ce2458bb2d0243aefe7779e0e56483721773de4c19a89893ce14d845b635791b8a8e988cef934f398a8a7a4e13693d7f53a7039a1d65afbb8879faf84762633b
+  data.tar.gz: b67967887ab9bd14b65b9eb0a02b8f12f334406b8163b30d7ab593e6dbca04c9274b8bd77ea7a26cfaf3af454324646a1b5cd1c541d54abb8e62d282db65197f

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

@@ -15,7 +15,7 @@ module Fastlane
     end
 
     class FlutterAction < Action
-      FLUTTER_ACTIONS = %(build analyze test format l10n)
+      FLUTTER_ACTIONS = %w(build analyze test format l10n bootstrap)
 
       PLATFORM_TO_FLUTTER = {
         ios: 'ios',
@@ -105,6 +105,8 @@ module Fastlane
           sh *%w(flutter format .)
         when 'l10n'
           run_l10n(params)
+        when 'bootstrap'
+          Helper::FlutterHelper.bootstrap_android(params[:android_licenses])
         end
       end
 
@@ -128,7 +130,7 @@ module Fastlane
           )
         end
 
-        sh *%w(flutter pub pub run intl_translation:extract_to_arb),
+        sh *%w(flutter packages pub run intl_translation:extract_to_arb),
            *extract_to_arb_options, params[:l10n_strings_file]
 
         if l10n_messages_was
@@ -175,7 +177,7 @@ module Fastlane
           end
         end
 
-        sh *%W(flutter pub pub run intl_translation:generate_from_arb
+        sh *%W(flutter packages pub run intl_translation:generate_from_arb
                --output-dir=#{output_dir}
                --no-use-deferred-loading
                #{params[:l10n_strings_file]}) + arb_files
@@ -209,7 +211,9 @@ module Fastlane
             optional: false,
             type: String,
             verify_block: proc do |value|
-              UI.user_error!("Supported actions are: #{FLUTTER_ACTIONS}") unless FLUTTER_ACTIONS.include?(value)
+              unless FLUTTER_ACTIONS.include?(value)
+                UI.user_error!("Supported actions are: #{FLUTTER_ACTIONS}")
+              end
             end,
           ),
           FastlaneCore::ConfigItem.new(
@@ -236,9 +240,6 @@ module Fastlane
               Override build number in pubspec.yaml. Can be either a number, or
               a schema definition, ex.: ci (take from CI) vcs (take from Git),
               ci+1000 (take from CI and add 1000).
-              WARNING: does not override Android build number specified in
-                       pubspec.yaml due to Flutter bug:
-                       https://github.com/flutter/flutter/issues/22788.
             DESCRIPTION
             optional: true,
             verify_block: Helper::FlutterHelper.method(:build_number),
@@ -252,9 +253,6 @@ module Fastlane
               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 (".").
-              WARNING: does not override Android build number specified in
-                       pubspec.yaml due to Flutter bug:
-                       https://github.com/flutter/flutter/issues/22788.
             DESCRIPTION
             optional: true,
             verify_block: Helper::FlutterHelper.method(:build_name),
@@ -291,6 +289,16 @@ module Fastlane
             is_string: false,
             default_value: true,
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :android_licenses,
+            env_name: 'FL_FLUTTER_ANDROID_LICENSES',
+            description: 'Hashes of accepted Android SDK linceses, which may ' \
+            'be found in $ANDROID_SDK_ROOT/licenses',
+            optional: true,
+            is_string: false,
+            verify_block: proc { |value| value.kind_of?(Hash) },
+            default_value: {},
+          ),
         ]
       end
 

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

@@ -1,6 +1,8 @@
 require 'fastlane_core/ui/ui'
+require 'fileutils'
 require 'json'
 require 'set'
+require 'tempfile'
 
 module Fastlane
   # UI = FastlaneCore::UI unless Fastlane.const_defined?("UI")
@@ -93,6 +95,90 @@ module Fastlane
           schema
         end
       end
+
+      # Bootstrap Flutter application for build with Android SDK:
+      # https://github.com/flutter/flutter/issues/28076
+      def self.bootstrap_android(licenses = {})
+        # Gradle will refuse to install Android SDK unless the SDK directory
+        # exists and licenses are accepted.
+        licenses_directory = File.join(android_sdk_root!, 'licenses')
+        FileUtils.mkdir_p(licenses_directory)
+        if licenses.any?
+          licenses.each_pair do |license, hash|
+            license_file = File.join(licenses_directory, license)
+            unless File.exist?(license_file) &&
+                   File.readlines(license_file).include?(hash)
+              File.open(license_file, 'a') { |f| f.puts('', hash) }
+            end
+          end
+        end
+
+        android_properties_file = 'android/local.properties'
+        flutter_sdk_par = 'flutter.sdk'
+        unless File.exist?(android_properties_file) &&
+               File.read(android_properties_file).include?(flutter_sdk_par)
+          flutter_sdk_path = File.dirname(File.dirname(which('flutter')))
+          File.open(android_properties_file, 'a') do |properties|
+            properties.write(<<-CONFIG.gsub(/^\s+/, ''))
+
+            ### Generated by #{$0}#{__method__} ###
+            #{flutter_sdk_par}=#{flutter_sdk_path}
+            CONFIG
+          end
+        end
+
+        download_android_dependencies
+      end
+
+      def self.android_sdk_root!
+        (ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT']).tap do |path|
+          unless path
+            raise 'Android SDK directory environment variables are not set. ' \
+              'See https://developer.android.com/studio/command-line/variables'
+          end
+        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(';') : ['']
+        ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+          end
+        end
+        nil
+      end
     end
   end
 end

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

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

metadata

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