cocoapods-packager-bj 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf5dcc3095e560ef67bbb27a863dff548eabb28fd0aeda0338a61de93106185f
-  data.tar.gz: f3060ebdc6f547bb643d9910f472cc04d90873dccda53b8668a04b23b6433552
+  metadata.gz: ca9a48165bcbc2e15651427790b34271a9e4a2cc0e4ea17d16aa6802a2a3278d
+  data.tar.gz: f9d5e7a98a52ba02567b9b833cc7d50fffa551adb9f0d79df5f9cfc21d1f23ff
 SHA512:
-  metadata.gz: 3dedbf04c6b15325c4f670f1a9a97edc2305a114dc8b1a92bd7607f46e8ab36e011be24fc580d0c0b1554c5894d71379abb3b64e3b1966397f7a02b959e03b05
-  data.tar.gz: fd1052a3c282a7d8e42808d22265a12c768c77c75bc5b0fdb397dd8716822fd4c763e44e8b23a5534e349ae05213befc7ba1050f9ba2b2e184ca76166c962015
+  metadata.gz: '08795f4162c27b51898adf95094f450fde09893f8f22e5c3f7b0c4565df0b88694488485c25d7c12fb45069db62c8b145b80f6fee60ca2d116ee71da528355f3'
+  data.tar.gz: b42bd769b036c19bfb2ad4bfaf0fa3a3c641f6e3978d091cd520f5b4b469c3ec3b271845e1d6fbf4de4fd346db898602838649fa95b74f1f93de59283309c742

data/README.md

@@ -1,2 +1,39 @@
 # cocoapods_packager-bj
+
 Based on cocoapods-package, support build swift framework
+
+## usage
+
+pod bjpackage yourRepo.podspec
+
+## argv
+
+['--force',     'Overwrite existing files.'],
+
+['--no-mangle', 'Do not mangle symbols of depedendant Pods.'],
+
+['--embedded',  'Generate embedded frameworks.'],
+
+['--library',   'Generate static libraries.'],
+
+['--dynamic',   'Generate dynamic framework.'],
+
+['--modules',   'Generate static swift framework use modules.'],
+
+['--local',     'Use local state rather than published versions.'],
+
+['--bundle-identifier', 'Bundle identifier for dynamic framework'],
+
+['--exclude-deps', 'Exclude symbols from dependencies.'],
+
+['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
+
+['--subspecs', 'Only include the given subspecs'],
+
+['--usetrunk', 'Use trunk to install project'],
+
+['--spec-sources=private,https://github.com/CocoaPods/Specs.git', 'The sources to pull dependent ' 'pods from (defaults to https://github.com/CocoaPods/Specs.git)']
+
+## normal usage
+
+pod bjpackage yourRepo.podspec --embedded --no-mangle --exclude-deps --spec-sources=https://github.com/CocoaPods/Specs.git —verbose

data/lib/cocoapods-packager-bj/builder.rb

@@ -306,7 +306,7 @@ MAP
     end
 
     def ios_architectures
-      archs = %w(x86_64 i386 arm64 armv7 armv7s)
+      archs = %w(x86_64 arm64)
       vendored_libraries.each do |library|
         archs = `lipo -info #{library}`.split & archs
       end
@@ -380,7 +380,19 @@ MAP
             
         Dir.glob("#{modules_sim_sourceinfo_root}/**/*.swiftsourceinfo").
           each { |h| `ditto #{h} #{@fwk.swiftsourceinfo_path}/#{h.sub(modules_sim_sourceinfo_root, '')}` }
-              
+        
+        oc_headers_source_root = "#{@public_headers_root}/#{@spec.name}"
+        Dir.glob("#{oc_headers_source_root}/**/*.h").
+          each { |h| `ditto #{h} #{@fwk.headers_path}/#{h.sub(oc_headers_source_root, '')}` }
+
+        if Dir.glob("#{@fwk.swiftsourceinfo_path}/*").empty?
+          FileUtils.rm_rf("#{@fwk.swiftsourceinfo_path}")
+        end  
+
+        if Dir.glob("#{@fwk.swiftmodule_path}/*").empty?
+          FileUtils.rm_rf("#{@fwk.swiftmodule_path}")
+        end  
+
     end
     
   end

data/lib/cocoapods-packager-bj/pod_utils.rb

@@ -20,12 +20,18 @@ module Pod
           @spec.deployment_target(platform_name),
           @subspecs,
           @spec_sources,
-          modules
+          modules,
+          @usetrunk
         )
-
+        
         static_installer = Installer.new(sandbox, podfile)
         static_installer.install!
-
+        spec_targets = static_installer.pod_targets.select do |target|
+          target.name == @spec.name
+        end
+        static_target = spec_targets[0]
+        source_dir = Dir.pwd
+        UI.puts("build project in directory #{source_dir}")
         unless static_installer.nil?
           static_installer.pods_project.targets.each do |target|
             target.build_configurations.each do |config|
@@ -38,11 +44,10 @@ module Pod
           end
           static_installer.pods_project.save
         end
-
         static_installer
       end
 
-      def podfile_from_spec(path, spec_name, platform_name, deployment_target, subspecs, sources, modules)
+      def podfile_from_spec(path, spec_name, platform_name, deployment_target, subspecs, sources, modules, usetrunk)
         options = {}
         if path
           if @local
@@ -54,9 +59,12 @@ module Pod
         options[:subspecs] = subspecs if subspecs
         Pod::Podfile.new do
           if modules
-            use_frameworks!
+            Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+            use_frameworks!(:linkage => :static)
+          end
+          if !usetrunk 
+            sources.each { |s| source s }
           end
-          sources.each { |s| source s }
           platform(platform_name, deployment_target)
           pod(spec_name, options)
 

data/lib/cocoapods_packager_bj.rb

@@ -1,5 +1,5 @@
 module Pod
   module BJPackager
-    VERSION = '1.5.1'.freeze
+    VERSION = '1.5.3'.freeze
   end
 end

data/lib/pod/command/package_bj.rb

@@ -21,6 +21,7 @@ module Pod
           ['--exclude-deps', 'Exclude symbols from dependencies.'],
           ['--configuration', 'Build the specified configuration (e.g. Debug). Defaults to Release'],
           ['--subspecs', 'Only include the given subspecs'],
+          ['--usetrunk', 'Use trunk to install project'],
           ['--spec-sources=private,https://github.com/CocoaPods/Specs.git', 'The sources to pull dependent ' \
             'pods from (defaults to https://github.com/CocoaPods/Specs.git)']
         ]
@@ -49,6 +50,7 @@ module Pod
         @exclude_deps = argv.flag?('exclude-deps', false)
         @name = argv.shift_argument
         @source = argv.shift_argument
+        @usetrunk = argv.flag?('usetrunk')
         @spec_sources = argv.option('spec-sources', 'https://github.com/CocoaPods/Specs.git').split(',')
 
         subspecs = argv.option('subspecs')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-bj
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Kyle Fuller
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods
@@ -68,7 +68,7 @@ files:
 - ".gitignore"
 - LICENSE
 - README.md
-- cocoapods_packager-bj.gemspec
+- cocoapods-packager-bj.gemspec
 - lib/cocoapods-packager-bj/builder.rb
 - lib/cocoapods-packager-bj/framework.rb
 - lib/cocoapods-packager-bj/mangle.rb
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Based on cocoapods-packager code, support swift framework, generate a framework