cocoapods-flutter-dt 0.2.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51c1e6b26f94766910cca087a1697b87106b48e2cc13474960262b6a90c1112e
-  data.tar.gz: 82b73cbf5750b86d629d881b049db9969662f1715f0581ac4c4c6ca81676620e
+  metadata.gz: 70acc69141278cc52466ce8627ea2ed9647d456f62e31660cc8ce133eadf8480
+  data.tar.gz: 77c5a34281bd9ec62c1ac0a5393df90f6d264619358e7ec6157500135a5b232d
 SHA512:
-  metadata.gz: 431372086b26158d86be83052d27fa5d1caee2844e00b056662645a17cfc7f66a0fc2b7f207cd01b165a2295ca5ab3911e340d28d974126e447013e248514aeb
-  data.tar.gz: cf5b96dad0f26cd345dfe6a05eaf1db9bebb72d2853d54d2deef3bf49e1a28d141de2618a27420285713e4980d9c045df190e9ab485f429d6c74d40949c35aab
+  metadata.gz: '07395563b55e1ed0d9a630764257dcd72676a67bb6260ee7365eb20d3f3358ca294d2b7218a0725f5eb0fdb2802b91eb3d994e51d75818799292613f94d3452e'
+  data.tar.gz: c25ec94332249ac292e20f122fc0210faae4cfce96661e9b1b0f9e9f37eedbf94875c8e4827fcdfadb39d795c65fa64a340f936cc820ff4c3aceee67770bf4ec

data/cocoapods-flutter.gemspec

@@ -20,10 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'parallel'
   spec.add_dependency 'plist'
-  spec.add_dependency 'cocoapods', '~> 1.11.2'
+  spec.add_dependency 'cocoapods', '~> 1.13.0'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
   spec.add_dependency 'rest-client'
   spec.add_dependency 'molinillo'
+  spec.add_dependency 'yaml'
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

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

@@ -23,36 +23,40 @@ module Pod
               ['--buildrun', 'run build-runner'],
               ['--debug', 'debug mode'],
               ['--release', 'release mode'],
+              ['--major', 'major version'],
+              ['--minor', 'minor version'],
+              ['--patch', 'patch version'],
           ].concat(Pod::Command::Repo::Push.options).concat(super).uniq
         end
 
         def initialize(argv)
           @module_name = argv.shift_argument
-          tmp_version = argv.shift_argument
-          #如果满足
-          if tmp_version =~ /([0-9]+\.)+[0-9]+/
-            @version = tmp_version
-          else
-            tmp_str = tmp_version.dup
-            last_v = "0"
-            mid_v = "0"
-            main_v = "0"
-            unless tmp_str.empty?
-              last_v = tmp_str.slice!(tmp_str.length - 1, 1)
-            end
-            unless tmp_str.empty?
-              mid_v = tmp_str.slice!(tmp_str.length - 1, 1)
-            end
-            unless tmp_str.empty?
-              main_v = tmp_str
-            end
-
-            versions = Array.new
-            versions << main_v
-            versions << mid_v
-            versions << last_v
-            @version = versions.join "."
-          end
+          @version = [argv.option('major'), argv.option('minor'), argv.option('patch')].join "."
+          # tmp_version = argv.shift_argument
+          # #如果满足
+          # if tmp_version =~ /([0-9]+\.)+[0-9]+/
+          #   @version = tmp_version
+          # else
+          #   tmp_str = tmp_version.dup
+          #   last_v = "0"
+          #   mid_v = "0"
+          #   main_v = "0"
+          #   unless tmp_str.empty?
+          #     last_v = tmp_str.slice!(tmp_str.length - 1, 1)
+          #   end
+          #   unless tmp_str.empty?
+          #     mid_v = tmp_str.slice!(tmp_str.length - 1, 1)
+          #   end
+          #   unless tmp_str.empty?
+          #     main_v = tmp_str
+          #   end
+          #
+          #   versions = Array.new
+          #   versions << main_v
+          #   versions << mid_v
+          #   versions << last_v
+          #   @version = versions.join "."
+          # end
 
 
           @build_modes = []
@@ -60,7 +64,7 @@ module Pod
           @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', default_fluttter_version)
