cocoapods-packager-next 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b39b25d09d8ddf9ab427081c92687a5b2533c850cb4b97b127285da621e96c63
-  data.tar.gz: 10ecd53da7141d845a141dbcb7478bf6a28b0249647a60c404f9fc4270f71da5
+  metadata.gz: ab20cc4922694c7ee7c1128e7f1966e6c885255ea77bd1bc4a3f9bf804848a35
+  data.tar.gz: fe2b58139807305344bd341b7b86c9b6a1f2ea8bd62e71c02edf3512f3def9d4
 SHA512:
-  metadata.gz: 5c83e0cd890fb26d6459786d3c36393e6683434aced3f0459d1ecbc612f57c06d937158b6df842ddc28f3716275803bf074c121c493f3c21060d9d946556e6d6
-  data.tar.gz: d1a8da1698884374d4a0a164eb7399100b4825ac7a763363fab126b8ca8b3a7edb6c8ef5f209b8338d8ef190f00f725d7b3979dd394800a5d6f4ffe7ebf6ad60
+  metadata.gz: aff27f5d69858aec0112dca5aa26814e2d2258e67c4e52cb9b28da760eb70b988270d2afc691caac8b7ea587f431029cfda1d6e96623cf21ed10b3eb9cf731a3
+  data.tar.gz: d5ac45f643bdf6377d40b73fdf3cfd42fc516ec264b0609c3018840228e412ac2a179bac6f5385777648d607fb04cc49080318fa4bc3f811e4b245d3598ddd12

data/cocoapods-packager-next.gemspec

@@ -7,7 +7,8 @@ Gem::Specification.new do |spec|
   spec.name = 'cocoapods-packager-next'
   spec.version = Pod::Packager::VERSION
   spec.authors = ['Kyle Fuller', 'Boris Bügling', 'Chenguang Wang']
-  spec.summary = 'A new version of cocoapods-packager, fix many adaptation issues with the new version of Xcode, CocoaPods plugin which allows you to generate a framework or static library from a podspec.'
+  spec.summary = 'An alternative to cocoapods-packager, adapted to the latest Xcode. 
+  CocoaPods plugin which allows you to generate a framework or static library from a podspec.'
   spec.homepage = 'https://github.com/wwwcg/cocoapods-packager-next'
   spec.license = 'MIT'
   spec.files = `git ls-files`.split($/)

data/lib/cocoapods-packager/builder.rb

@@ -144,10 +144,10 @@ module Pod
       static_libs = static_libs_in_sandbox('build') + static_libs_in_sandbox('build-sim') + vendored_libraries
       libs = ios_architectures.map do |arch|
         library = "#{@static_sandbox_root}/build/package-#{arch}.a"
-        `libtool -arch_only #{arch} -static -o #{library} #{static_libs.join(' ')}`
-        library
-      end
-
+        `libtool -arch_only #{arch} -static -o #{library} #{static_libs.join(' ')} 2> /dev/null`
+        library if File.exist?(library)
+      end.compact
+    
       `lipo -create -output #{output} #{libs.join(' ')}`
     end
 
@@ -198,13 +198,14 @@ module Pod
       Dir.glob("#{headers_source_root}/**/*.h").
         each { |h| `ditto #{h} #{@fwk.headers_path}/#{h.sub(headers_source_root, '')}` }
 
+      module_map = nil
       # If custom 'module_map' is specified add it to the framework distribution
       # otherwise check if a header exists that is equal to 'spec.name', if so
       # create a default 'module_map' one using it.
-      if !@spec.module_map.nil?
+      if @spec.module_map
         module_map_file = @file_accessors.flat_map(&:module_map).first
         module_map = File.read(module_map_file) if Pathname(module_map_file).exist?
-      elsif File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
+      elsif @spec.module_map.nil? && File.exist?("#{@public_headers_root}/#{@spec.name}/#{@spec.name}.h")
         module_map = <<MAP
 framework module #{@spec.name} {
   umbrella header "#{@spec.name}.h"
@@ -277,16 +278,20 @@ MAP
 
     def vendored_libraries
       if @vendored_libraries
-        @vendored_libraries
+        return @vendored_libraries
       end
       file_accessors = if @exclude_deps
+                         puts "Excluding dependencies"
                          @file_accessors
                        else
+                         puts "Including dependencies"
                          @static_installer.pod_targets.flat_map(&:file_accessors)
                        end
       libs = file_accessors.flat_map(&:vendored_static_frameworks).map { |f| f + f.basename('.*') } || []
       libs += file_accessors.flat_map(&:vendored_static_libraries)
       @vendored_libraries = libs.compact.map(&:to_s)
+      puts "Vendored libraries: #{@vendored_libraries}"
+    
       @vendored_libraries
     end
 
@@ -304,10 +309,28 @@ MAP
     end
 
     def ios_architectures
-      archs = %w(x86_64 i386 arm64 armv7 armv7s)
+      xcode_version_string = `xcodebuild -version`.strip.split()[1]
+      xcode_version = Pod::Version.new(xcode_version_string)
+      UI.puts "current xcode version: #{xcode_version}"
+      archs = if xcode_version >= Pod::Version.new('14.0')
+        # i386 & armv7/armv7s has been deprecated in Xcode14
+        %w(x86_64 arm64 arm64e)
+      elsif xcode_version < Pod::Version.new('10.0')
+        %w(x86_64 i386 arm64 armv7 armv7s)
+      else
+        %w(x86_64 i386 arm64 arm64e armv7 armv7s)
+      end
+      UI.puts "Initial architectures: #{archs}"
+      
       vendored_libraries.each do |library|
-        archs = `lipo -info #{library}`.split & archs
+        library_archs = `lipo -info #{library}`.split
+        UI.puts "Architectures for #{library}: #{library_archs}"
+        
+        archs = library_archs & archs
+        UI.puts "Intersected architectures: #{archs}"
       end
+      
+      UI.puts "Final architectures: #{archs}"
       archs
     end
 

data/lib/cocoapods_packager.rb

@@ -1,5 +1,5 @@
 module Pod
   module Packager
-    VERSION = '2.0.0'.freeze
+    VERSION = '2.0.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-next
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kyle Fuller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-15 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -164,9 +164,8 @@ requirements: []
 rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
-summary: A new version of cocoapods-packager, fix many adaptation issues with the
-  new version of Xcode, CocoaPods plugin which allows you to generate a framework
-  or static library from a podspec.
+summary: An alternative to cocoapods-packager, adapted to the latest Xcode.  CocoaPods
+  plugin which allows you to generate a framework or static library from a podspec.
 test_files:
 - spec/command/error_spec.rb
 - spec/command/package_spec.rb