cocoapods-flutter-dt 0.0.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6773c77a111942be3122b95071790fac095c31b30fc22d7db1aabdc233b0b15d
-  data.tar.gz: 580a79db50c3f3deeff1f3e0a7c1dda813bb101e33dcf7250ed6093b291e5933
+  metadata.gz: 30593057e346c58f18759c524b77a011d5cd12433fff9cfe211d51a3825f2071
+  data.tar.gz: 911d51cab8ea3f676e6f418de5ddb0091c2c34d48762ce5552d79eff21718c25
 SHA512:
-  metadata.gz: 3a7a05f1ff25157d8ab47593337bc18c8cc6beb754b99c0f4df4253746045dab8a63b6d7858516656db0bd7ae60967101125f029eb5920ab3b7cb4246d794bef
-  data.tar.gz: 315b610b33a6735aa71fd7348b6d9c9052525da024742cd755d873687cbf5928aceadf59029dcf27610a9550beca625681051b3e4196bfcfcf4dc44b90cfc415
+  metadata.gz: 7c32fc9c6f4a3d54532472dd0f75296ad16e2a92755b75846d80d27cc95e40804920215cac5f30e710f588ba6aa84b2260e092bc683c2293ec58f406247a6c3d
+  data.tar.gz: b32b17de918b945f6462d223a841493e222d1b7175a2d1e12d472b54796c2e72e16fd7533b4b0dd0ad9d4fc38eb1b29e716c3a81453887ce83a946023476b89a

data/lib/cocoapods-flutter/command/flutter/archive.rb

@@ -20,7 +20,9 @@ module Pod
               ['--upgrade', 'pub upgrade'],
               ['--wrapper', 'Default is flutter'],
               ['--flutterversion', 'FlutterSDK version'],
-              ['--buildrun', 'run build-runner']
+              ['--buildrun', 'run build-runner'],
+              ['--debug', 'debug mode'],
+              ['--release', 'release mode'],
           ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
         end
 
@@ -52,21 +54,49 @@ module Pod
             @version = versions.join "."
           end
 
+
+          @build_modes = []
           @pod_repo = argv.option('repo', 'master')
           @sources = argv.option('sources', 'https://github.com/CocoaPods/Specs.git').split(',')
           @flutter_wrapper = argv.option('wrapper', 'flutter')
           @pub_upgrade = argv.flag?('upgrade', true)
-          @flutter_version = argv.option('flutterversion', '1.12.13')
+          @flutter_version = argv.option('flutterversion', default_fluttter_version)
           @build_run = argv.flag?('buildrun', true)
           @working_dir = Dir.pwd
+
+          if argv.flag?('debug', true)
+            @build_modes.append 'debug'
+          end
+          if argv.flag?('release', true)
+            @build_modes.append 'release'
+          end
+
           super
         end
 
         def run
-          archiver = Archiver.new(@module_name, @version, @sources, @flutter_wrapper, @pub_upgrade, @flutter_version, @build_run, @working_dir,@pod_repo)
+          archiver = Archiver.new(@module_name, @version, @sources, @flutter_wrapper, @pub_upgrade, @flutter_version, @build_run, @working_dir,@pod_repo, @build_modes)
           archiver.archive
         end
 
+        def default_fluttter_version
+          flutter_version = ''
+          stdin, stdout_stderr, wait_thr = Open3.popen2e(@flutter_wrapper, '--version');
+          stdout_stderr.each_line do |line|
+            if line.start_with?('Flutter ')
+              flutter_version = line.split(' • ').first.split(' ').last
+            end
+          end
+          exit_status = wait_thr.value
+          if exit_status.success?
+            puts stdout_stderr.gets
+          else
+            raise stdout_stderr.gets
+          end
+          stdout_stderr.close
+          stdin.close
+          flutter_version
+        end
       end
     end
   end

data/lib/cocoapods-flutter/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFlutter
-  VERSION = "0.0.8"
+  VERSION = "0.2.1"
 end

data/lib/cocoapods-flutter/native/archive/archive.rb

@@ -32,7 +32,7 @@ class Archiver
 
   public
 
