cocoapods-flutter-dt 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bed8741ae242f98724e034453bd5cace2cff801123f35a2203bcafd5fe68bbc
-  data.tar.gz: f4ea33ea4c4088b71f38139cb699833baf3d9f9e6ef1dba7867ae80d2005bffa
+  metadata.gz: d2421a480d1a7ad5eb76e8a4bd8254593832f4892dfa846c4c60036bff94a164
+  data.tar.gz: 1e708eb4a7790856232eda465eda1647ec8312dc429bebe6d96192eae0e5c7f4
 SHA512:
-  metadata.gz: 257362bcedd494984ecaea180b61e74fc0f64a9bdd02179efd6c7bfb9b72d541c46cfa1fa9ff7d2df7c8b0262398be550af6531a67016613368731dad9e849c7
-  data.tar.gz: a64644b829f8d24bdcb73278dbff233cc7064aafc236ecf452f46a53c1d0e116d9b0c430e20d9d5cf714e80a318dfbd5656f7a7755ef0b07b27dc6935ab1c146
+  metadata.gz: cdfea592a158629ce42d65555e4d6f922aa01e64f04b78863e8e90c967820ca003bd47de679e9bee6468a9f9e660afac6981b419bc407b6a550e8ae009f21de7
+  data.tar.gz: ccabda6e51e234003fa4b658809c4edbbb82fb53ab97bd1909ba4cae4d1affb1594ba736f24484dae8b3d6585e7b1c8bcccdd2a43b3b9f6f1e3fa1473152def2

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.1.0"
+  VERSION = "0.2.0"
 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,26 @@ class Archiver
   end
 
   def build_framework
-    if CommandRunner.run(@flutter_wrapper, 'build','ios-framework','--no-profile',"--output=#{@product_dir}") == false
+
+    commands = [
+        @flutter_wrapper,
+        'build',
+        'ios-framework',
+        "--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 --no-profile --output=#{@product_dir} "
+      raise "Error running #{commands.join ' '} "
     end
   end
 
@@ -366,10 +391,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"

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.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - "\bDreamtracer"
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel