cocoapods-binary-flutter 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8015e84e4cd63fcc94031d9c42061ccbcba859d6a7c25897b7d2ed5b8c78eda
-  data.tar.gz: 620592d6f2b537f272da97b94725313dd57e9c1605a6317cd010c5794fe407db
+  metadata.gz: b88c597014cb78cd0a8e606d2898626bd7f196cfb7ce1f4fca3963799364ed1a
+  data.tar.gz: af937c5707eedf713370c9cd377fe2acae5d439ad211c3d08789351c5c20ef21
 SHA512:
-  metadata.gz: 4011e3fd4efd2f2dd677947a03bc3579c132e3fb6988b1e3d3da31f25366fd8324eb7df640c8b0f03d9716c662edf43615c42703c13439130ef11555c4b241d4
-  data.tar.gz: 6a0a1581ebccac9e6e377bf26bf2d36b665aac031fb126093d37a644f750252f1b5310a3a6489a0a1376b02a1af514fed13c04958d2cd4816be30b5610b2a12b
+  metadata.gz: 15b2c41508730bcab43c192c6785deb78621a162dd816103eca1e09b520a8d8cbda3849499d280622246e41af79cf3dd853ca4b29ee5e1e6e362f18ba913be84
+  data.tar.gz: a2716823fc3d0bc5cfd619716bdb6d5616b1fb15de2280fb06f7c1a258cf85f4190c1d005be55eb9ab9cbd9ee64bc5bb21382ca188fceb7594083592cb3fcb66

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

@@ -1,3 +1,3 @@
 module CocoapodsBinaryFlutter
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

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

@@ -7,12 +7,22 @@ require 'fileutils'
 require 'uri'
 require 'net/http'
 require 'net/https'
-require 'colorize'
 
 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
@@ -41,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|
@@ -61,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
 
         #集成
@@ -80,7 +109,7 @@ module Pod
 
             raise "产物依赖需要修改 flutter_post_install(installer) 增加define判断` in Podfile `post_install` block
             flutter_post_install(installer) if defined?(flutter_post_install)
-            ".colorize(:red)
+            "
 
           end
 

data/lib/cocoapods_plugin.rb

@@ -1,2 +1,37 @@
 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|
+	return unless Pod::Podfile::DSL.enable_fix_flutter_post_install
+    return 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 的话，就不处理了
+			  next if (target.dependencies.map(&:name).filter { |name| name == 'Flutter' } || []).length > 0
+
+			  # 添加一个 Flutter 的依赖 Target，用于欺骗 Flutter 的 podhelper 脚本来未工程添加配置，用完后去除，避免影响工程
+			  flutter_target = Xcodeproj::Project::Object::PBXTargetDependency.new(target.project, nil)
+			  flutter_target.name = 'Flutter'
+			  target.dependencies << flutter_target
+			  flutter_additional_ios_build_settings(target)
+			  target.dependencies.delete flutter_target
+			  target.project.save
+			end
+		end
+
+		# Call old method
+		swizzled_parse_subspecs.bind(self).(installer)
+	end
+end
+
+
+
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-binary-flutter
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 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
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: lz binary flutter zip integrated.
 email:
 - shanhaoqiang@lizhi.fm
@@ -71,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.