+          @flutter_version = argv.option('flutterversion')
           @build_run = argv.flag?('buildrun', true)
           @working_dir = Dir.pwd
 
@@ -81,7 +85,7 @@ module Pod
 
         def default_fluttter_version
           flutter_version = ''
-          stdin, stdout_stderr, wait_thr = Open3.popen2e(@flutter_wrapper, '--version');
+          stdin, stdout_stderr, wait_thr = Open3.popen2e('fvm', @flutter_wrapper, '--version');
           stdout_stderr.each_line do |line|
             if line.start_with?('Flutter ')
               flutter_version = line.split(' • ').first.split(' ').last

data/lib/cocoapods-flutter/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsFlutter
-  VERSION = "0.2.7"
+  VERSION = "0.4.1"
 end

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

@@ -5,6 +5,7 @@ require 'cocoapods-flutter/native/archive/zip_tool'
 require 'cocoapods-flutter/native/archive/remote'
 require 'molinillo'
 require 'plist'
+require 'yaml'
 
 class Archiver
 
@@ -54,6 +55,9 @@ class Archiver
     #   end
     # end
 
+    #使用fvm切换flutter 版本
+    flutter_sdk_version_switch @flutter_version
+
     @pub_upgrade ? pub_upgrade : pub_get
     if local_podfile_exists?
       use_local_podfile
@@ -64,12 +68,13 @@ class Archiver
     if @build_run
       excute_build_run
     end
+
     build_framework
     @plugins = fetch_plugins
 
     if @build_modes.include?('debug')
       # Debug瘦身
-      thin_arm64 "#{@product_dir}Debug/App.framework/App"
+      #thin_arm64 "#{@product_dir}Debug/App.framework/App"
       debug
     end
 
@@ -80,41 +85,21 @@ class Archiver
     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
 
-  def make_flutter_pods(mode)
-    @pub_upgrade ? pub_upgrade : pub_get
-    setup_pod_sources
-    if @build_run
-      excute_build_run
-    end
-
-    build_app mode
+  private
 
-    flutter_spec_dir = @product_dir + 'Flutter'
-    flutter_spec_file = flutter_spec_dir + '/Flutter.podspec.json'
-    flutter_spec = Pod::Spec.from_file @working_dir + '/.ios/Flutter/engine/Flutter.podspec'
-    flutter_spec.vendored_frameworks = ['Flutter.framework', 'App.framework']
-    plugin_registrant_spec_file = @working_dir + '/.ios/Flutter/FlutterPluginRegistrant/FlutterPluginRegistrant.podspec'
+  def flutter_sdk_version_switch(version)
 
-    unless Dir.exist? flutter_spec_dir
-      FileUtils.mkdir_p flutter_spec_dir
-    end
+    commands = [
+        'fvm',
+        'use',
+        version
+    ]
 
-    File.open flutter_spec_file, "w+" do |file|
-      file.write flutter_spec.to_pretty_json
+    if CommandRunner.run(*commands) == false
+      # raise "Error running #{commands.join ' '} "
     end
-
-    FileUtils.cp_r @working_dir + '/.ios/Flutter/engine/Flutter.framework', flutter_spec_dir
-    FileUtils.cp_r @working_dir + '/.ios/Flutter/App.framework', flutter_spec_dir
-
-    plugins = fetch_plugins
-    plugins.append Plugins.new('Flutter',flutter_spec_file,flutter_spec)
-    plugins.append Plugins.new('FlutterPluginRegistrant',plugin_registrant_spec_file, Pod::Spec.from_file(plugin_registrant_spec_file))
-
-    plugins
   end
 
