cocoapods-binary-flutter 0.0.10 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45a78d4160a4185a779ffa96559f7212d15772a2a6f13f97e8ed5b351f53f5ed
-  data.tar.gz: dc70a593e669e3559f45f843762a3f1553a51e8d57fbe455ba0c7001b867e0f9
+  metadata.gz: 2154b92602c5874fad79ae07a09119ecfef58df5955297e487970ffcbf1da980
+  data.tar.gz: 825dd77579ae4b1278fb76c629f65692116bf3bed1080813c276b4b5afb86727
 SHA512:
-  metadata.gz: 13197e4f417b28527a2abe258710b01d9b7d821c2d6f6085a56fcaef86b94c9c745d223e9ea354fae4ddd92a5e4887fc57bb733716d2151e6748c62f4fccb594
-  data.tar.gz: 9487dc0b7b8985d8ac0a1ebde6f4438776f5e049a9bf72c2e4794094b293764c841f3f8eacc392a61cfc9f349ed635b00c209c28cfcef8a7b4dfaf5596e49073
+  metadata.gz: 71c62a143918470efb10364a4022cf175d728d201a62d7d117e7c01a2db75b67e418c286a255d18fbdf452b09012d510e1b22cf034c47e94e8863de25faceaef
+  data.tar.gz: dbb069fed9cced7694aee7aae7fe337c29cdda18654cccf84ec8c52a1c88351bb43bfccdcd11b060197af0fd3f3af3811a62cb85ae2f43e2efeee17587f4d59d

data/lib/cocoapods-binary-flutter/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBinaryFlutter
-  VERSION = "0.0.10"
+  VERSION = "0.0.12"
 end

data/lib/cocoapods-binary-flutter/hook/podfile.rb

@@ -12,6 +12,17 @@ module Pod
   class Podfile
     module DSL
 
+      @@enable_fix_flutter_post_install = false
+
+      def self.enable_fix_flutter_post_install
+        @@enable_fix_flutter_post_install
+      end
+      
+      def enable_fix_flutter_post_install!
+        @@enable_fix_flutter_post_install = true
+      end
+
+
       #下载
       def install_remote_flutter_binary(url = nil)
         #md5
@@ -40,12 +51,18 @@ module Pod
 
         end
         
-        #判断缓存
-        if File::directory?(flutter_binary_path) == false
-          #下载
-          puts "开始下载 "+url
+        #下载解压
+        if File.directory?(flutter_binary_path) == false
+          # 获取文件大小
           uri = URI(url)
-          download_file = open(flutter_binary_home+"/binary.zip", "wb")
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = true if uri.scheme == 'https'
+          response = http.head(uri.request_uri)
+          expected_size = response['Content-Length'].to_i
+
+          # 下载文件
+          puts "开始下载 " + url
+          download_file = open(File.join(flutter_binary_home, "binary.zip"), "wb")
           Net::HTTP.start(uri.host, uri.port,
             :use_ssl => uri.scheme == 'https', 
             :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
@@ -60,9 +77,22 @@ module Pod
               download_file.close
             end
           end
-          #解压
-          puts "开始解压"+flutter_binary_home
-          system("unzip", "-n", flutter_binary_home+'/binary.zip', "-d", flutter_binary_home)
+
+          # 校验文件大小
+          actual_size = File.size(File.join(flutter_binary_home, "binary.zip"))
+          if actual_size != expected_size
+            puts "文件大小和预期不匹配"
+            raise "文件大小和预期不匹配"
+          end
+
+          # 解压文件
+          puts "开始解压 " + flutter_binary_home
+          begin
+            system("unzip", "-n", File.join(flutter_binary_home, "binary.zip"), "-d", flutter_binary_home)
+          rescue => exception
+            puts "解压失败: " + exception.message
+            raise "解压失败"
+          end
         end
 
         #集成

data/lib/cocoapods_plugin.rb

@@ -1,2 +1,33 @@
 require 'cocoapods-binary-flutter/command'
 require 'cocoapods-binary-flutter/hook'
+
+# 解决多工程 target 的情况下，编译错误，找不到 <Flutter/Flutter.h> 文件
+Pod::HooksManager.register('cocoapods-binary-flutter', :pre_install) do |_installer_context, _options|
+  break unless Pod::Podfile::DSL.enable_fix_flutter_post_install
+  break unless defined?(Pod::Podfile.instance_method(:flutter_post_install))
+
+  swizzled_parse_subspecs = Pod::Podfile.instance_method(:flutter_post_install)
+
+  define_method(:flutter_post_install) do |installer, _skip: false|
+    puts '解决多工程 target 的情况下，编译错误，找不到 <Flutter/Flutter.h> 文件'
+    # 解决多工程 target 的情况下，编译错误，找不到 <Flutter/Flutter.h> 文件
+    installer.aggregate_targets.each do |t|
+      t.user_project.native_targets.each do |target|
+        # 如果本来就有依赖 Flutter 的话，就不处理了
+        flutter_target = nil
+        if target.dependencies.map(&:name).filter { |name| name == 'Flutter' }.empty?
+          # 添加一个 Flutter 的依赖 Target，用于欺骗 Flutter 的 podhelper 脚本来未工程添加配置，用完后去除，避免影响工程
+          flutter_target = Xcodeproj::Project::Object::PBXTargetDependency.new(target.project, nil)
+          flutter_target.name = 'Flutter'
+          target.dependencies << flutter_target
+        end
+        flutter_additional_ios_build_settings(target)
+        target.dependencies.delete flutter_target unless flutter_target.nil?
+        target.project.save
+      end
+    end
+
+    # Call old method
+    swizzled_parse_subspecs.bind(self).call(installer)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-flutter
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.12
 platform: ruby
 authors:
 - Jacky
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-binary-flutter.