-  def initialize(module_name, version, sources, flutter_wrapper, pub_upgrade, flutter_version, build_run, working_dir, repo)
+  def initialize(module_name, version, sources, flutter_wrapper, pub_upgrade, flutter_version, build_run, working_dir, repo, build_modes)
     @module_name = module_name
     @version = version
     @sources = sources
@@ -43,6 +43,7 @@ class Archiver
     @working_dir = working_dir
     @product_dir = "#{@working_dir}/.product/"
     @pod_repo = repo
+    @build_modes = build_modes
   end
 
   def archive
@@ -59,8 +60,15 @@ class Archiver
     end
     build_framework
     @plugins = fetch_plugins
-    debug
-    release
+
+    if @build_modes.include?('debug')
+      debug
+    end
+
+    if @build_modes.include?('release')
+      release
+    end
+
     Pod::UserInterface.message "All is ready to use!, now you can use 'flutter_pod '#{@module_name}', '#{@version}', :mode=>'debug/release' to use the pod"
   end
 
@@ -193,9 +201,27 @@ class Archiver
   end
 
   def build_framework
-    if CommandRunner.run(@flutter_wrapper, 'build','ios-framework',"--output=#{@product_dir}") == false
+
+    commands = [
+        @flutter_wrapper,
+        'build',
+        'ios-framework',
+        '--no-universal',
+        "--output=#{@product_dir}",
+        '--no-profile'
+    ]
+
+    if @build_modes.include?('debug') == false
+      commands.append '--no-debug'
+    end
+
+    if @build_modes.include?('release') == false
+      commands.append '--no-release'
+    end
+
+    if CommandRunner.run(*commands) == false
       # FileUtils.remove_dir product_dir, true
-      raise "Error running #{@flutter_wrapper} build ios-framework --output=#{@product_dir} "
+      raise "Error running #{commands.join ' '} "
     end
   end
 
@@ -366,10 +392,10 @@ end
       s.license               = { :type => 'BSD' }
       s.author                = { 'Dreamtracer' => 'http://dreamtracer.top' }
       s.source                = { :http => app_download_url }
-      s.ios.deployment_target = '9.0'
+      s.ios.deployment_target = '10.0'
       s.prepare_command = "ruby download_sdk.rb #{sdk_download_url}"
-      s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
-      s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }
+      s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 x86_64' }
+      s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 x86_64' }
       vendored_frameworks = ["App.framework", "Flutter.framework", "FlutterPluginRegistrant.framework"]
       @plugins.each do |plugin|
         vendored_frameworks.append "#{plugin.name}.framework"
@@ -388,7 +414,7 @@ end
     end
 
     Dir.chdir temp_dir do |dir|
-      Pod::Command::Repo::Push.run([@pod_repo, '--verbose', '--allow-warnings', "--sources=#{@sources.join(',')}"])
+      Pod::Command::Repo::Push.run([@pod_repo, '--skip-import-validation', '--verbose', '--allow-warnings', "--sources=#{@sources.join(',')}"])
     end
 
   end

data/lib/cocoapods-flutter/native/archive/command_runner.rb

@@ -5,13 +5,19 @@ class CommandRunner
   def CommandRunner.run(*args)
     command = args.join ' '
     Pod::UserInterface.info "Running #{command}..."
-    stdin, stdout, stderr, wait_thr = Open3.popen3(*args)
+    stdin, stdout_stderr, wait_thr = Open3.popen2e(*args)
+    Thread.new do
+      stdout_stderr.each {|l| puts l }
+    end
+
     exit_status = wait_thr.value
     if exit_status.success?
-      puts stdout.gets
+      puts stdout_stderr.gets
     else
-      puts stderr.gets
+      puts stdout_stderr.gets
     end
+    stdin.close
+    stdout_stderr.close
     return exit_status.success?
   end
 end

data/lib/cocoapods-flutter/native/podfile.rb

@@ -67,7 +67,6 @@ module Pod
           end
           return
         end
-
         pod "#{flutter_project_name}_#{flutter_project_mode}", flutter_project_version
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-flutter-dt
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.2.1
 platform: ruby
 authors:
 - "\bDreamtracer"
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel