cocoapods-aqarahome 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1d9d20211a076f5aa53877d9aec3af004ff54c00361068bf845d32bade58cd1
-  data.tar.gz: 17e23e5550e7fc29cb49a8ea7f994b6e09f301effcb19750d9e551dd95b032f5
+  metadata.gz: 8b964dde12acf823670651f30eb28914afb0bbb40c28715f6dae2b2809da1653
+  data.tar.gz: ee731581fcafcce27bd43edadd694bc084f057d47ff8eba88f48ea53ece44bf1
 SHA512:
-  metadata.gz: 80b1fe03add7ca55880118b15fecffe82063ad25c8aa2eea9c6441864f124eb8b6fda201d4d285f2c31b233760f4df8429df5904ee26adadad56494379aceb51
-  data.tar.gz: dc9b4e3de636ee021b5a0fed02db99fcc151c00b844a34a4b5f7bdbe705b2bccff9b8be1c57832b14e5119b3810c3f77c2b86edd88bcd28d1522b0df727e1913
+  metadata.gz: 5e2b7d3abd112aa37698d5c3d3d74250d0caa168b6d285ad9124bb594593b7c0b2b19ecd45268cc4d1770993d0602059e46f8971ad632ed3bf6b825772655d17
+  data.tar.gz: e668337581dbd48675287f12a03f38247d5a0899d4d3b01202fcfdd7c200576eaaea92311bb0b3153201cc288866555779abd742d28059f25a50ce2f4527e88e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocoapods-aqarahome (0.0.4)
+    cocoapods-aqarahome (0.0.6)
       claide (>= 1.0.2, < 2.0)
 
 GEM

data/lib/cocoapods-aqarahome/command/Podfile_Dev.rb

@@ -4,18 +4,23 @@ module Pod
 
       public
 
-      def dev_pods(pods, branch = 'aqara')
+      def dev_pods(pods, git_pull = false, branch = 'aqara')
         if branch.length > 0
+          if git_pull
+            pull_local_sdk_origin_source(pods)
+          elsif
+            pull_latest_code_and_resolve_conflict(pods)
+            podStr = pods.join(", ")
+            puts "成功清除私有库".green + "#{podStr}".yellow + "的缓存数据".green
+            pods.each do |pod|
+              args = ['clean',pod, "--all"]
+              Pod::Command::Cache.run(args)
+            end
+          end
           # pods.each do |name|
           #   pod name, :git => "https://xyz.com/ios/#{name}.git", :branch => "#{branch}"
           # end
-          pull_latest_code_and_resolve_conflict(pods)
-          podStr = pods.join(", ")
-          puts "成功清除私有库".green + "#{podStr}".yellow + "的缓存数据".green
-          pods.each do |pod|
-            args = ['clean',pod, "--all"]
-            Pod::Command::Cache.run(args)
-          end
+
           # puts "lebbay: using remote pods with branch: #{branch}".green
         else
           # 自定义开发目录
@@ -44,6 +49,29 @@ module Pod
                 config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
               end
             end
+            if target.name == "Pods-AqaraHome"
+              puts "Updating #{target.name} OTHER_LDFLAGS To fit Xcode15"
+              target.build_configurations.each do |config|
+                xcconfig_path = config.base_configuration_reference.real_path
+
+                # read from xcconfig to build_settings dictionary
+                build_settings = Hash[*File.read(xcconfig_path).lines.map{|x| x.split(/\s*=\s*/, 2)}.flatten]
+
+                File.open(xcconfig_path,'r+'){|f|
+                  f.each_line{|l|
+                    s=""
+                    if l.include?('iconv.2.4.0')
+                      s+=l.gsub!("iconv.2.4.0", "iconv.2")
+                      #seek back to the beginning of the line.
+                      f.seek(-l.length, IO::SEEK_CUR)
+                      #overwrite line with spaces and add a newline char
+                      f.write(s * 1)
+                      break
+                    end
+                  }
+                }
+              end
+            end
           end
         end
       end
@@ -52,6 +80,21 @@ module Pod
 
       private
 
+      def pull_local_sdk_origin_source(pods)
+        puts Config.instance.podfile_path.parent.parent
+
+        Dir.foreach(Config.instance.podfile_path.parent.parent) do |entry|
+          subPath = Config.instance.podfile_path.parent.parent + entry
+          if File::directory?(subPath)
+            pods.each do |pod|
+              next unless File::exists?("#{subPath}/#{pod}.podspec")
+              puts "正在拉取" + "#{pod}".green + "仓库代码..."
+              system "cd #{subPath};git pull"
+            end
+          end
+        end
+      end
+
       def pull_latest_code_and_resolve_conflict(pods)
         # 1、Podfile.lock
         puts "正在清理Podfile.lock中私有库的commit信息..."

data/lib/cocoapods-aqarahome/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsAqarahome
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-aqarahome
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - zhaoxifan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-13 00:00:00.000000000 Z
+date: 2024-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler