cocoapods-packager-ext 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4264f49f24386e48fa678503705130bef2ba23e3b8fc5a0a14b8ee1db209ae75
-  data.tar.gz: a101e747b0c0c9b2095eff2dffc6bc8e60525b9b85902c60aac8c06420ad6278
+  metadata.gz: 975c1587853affa9927f595278b2f4a14dbe1c043994dbffff6e79394d4f9519
+  data.tar.gz: d11655a9c1fd7dadaf3dd5bdb154b1b014aa7e20c2bde9cbe82bc2bf1d9dd2c2
 SHA512:
-  metadata.gz: afbebc6f08605c3794b6e737d8d66fd409e846ffaef642b04d1af8e94324e275b1afcf0b25247746c0699362bb2f1021b288d43b53bbcf99d9155a8e711d19c6
-  data.tar.gz: ac8bf3ff35af21113b2171682707fbc67832700f9cece448df28222523843caa3345a5ce0f2afe5af4ed2f3e889f4294e0f32108f0101a14d2e11938996d271d
+  metadata.gz: f8694a1df3a49c9b61d084694137626f95315cd1a42fc3d0a5b1587628c042d51d39f54741be2e9010ed145a2e82d475aea02153bc84ded6f51eb77735db1c3d
+  data.tar.gz: 525356691709d4ca1be7ec7d8d464c417d0d15dea6f4dcb9d27e17fc17d89c074eb26ee433e33f8a09ace24a53671f831d1e304b08705dfaed2bbdb28f8a7f7c

data/lib/cocoapods-packager-ext/command.rb

@@ -1 +1,2 @@
-require 'cocoapods-packager-ext/command/ext'
+require 'cocoapods-packager-ext/command/install_ext'
+require 'cocoapods-packager-ext/command/package_ext'

data/lib/cocoapods-packager-ext/command/install_ext.rb

@@ -0,0 +1,91 @@
+module Pod
+    class Installer
+        attr_accessor :dry_deps
+        alias install_t! install!
+        def install!()
+            if @dry_deps
+                prepare
+                resolve_dependencies
+            else
+                install_t!
+            end
+        end
+
+    end
+
+    class Command
+
+        # This is an example of a cocoapods plugin adding a top-level subcommand
+        # to the 'pod' command.
+        #
+        # You can also create subcommands of existing or new commands. Say you
+        # wanted to add a subcommand to `list` to show newly deprecated pods,
+        # (e.g. `pod list deprecated`), there are a few things that would need
+        # to change.
+        #
+        # - move this file to `lib/pod/command/list/deprecated.rb` and update
+        #   the class to exist in the the Pod::Command::List namespace
+        # - change this class to extend from `List` instead of `Command`. This
+        #   tells the plugin system that it is a subcommand of `list`.
+        # - edit `lib/cocoapods_plugins.rb` to require this file
+        #
+        # @todo Create a PR to add your plugin to CocoaPods/cocoapods.org
+        #       in the `plugins.json` file, once your plugin is released.
+        #
+        class Install
+            def self.options
+                [
+                  ['--repo-update', 'Force running `pod repo update` before install'],
+                  ['--deployment', 'Disallow any changes to the Podfile or the Podfile.lock during installation'],
+                  ['--clean-install', 'Ignore the contents of the project cache and force a full pod installation. This only ' \
+            'applies to projects that have enabled incremental installation'],
+                  ['--dry-deps','only test depend'],
+                ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
+            end
+            # class << self
+            #     alias options_t options
+            #     def options
+            #       o = options_t
+            #       o.push(['--dry-deps','only test depend'])
+            #       o.concat(super)
+            #     end
+            #
+            # end
+            def initialize(argv)
+                super
+                @deployment = argv.flag?('deployment', false)
+                @clean_install = argv.flag?('clean-install', false)
+                @dry_deps = argv.flag?('dry-deps',false)
+            end
+
+            # alias run_t run
+            # def run
+            #     if @dry_deps
+            #         verify_podfile_exists!
+            #         installer = installer_for_config
+            #         installer.repo_update = repo_update?(:default => false)
+            #         installer.update = false
+            #         installer.deployment = @deployment
+            #         installer.clean_install = @clean_install
+            #         installer.dry_deps = @dry_deps
+            #         installer.install!
+            #     else
+            #         run_t
+            #     end
+            # end
+            def run
+                verify_podfile_exists!
+                installer = installer_for_config
+                installer.repo_update = repo_update?(:default => false)
+                installer.update = false
+                installer.deployment = @deployment
+                installer.clean_install = @clean_install
+                if @dry_deps
+                    installer.dry_deps = @dry_deps
+                end
+                installer.install!
+            end
+
+        end
+    end
+end

data/lib/cocoapods-packager-ext/command/{ext.rb → package_ext.rb}

@@ -25,7 +25,7 @@ module Pod
               o.push(['--all-deps','add all-depends'])
               o.push(['--archs','select archs'])
               o.push(['--black-deps','select exclude deps'])
-
+              o.concat(super)
             end
 
         end

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

@@ -56,7 +56,7 @@ module Pod
       if @select_archs.size != 0
         return "ARCHS=\'#{@select_archs.join(' ')}\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
       else
-        return ios_build_options_t
+        return "ARCHS=\'x86_64 i386 arm64 armv7\' OTHER_CFLAGS=\'-fembed-bitcode -Qunused-arguments\'"
       end
     end
 
@@ -75,6 +75,15 @@ module Pod
       if @all_deps
         return if static_libs.count == 0
         sim_libs = static_libs_in_sandbox('build-sim')
+        for item in @black_deps
+          static_libs.delete_if do |obj|
+            obj.include? item
+          end
+          sim_libs.delete_if do |obj|
+            obj.include? item
+          end
+        end
+        UI.puts "links statics:#{static_libs.join(' ')}, sim_libs:#{sim_libs.join(' ')}"
         `xcrun -r libtool -no_warning_for_no_symbols -static -o #{output} #{static_libs.join(' ')} #{sim_libs.join(' ')}`
       else
         build_static_lib_for_ios static_libs,_defines,output

data/lib/cocoapods-packager-ext/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsPackagerExt
-  VERSION = "0.0.6"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-packager-ext
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 platform: ruby
 authors:
 - kyle.zhou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,8 @@ files:
 - cocoapods-packager-ext.gemspec
 - lib/cocoapods-packager-ext.rb
 - lib/cocoapods-packager-ext/command.rb
-- lib/cocoapods-packager-ext/command/ext.rb
+- lib/cocoapods-packager-ext/command/install_ext.rb
+- lib/cocoapods-packager-ext/command/package_ext.rb
 - lib/cocoapods-packager-ext/ext/builder.rb
 - lib/cocoapods-packager-ext/gem_version.rb
 - lib/cocoapods_plugin.rb