cocoapods-bazel 0.1.5 → 0.1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 227c49f87ef761cc28ebd9f7ee7f19c8d08d11a4eb84b704a2b573877cc4b7e8
-  data.tar.gz: 2f9bf5de1ef7d8ccf396c66e845c545c0ab83338792db652fa939bb34f0c6a1c
+  metadata.gz: d2d368d169ce3eb04e6b90afaa67190a777256f115b7d06b7b4e120eb2684a29
+  data.tar.gz: 28786338c1b48d58d64fdcacbab8fc8c9a8b0dfde40e4a6e689dd11813a13139
 SHA512:
-  metadata.gz: 383edd52129414597ecf6b61b68eeba8db9faaf80ea9d179e29ff549d4d12769c23386dedc03a1b6e97bd47939b380ef37b7bf1f1e25653ab6f367825a6be575
-  data.tar.gz: 90af5c81f401b049efa87bd945116fb9e00ca63b112fff200ff4ca7233265e38ee0491cb1829129260ae392443cabc9c3e855b92435e931606bc141783f9e41a
+  metadata.gz: 5aa26e8030f1a686ea9e1e157c569b0b1de30cce3400beb184207e5ac7d67ce2e05442c3a9c20e501bdfe9759f6661198dbd4b6a42d0816651efc5dd3bce1d7f
+  data.tar.gz: 04a40e6fd04b7740b6c3ca112d30dcea506d1097b9a13ca09b87298802b59c5f68828ebae022dd60aac14b26988a30a88712b42fe947b861ce393a34dd8d1814

data/.github/workflows/tests.yml

@@ -11,12 +11,10 @@ jobs:
     name: Build and Test
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
       - name: Print Xcode version
         run: sudo xcode-select -p
-      - uses: actions/setup-ruby@v1
-        with:
-          ruby-version: "2.x" # Version range or exact version of a Ruby version to use, using semvers version range syntax.
       - name: Install Gems
         run: bundle install
       - name: Build and Test

data/.ruby-version

@@ -0,0 +1 @@
+2.7.8

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.1.7
+* Adding `testonly` to targets that link with XCTest becomes an opt-in with config `enable_add_testonly`
+
+0.1.6
+* New xcframework_excluded_platforms option
+* Add .ruby-version file, update github action code
+
 0.1.5
 * Add `testonly` to targets that link with XCTest to account for requirements in https://github.com/bazelbuild/rules_swift/pull/868 (#82)
  

data/README.md

@@ -72,4 +72,4 @@ Bug reports and pull requests are welcome on GitHub [here](https://github.com/ba
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0).

data/Rakefile

@@ -40,7 +40,8 @@ namespace :spec do
 end
 
 desc 'Run all specs'
-task spec: %w[spec:unit spec:integration]
+# TODO: add back integration once we can fix its dep on rules_ios
+task spec: %w[spec:unit]
 
 RuboCop::RakeTask.new(:rubocop)
 

data/lib/cocoapods/bazel/config.rb

@@ -55,7 +55,9 @@ module Pod
         build_file_doc: '',
         features: {
           experimental_deps_debug_and_release: false
-        }
+        },
+        xcframework_excluded_platforms: [].freeze,
+        enable_add_testonly: false
       }.with_indifferent_access.freeze
 
       private_constant :DEFAULTS
@@ -115,6 +117,14 @@ module Pod
       def build_file_doc
         to_h[:build_file_doc]
       end
+
+      def xcframework_excluded_platforms
+        to_h[:xcframework_excluded_platforms]
+      end
+
+      def enable_add_testonly
+        to_h[:enable_add_testonly]
+      end
     end
   end
 end

data/lib/cocoapods/bazel/target.rb

@@ -30,9 +30,13 @@ module Pod
       include XCConfigResolver
 
       attr_reader :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config, :relative_sandbox_root
+
+      # rubocop:disable Style/AccessModifierDeclarations
       private :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config, :relative_sandbox_root
+      # rubocop:enable Style/AccessModifierDeclarations
 
-      def initialize(installer, pod_target, non_library_spec = nil, default_xcconfigs = {}, experimental_deps_debug_and_release = false)
+      def initialize(installer, pod_target, non_library_spec = nil, default_xcconfigs = {}, experimental_deps_debug_and_release = false,
+                     xcframework_excluded_platforms = [], enable_add_testonly = false)
         @installer = installer
         @pod_target = pod_target
         @file_accessors = non_library_spec ? pod_target.file_accessors.select { |fa| fa.spec == non_library_spec } : pod_target.file_accessors.select { |fa| fa.spec.library_specification? }
@@ -43,6 +47,8 @@ module Pod
         @default_xcconfigs = default_xcconfigs
         @resolved_xconfig_by_config = {}
         @experimental_deps_debug_and_release = experimental_deps_debug_and_release
+        @xcframework_excluded_platforms = xcframework_excluded_platforms
+        @enable_add_testonly = enable_add_testonly
         @relative_sandbox_root = installer.sandbox.root.relative_path_from(installer.config.installation_root).to_s
       end
 
@@ -374,10 +380,10 @@ module Pod
         kwargs[:runtime_deps] = []
         kwargs[:sdk_dylibs] = file_accessors.flat_map { |fa| fa.spec_consumer.libraries }.sort.uniq
         kwargs[:sdk_frameworks] = file_accessors.flat_map { |fa| fa.spec_consumer.frameworks }.sort.uniq
-        kwargs[:testonly] = true if kwargs[:sdk_frameworks].include? 'XCTest'
+        kwargs[:testonly] = true if (kwargs[:sdk_frameworks].include? 'XCTest') && @enable_add_testonly
         kwargs[:sdk_includes] = []
         kwargs[:weak_sdk_frameworks] = file_accessors.flat_map { |fa| fa.spec_consumer.weak_frameworks }.sort.uniq
-        kwargs[:testonly] = true if kwargs[:weak_sdk_frameworks].include? 'XCTest'
+        kwargs[:testonly] = true if (kwargs[:weak_sdk_frameworks].include? 'XCTest') && @enable_add_testonly
 
         kwargs[:vendored_static_frameworks] = glob(attr: :vendored_static_frameworks, return_files: true)
         kwargs[:vendored_dynamic_frameworks] = glob(attr: :vendored_dynamic_frameworks, return_files: true)
@@ -691,15 +697,20 @@ module Pod
           {
             'name' => xcframework.name,
             'slices' => xcframework.slices.map do |slice|
-              {
-                'identifier' => slice.identifier,
-                'platform' => rules_ios_platform_name(slice.platform),
-                'platform_variant' => slice.platform_variant.to_s,
-                'supported_archs' => slice.supported_archs,
-                'path' => slice.path.relative_path_from(@package_dir).to_s,
-                'build_type' => { 'linkage' => slice.build_type.linkage.to_s, 'packaging' => slice.build_type.packaging.to_s }
-              }
-            end
+              platform_name = rules_ios_platform_name(slice.platform)
+              if @xcframework_excluded_platforms.include?(platform_name)
+                nil
+              else
+                {
+                  'identifier' => slice.identifier,
+                  'platform' => platform_name,
+                  'platform_variant' => slice.platform_variant.to_s,
+                  'supported_archs' => slice.supported_archs,
+                  'path' => slice.path.relative_path_from(@package_dir).to_s,
+                  'build_type' => { 'linkage' => slice.build_type.linkage.to_s, 'packaging' => slice.build_type.packaging.to_s }
+                }
+              end
+            end.compact
           }
         end
       end

data/lib/cocoapods/bazel/version.rb

@@ -2,6 +2,6 @@
 
 module Pod
   module Bazel
-    VERSION = '0.1.5'
+    VERSION = '0.1.7.1'
   end
 end

data/lib/cocoapods/bazel.rb

@@ -44,7 +44,9 @@ module Pod
               pod_target,
               fa.spec,
               default_xcconfigs,
-              config.experimental_deps_debug_and_release
+              config.experimental_deps_debug_and_release,
+              config.xcframework_excluded_platforms,
+              config.enable_add_testonly
             )
           end
 
@@ -53,7 +55,9 @@ module Pod
             pod_target,
             nil,
             default_xcconfigs,
-            config.experimental_deps_debug_and_release
+            config.experimental_deps_debug_and_release,
+            config.xcframework_excluded_platforms,
+            config.enable_add_testonly
           )
 
           bazel_targets = [default_target] + targets_without_library_specification

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bazel
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7.1
 platform: ruby
 authors:
 - Shawn Chen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-18 00:00:00.000000000 Z
+date: 2025-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -93,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: A plugin for CocoaPods that generates Bazel build files for pods