-  private
-
   def thin_arm64(path)
     # thin arm64
     thin_commands = [
@@ -144,13 +129,13 @@ class Archiver
   end
 
   def pub_upgrade
-    if CommandRunner.run(@flutter_wrapper, 'pub', 'upgrade') == false
+    if CommandRunner.run('fvm', @flutter_wrapper, 'pub', 'upgrade') == false
       raise "Pub upgrade fail"
     end
   end
 
   def pub_get
-    if CommandRunner.run(@flutter_wrapper, 'pub', 'get') == false
+    if CommandRunner.run('fvm', @flutter_wrapper, 'pub', 'get') == false
       raise "Pub get fail"
     end
   end
@@ -219,7 +204,7 @@ class Archiver
   end
 
   def excute_build_run
-    if CommandRunner.run(@flutter_wrapper, 'packages','pub','run','build_runner','build','--delete-conflicting-outputs') == false
+    if CommandRunner.run('fvm', @flutter_wrapper, 'packages','pub','run','build_runner','build','--delete-conflicting-outputs') == false
       raise "Error running #{@flutter_wrapper} packages pub run build_runner build --delete-conflicting-outputs"
     end
   end
@@ -227,6 +212,7 @@ class Archiver
   def build_framework
 
     commands = [
+        'fvm',
         @flutter_wrapper,
         'build',
         'ios-framework',
@@ -249,16 +235,17 @@ class Archiver
 
   end
 
-  def build_app(mode)
-    if CommandRunner.run(@flutter_wrapper, 'build','ios',"--#{mode}" ,"--no-codesign") == false
-      # FileUtils.remove_dir product_dir, true
-      raise "Error running #{@flutter_wrapper} build ios --#{mode} --no-codesign"
-    end
-  end
+  # def build_app(mode)
+  #   if CommandRunner.run('fvm', @flutter_wrapper, 'build','ios',"--#{mode}" ,"--no-codesign") == false
+  #     # FileUtils.remove_dir product_dir, true
+  #     raise "Error running #{@flutter_wrapper} build ios --#{mode} --no-codesign"
+  #   end
+  # end
 
   def fetch_plugins
     results = []
     flutter_plugins_list = @working_dir + '/.flutter-plugins'
+
     lines = IO.readlines(flutter_plugins_list)
     lines.each do |line|
       unless line =~ /^#/
@@ -266,8 +253,38 @@ class Archiver
         key = key_val[0]
         value = key_val[1]
         value = value.gsub /\n/, ''
-        path = "#{value}ios/#{key}.podspec"
-        results.append Plugins.new(key, path, Pod::Specification.from_file(path))
+        yaml_content = YAML.load_file value + 'pubspec.yaml'
+        f_h = yaml_content['flutter']
+        if f_h != nil then
+          p_h = f_h['plugin']
+          if p_h != nil then
+            pl_h = p_h['platforms']
+            if pl_h != nil then
+              if pl_h['ios'] != nil
+                path = "#{value}ios/#{key}.podspec"
+                if File.exist? path
+                  results.append Plugins.new(key, path, Pod::Specification.from_file(path))
+                end
+              end
+            else
+              path = "#{value}ios/#{key}.podspec"
+              if File.exist? path
+                results.append Plugins.new(key, path, Pod::Specification.from_file(path))
+              end
+            end
+          else
+            path = "#{value}ios/#{key}.podspec"
+            if File.exist? path
+              results.append Plugins.new(key, path, Pod::Specification.from_file(path))
+            end
+          end
+        else
+          path = "#{value}ios/#{key}.podspec"
+          if File.exist? path
+            results.append Plugins.new(key, path, Pod::Specification.from_file(path))
+          end
+        end
+
       end
     end
     results
@@ -294,12 +311,12 @@ class Archiver
       zipfile.get_output_stream("info.json") { |f| f.write json }
       zipfile.add 'pubspec.lock', "#{@working_dir}/pubspec.lock"
       zipfile.get_output_stream("download_sdk.rb") { |f| f.write sdk_download }
-      zipfile.add_dir "App.framework", "#{product_dir}/App.framework"
-      zipfile.add_dir "FlutterPluginRegistrant.framework","#{product_dir}/FlutterPluginRegistrant.framework"
+      zipfile.add_dir "App.xcframework", "#{product_dir}/App.xcframework"
+      zipfile.add_dir "FlutterPluginRegistrant.xcframework","#{product_dir}/FlutterPluginRegistrant.xcframework"
       plugins.each do |plugin|
-        file = File.join(product_dir, "#{plugin.spec.name}.framework")
+        file = File.join(product_dir, "#{plugin.spec.name}.xcframework")
         if Dir.exist? file
-          zipfile.add_dir("#{plugin.spec.name}.framework", file)
+          zipfile.add_dir("#{plugin.spec.name}.xcframework", file)
         end
       end
     end
@@ -314,10 +331,11 @@ class Archiver
     end
 
     Zip::File.open sdk_file, Zip::File::CREATE do |zipfile|
-      file = File.join(product_dir, "Flutter.framework")
-      zipfile.add_dir "Flutter/Flutter.framework", file
+      file = File.join(product_dir, "Flutter.xcframework")
+      zipfile.add_dir "Flutter/Flutter.xcframework", file
       #读取Flutter.framework中的info.plist文件中的FlutterEngine的值
-      info_plist_path = File.join(file, "Info.plist")
+      info_plist_path = info_plist_from_xcframework file, 1
+      # info_plist_path = File.join(file, "Info.plist")
       info_plist = Plist.parse_xml(info_plist_path)
       engine_hash = info_plist["FlutterEngine"]
       dsym_dir = File.join(flutter_sdk_dsym_dir, engine_hash)
@@ -357,6 +375,23 @@ class Archiver
     [zip_file, sdk_file]
   end
 
+  #depth 1为第一层
+  def info_plist_from_xcframework(path, depth)
+    children = Dir.children path
+    for child in children
+      child_path = File.join path, child
+      if File.directory? child_path then
+        r = info_plist_from_xcframework child_path, depth + 1
+        if r != nil
+          return r
+        end
+      elsif depth > 1 && child == 'Info.plist' then
+        return child_path
+      end
+    end
+    return nil
+  end
+
   def sdk_download
 
     ruby_code = <<-CODE
@@ -373,7 +408,7 @@ end
 def download(url, dest)
   open(url) do |u|
     File.open(dest, "w+") do |file|
-      file.write u.read.force_encoding("UTF-8")
+      file.write u.read
     end
   end
 end
@@ -400,6 +435,7 @@ end
   end
 
   def upload_files(app_file, flutter_sdk, mode)
+
     Pod::UserInterface.info 'Start upload resources'
     remote = Remote.new()
     Pod::UserInterface.info "Checking #{@module_name}_#{@version}_#{mode.downcase}..."
@@ -440,7 +476,7 @@ end
 
     dependency_graph = Molinillo::DependencyGraph.new
     @plugins.each do |plugin|
-      plugin.spec.all_dependencies.each do |dep|
+      plugin.spec.all_dependencies('ios').each do |dep|
         unless ignore_dependency? dep.name
           dependency_graph.add_vertex(dep.name, dep, true)
         end
@@ -464,9 +500,9 @@ end
       s.prepare_command = "ruby download_sdk.rb #{sdk_download_url}"
       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/Flutter.framework", "FlutterPluginRegistrant.framework"]
+      vendored_frameworks = ["App.xcframework", "Flutter/Flutter.xcframework", "FlutterPluginRegistrant.xcframework"]
       @plugins.each do |plugin|
-        vendored_frameworks.append "#{plugin.name}.framework"
+        vendored_frameworks.append "#{plugin.name}.xcframework"
       end
       s.vendored_frameworks   = vendored_frameworks
 

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

@@ -8,6 +8,7 @@ class Remote
       raise StandardError, "Need 'FLUTTER_BINARY_SERVER_BASEURL' in env"
     end
     @base_url = ENV['FLUTTER_BINARY_SERVER_BASEURL']
+    @coverage_base_url = ENV['COVERAGE_SERVER_BASEURL']
   end
 
   def exist?(name, version, tag)
@@ -70,4 +71,17 @@ class Remote
     req.execute
   end
 
+  def config_coverage(bundle_id, version, git_commit_hash, index_db_path, git_repo, build_base_dir)
+    uri = URI.join @coverage_base_url, "/coverage/flutter/report/config"
+    Pod::UserInterface.info "Uploading coverage config info to #{uri.to_s}"
+    resp = RestClient.post(uri.to_s, {
+        index_db: File.new(index_db_path, 'rb'),
+        git_commit_hash: git_commit_hash,
+        git_repo: git_repo,
+        build_base_dir: build_base_dir,
+        bundle_id: bundle_id,
+        version: version
+    })
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-flutter-dt
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.4.1
 platform: ruby
 authors:
 - "\bDreamtracer"
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-22 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +175,7 @@ homepage: https://github.com/NicolasKim/cocoapods-flutter-dt.git
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -176,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Simple way to foryou and use
 test_files: