cocoapods-bazel 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58412dba007fce9d09b6737bc32166c80cfc345dc3cf6b94d7ea753cc772fb2c
-  data.tar.gz: 16f7b06acd670e3dada9561260a42cd9ba1501c4a78ca16c8ef9d4e6346798b4
+  metadata.gz: 3286b561998f4b34e299da4b3d8214ff2fe4d81446c1fc7ec71752a2c992052d
+  data.tar.gz: 969cb842bba28405f2d0c9450eaccf6e7914925754ccb6e5b40e55ee890f28a8
 SHA512:
-  metadata.gz: 16b159792b655dcbb415a6a2596ffa165089d2bb8bb52de5d993d4d99c05eeb3b2474c2a37db4342448cc3421d1e647d9b3352c2a79fc71d10a4939b6630a12f
-  data.tar.gz: 1fcae904fcda07f8d01423ccebec05ec2ddf5676acf396104ff30294ccb0bbf0f9c5dc6426f045ad324f896d49118382ddafa334065808cff79d30c288a91474
+  metadata.gz: 4b004b7b58351034111a546e53f0884257511de7ba3506c7e711000ea860e0e16d95bfd85b5091fc369eed434c7d32e102e4216b65fdaca6c17bae54da226795
+  data.tar.gz: 90bc0315f257f0157c17c0f1da74edea822e8593a81f4ef786adef96c2059f78f5e2e91525a79a488029791d614838a83062f4eb083509e5e784108b44074eb0

data/.github/workflows/tests.yml

@@ -12,8 +12,8 @@ jobs:
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Select Xcode 12.2
-        run: sudo xcode-select -s /Applications/Xcode_12.2.app
+      - 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.

data/.gitignore

@@ -7,5 +7,10 @@
 /spec/reports/
 /tmp/
 
+Gemfile.lock
+
 # rspec failure tracking
 .rspec_status
+
+.DS_Store
+.idea

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+0.1.4
+
+* Fix issues with glob evaluation (#64, #65)
+* Get specs running on M1 hardware (#73)
+* Expose CocoaPods environment variables PODS_ROOT and PODS_TARGET_SRCROOT (#67)
+* Mark app specs with public visibility for usage as test apps (#77)
+* README updates for buildifier option and link fixing (#69, #78)
+* Remove non-existent globs to support using --incompatible_disallow_empty_glob (#80, #79)
+
+0.1.3
+
+* Add ability to insert a docstring at top of generated build files (#58)
+* Remove expand_directories for resource_bundle (#48)
+
+0.1.2
+
+* Generate empty BUILD.bazel file at sandbox root (Pods/) during build file generation stage
+
 0.1.1
 
-* Raise error and offer suggestion if pod path is outside of current workspace
+* Raise error and offer suggestion if pod path is outside of current workspace

data/README.md

@@ -2,7 +2,9 @@
 ![](https://github.com/ob/cocoapods-bazel/workflows/master/badge.svg)
 
 
-Cocoapods::Bazel is a Cocoapods plugin that makes it easy to use [Bazel](https://bazel.build) instead of Xcode to build your iOS project. It automatically generates Bazel's `BUILD.bazel` files. It uses [`rules_ios`](https://github.com/ob/rules_ios) so you need to set up the `WORKSPACE` file following the instructions in the [`README`](https://github.com/ob/rules_ios/blob/master/README.md).
+Cocoapods::Bazel is a Cocoapods plugin that makes it easy to use [Bazel](https://bazel.build) instead of Xcode to build your iOS project. It automatically generates Bazel's `BUILD` files.
+
+`cocoapods-bazel` can be setup to translate CocoaPod targets to provided Bazel rules. For example, you can use `cocaopods-bazel` to load framework targets using [rules_ios](https://github.com/bazel-ios/rules_ios). It's also flexible enough to allow users to use their own custom rules if needed.
 
 > :warning: **This is alpha software.** We are developing this plugin in the open so you should only use it if you know what you are doing and are willing to help develop it.
 
@@ -16,19 +18,23 @@ gem 'cocoapods-bazel'
 
 And then execute:
 
-    $ bundle
+```sh
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install cocoapods-bazel
+```sh
+gem install cocoapods-bazel
+```
 
 ## Usage
 
-This plugin will run extra steps after post_install to generate BUILD.bazel files for Bazel.
+This plugin will run extra steps after post_install to generate `BUILD` files for Bazel.
 
-To enable the plugin, simply add the following section to your `Podfile`
+To enable the plugin, you can add something like the following section to your `Podfile`:
 
-```
+```ruby
 plugin 'cocoapods-bazel', {
   rules: {
     'apple_framework' => { load: '@build_bazel_rules_ios//rules:framework.bzl', rule: 'apple_framework' }.freeze,
@@ -44,9 +50,25 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+## Experimental Features
+
+There are some experimental features that are opt-in and can be enabled adding the plugin to the `Podfile`. Some of these features intentionally break the contract with the `.podspecs` specification in order to create `BUILD` files that are easier to maintain and/or evolve using Bazel features that don't have a direct relationship with what cocoapods does. You'll find the keys to enable such features and a brief explanation/motivation for each in `Bazel::Config::EXPERIMENTAL_FEATURES` (`lib/cocoapods/bazel/config.rb`).
+
+Note that tests for the experimental features are located under `spec/integration/experimental_features` and these should mostly replicate the tests under `spec/integration/monorepo` but with the features on. Also it's a place to create tests specific to a experimental feature that not necessarily will affect the default usage of `cocoapods-bazel`.
+
+## BUILD file formatting
+
+When the `BUILD.bazel` files are generated you may choose to have `cocoapods-bazel` format the files using [buildifier](https://github.com/bazelbuild/buildtools/blob/master/buildifier/README.md). This formatting is enabled by default if a `buildifier` executable is found using `which buildifier`.
+
+You can disable buildifier formatting with `buildifier: false` in the options of the `cocoapods-bazel` plugin.
+
+Additionally, if you'd like to use a custom `buildifier` executable you can provide the `cocoapods-bazel` plugin options with an array of arguments to execute to format files.
+
+For example, if you have `buildifier` runnable target you've defined in Bazel with the name `buildifier` you can run this specific version with: `buildifier: ['bazel', 'run', 'buildifier', '--']`. (Note the `--` allows bazel to forward arguments to the buildifier target).
+
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/ob/cocoapods-bazel.
+Bug reports and pull requests are welcome on GitHub [here](https://github.com/bazel-ios/cocoapods-bazel).
 
 ## License
 

data/bin/pod_install_bazel_build

@@ -23,4 +23,4 @@ ARGV.replace %w[install]
 
 load Gem.bin_path('cocoapods', 'pod')
 
-exec 'bazelisk', '--ignore_all_rc_files', 'build', '--verbose_failures', '...'
+exec 'bazelisk', '--ignore_all_rc_files', 'build', '--verbose_failures', '--cpu=ios_x86_64', '--experimental_worker_allow_json_protocol', '...'

data/cocoapods-bazel.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/ob/cocoapods-bazel'
   spec.license       = 'apache2'
 
-  spec.metadata['allowed_push_host'] = "https://rubygems.org/"
-
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage
   spec.metadata['changelog_uri'] = "#{spec.homepage}/blob/master/CHANGELOG.md"

data/lib/cocoapods/bazel/config.rb

@@ -4,6 +4,44 @@ module Pod
   module Bazel
     class Config
       PLUGIN_KEY = 'cocoapods-bazel'
+      EXPERIMENTAL_FEATURES = [
+        # When enabled cocoapods-bazel will add one additional config_setting for the 'deps' attribute only
+        # containing both 'debug' and 'release' dependencies.
+        #
+        # In other works when this flag is active cocoapods-bazel will continue to create these:
+        #
+        # - //Pods/cocoapods-bazel:debug
+        # - //Pods/cocoapods-bazel:release
+        #
+        # and generate the same 'select()' statements for all attributes but 'deps'.
+        #
+        # Additionaly these new config_setting values will be created:
+        #
+        # - //Pods/cocoapods-bazel:deps_debug
+        # - //Pods/cocoapods-bazel:deps_release
+        # - //Pods/cocoapods-bazel:deps_debug_and_release
+        #
+        # and used only in the 'deps' attribute.
+        #
+        # This effectively decouple 'deps' from the other attributes from a configuration perspective and allow one to build
+        # with different combinations of these settings. One example of a use case is generating release builds with 'debug' dependencies
+        # available so debug-only features can be used to inspect/validate behaviour in a release build (some call these "dogfood" builds).
+        #
+        # From a conceptual perspective this will generate BUILD files with "all" states and allow one to use bazel features to 'select()' the desired ones.
+        # This intentionally breaks the contract with the .podspec specification since cocoapods does not have the concept of 'select()'-ing configurations.
+        #
+        # Still in the context of the use case above ('dogfood' builds), without this experimental feature one would have to
+        # change the configurations in the .podspec file from:
+        #   `s.dependency 'Foo', configurations: %w[Debug]`
+        # to:
+        #   `s.dependency 'Foo', configurations: %w[Debug Release]`
+        # and re-run cocoapods-bazel to generate the desired type of build and then re-run it again to go back to the previous state.
+        #
+        # This might be ok for some teams but it prevents others that are interested in using cocoapods-bazel to migrate to Bazel and eventually stop
+        # depending on cocoapods. If the generated BUILD files don't contain "all" states and a 'pod install' is always required it's not trivial how to eventually treat the
+        # BUILD files as source of truth.
+        :experimental_deps_debug_and_release
+      ].freeze
       private_constant :PLUGIN_KEY
       DEFAULTS = {
         rules: {
@@ -13,8 +51,13 @@ module Pod
         }.freeze,
         overrides: {}.freeze,
         buildifier: true,
-        default_xcconfigs: {}.freeze
+        default_xcconfigs: {}.freeze,
+        build_file_doc: '',
+        features: {
+          experimental_deps_debug_and_release: false
+        }
       }.with_indifferent_access.freeze
+
       private_constant :DEFAULTS
 
       attr_reader :to_h
@@ -30,7 +73,7 @@ module Pod
       end
 
       def self.from_podfile_options(options)
-        new(DEFAULTS.merge(options) do |_key, old_val, new_val|
+        config = new(DEFAULTS.merge(options) do |_key, old_val, new_val|
           case old_val
           when Hash
             old_val.merge(new_val) # intentionally only 1 level deep of merging
@@ -38,6 +81,15 @@ module Pod
             new_val
           end
         end)
+
+        # Validating if only supported/valid experimental features
+        # exist in the Podfile (only applies if :features is not empty)
+        features = config.to_h[:features] || {}
+        features.keys.map(&:to_sym).each do |key|
+          raise "Unrecognized experimental feature '#{key}' in Podfile. Available options are: #{EXPERIMENTAL_FEATURES}" unless EXPERIMENTAL_FEATURES.include?(key)
+        end
+
+        config
       end
 
       def initialize(to_h)
@@ -55,6 +107,14 @@ module Pod
       def default_xcconfigs
         to_h[:default_xcconfigs]
       end
+
+      def experimental_deps_debug_and_release
+        to_h[:features][:experimental_deps_debug_and_release]
+      end
+
+      def build_file_doc
+        to_h[:build_file_doc]
+      end
     end
   end
 end

data/lib/cocoapods/bazel/target.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 require_relative 'xcconfig_resolver'
 
 module Pod
@@ -27,10 +29,10 @@ module Pod
 
       include XCConfigResolver
 
-      attr_reader :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config
-      private :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config
+      attr_reader :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config, :relative_sandbox_root
+      private :installer, :pod_target, :file_accessors, :non_library_spec, :label, :package, :default_xcconfigs, :resolved_xconfig_by_config, :relative_sandbox_root
 
-      def initialize(installer, pod_target, non_library_spec = nil, default_xcconfigs = {})
+      def initialize(installer, pod_target, non_library_spec = nil, default_xcconfigs = {}, experimental_deps_debug_and_release = 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? }
@@ -40,6 +42,8 @@ module Pod
         @package = installer.sandbox.pod_dir(pod_target.pod_name).relative_path_from(installer.config.installation_root).to_s
         @default_xcconfigs = default_xcconfigs
         @resolved_xconfig_by_config = {}
+        @experimental_deps_debug_and_release = experimental_deps_debug_and_release
+        @relative_sandbox_root = installer.sandbox.root.relative_path_from(installer.config.installation_root).to_s
       end
 
       def bazel_label(relative_to: nil)
@@ -54,7 +58,6 @@ module Pod
       end
 
       def build_settings_label(config)
-        relative_sandbox_root = @installer.sandbox.root.relative_path_from(@installer.config.installation_root).to_s
         cocoapods_bazel_path = File.join(relative_sandbox_root, 'cocoapods-bazel')
 
         "//#{cocoapods_bazel_path}:#{config}"
@@ -66,7 +69,7 @@ module Pod
         end
 
         app_spec, app_target = *app_host_info
-        Target.new(installer, app_target, app_spec)
+        Target.new(installer, app_target, app_spec, {}, @experimental_deps_debug_and_release)
       end
 
       def type
@@ -473,8 +476,14 @@ module Pod
         labels_by_config = {}
 
         if !sorted_debug_labels.empty? || !sorted_release_labels.empty?
-          labels_by_config[build_settings_label(:debug)] = sorted_debug_labels
-          labels_by_config[build_settings_label(:release)] = sorted_release_labels
+          if @experimental_deps_debug_and_release
+            labels_by_config[build_settings_label(:deps_debug)] = sorted_debug_labels
+            labels_by_config[build_settings_label(:deps_release)] = sorted_release_labels
+            labels_by_config[build_settings_label(:deps_debug_and_release)] = sorted_debug_labels + sorted_release_labels
+          else
+            labels_by_config[build_settings_label(:debug)] = sorted_debug_labels
+            labels_by_config[build_settings_label(:release)] = sorted_release_labels
+          end
         end
 
         if labels_by_config.empty? # no per-config dependency
@@ -514,55 +523,125 @@ module Pod
       def expand_glob(glob, extensions: nil, expand_directories: false)
         if (m = glob.match(/\{([^\{\}]+)\}/))
           m[1].split(',').flat_map do |alt|
-            expand_glob("#{m.pre_match}#{alt}#{m.post_match}")
+            expand_glob("#{m.pre_match}#{alt.strip}#{m.post_match}", extensions: extensions, expand_directories: expand_directories)
           end.uniq
         elsif (m = glob.match(/\[([^\[\]]+)\]/))
           m[1].each_char.flat_map do |alt|
-            expand_glob("#{m.pre_match}#{alt}#{m.post_match}")
+            expand_glob("#{m.pre_match}#{alt.strip}#{m.post_match}", extensions: extensions, expand_directories: expand_directories)
           end.uniq
         elsif extensions && File.extname(glob).empty?
           glob = glob.chomp('**/*') # If we reach here and the glob ends with **/*, we need to avoid duplicating it (we do not want to end up with **/*/**/*)
           if File.basename(glob) == '*'
-            extensions.map { |ext| "#{glob}.#{ext}" }
+            extensions.map do |ext|
+              combined = "#{glob}.#{ext}"
+              combined if Dir.glob(File.join(@package_dir, combined)).any?
+            end.compact
           else
             extensions.map do |ext|
-              File.join(glob, '**', "*.#{ext}")
-            end
+              combined = File.join(glob, '**', "*.#{ext}")
+              combined if Dir.glob(File.join(@package_dir, combined)).any?
+            end.compact
           end
         elsif expand_directories
           if glob.end_with?('/**/*')
-            [glob]
+            glob_with_valid_matches(glob)
           elsif glob.end_with?('/*')
             [glob.sub(%r{/\*$}, '/**/*')]
+          elsif should_skip_directory_expansion(glob)
+            glob_with_valid_matches(glob)
           else
-            [glob, glob.chomp('/') + '/**/*']
+            [glob.chomp('/') + '/**/*']
           end
         else
-          [glob]
+          glob_with_valid_matches(glob)
         end
       end
 
+      # Returns `[glob]` if the given pattern has at least 1 match on disk, otherwise returns an empty array
+      def glob_with_valid_matches(glob)
+        Dir.glob(File.join(@package_dir, glob)).any? ? [glob] : []
+      end
+
+      # We should expand only folder globs, not expand file globs.
+      # E.g., xib files glob "*.xib" should not be expanded to "*.xib/**/*", otherise nothing will be matched
+      def should_skip_directory_expansion(glob)
+        extension = File.extname(glob)
+        expansion_extentions = Set['.xcassets', '.xcdatamodeld', '.lproj']
+        !expansion_extentions.include?(extension)
+      end
+
+      def rules_ios_platform_name(platform)
+        name = platform.string_name.downcase
+        return 'macos' if name == 'osx'
+
+        name
+      end
+
       def framework_kwargs
+        library_spec = pod_target.file_accessors.find { |fa| fa.spec.library_specification? }.spec
         {
           visibility: ['//visibility:public'],
-          platforms: { pod_target.platform.string_name.downcase => pod_target.platform.deployment_target.to_s }
+          bundle_id: resolved_value_by_build_setting('PRODUCT_BUNDLE_IDENTIFIER'),
+          infoplists_by_build_setting: pod_target_infoplists_by_build_setting,
+          infoplists: common_pod_target_infoplists(additional_plist: nil_if_empty(library_spec.consumer(pod_target.platform).info_plist)),
+          platforms: { rules_ios_platform_name(pod_target.platform) => build_os_version || pod_target.platform.deployment_target.to_s }
         }
       end
 
       def test_kwargs
         {
           bundle_id: resolved_value_by_build_setting('PRODUCT_BUNDLE_IDENTIFIER'),
-          env: pod_target.scheme_for_spec(non_library_spec).fetch(:environment_variables, {}),
+          env: resolve_env(pod_target.scheme_for_spec(non_library_spec).fetch(:environment_variables, {})),
           infoplists_by_build_setting: pod_target_infoplists_by_build_setting,
           infoplists: common_pod_target_infoplists(additional_plist: nil_if_empty(non_library_spec.consumer(pod_target.platform).info_plist)),
-          minimum_os_version: pod_target.deployment_target_for_non_library_spec(non_library_spec),
+          minimum_os_version: build_os_version || pod_target.deployment_target_for_non_library_spec(non_library_spec),
           test_host: test_host&.bazel_label(relative_to: package) || file_accessors.any? { |fa| fa.spec_consumer.requires_app_host? } || nil
         }
       end
 
+      # Resolves the given environment by resolving CocoaPod specific environment variables.
+      # Given an environment with unresolved env values, this function resolves them and returns the new env.
+      def resolve_env(env)
+        # These environment variables are resolved by CocoaPods, they tend to be used in tests and other
+        # scripts, as such we must resolve them before translating the targets environment.
+        resolved_cocoapods_env = {
+          'PODS_ROOT' => "//#{relative_sandbox_root}",
+          'PODS_TARGET_SRCROOT' => ':'
+        }.freeze
+
+        # Removes the : bazel prefix for current directory.
+        sub_prefix = ->(s) { s.sub(%r{\A:/}, '') }
+
+        env.each_with_object({}) do |(k, v), resolved_env|
+          resolved_val = Pod::Bazel::Util.resolve_value(v, resolved_values: resolved_cocoapods_env)
+          resolved_env[k] = sub_prefix[resolved_val]
+        end
+      end
+
+      def build_os_version
+        # If there's a SWIFT_DEPLOYMENT_TARGET version set, use that for the
+        # minimum version. It's not currently supported or desirable in rules_ios to have
+        # these distinct, however xcconfig supports that.
+        swift_deployment_target = resolved_value_by_build_setting('SWIFT_DEPLOYMENT_TARGET')
+
+        llvm_target_triple_os_version = resolved_value_by_build_setting('LLVM_TARGET_TRIPLE_OS_VERSION')
+        if llvm_target_triple_os_version
+          # For clang this is set ios9.0: take everything after the os name
+          version_number = llvm_target_triple_os_version.match(/\d.*/)
+          clang_build_os_version = version_number.to_s if version_number
+        end
+        if !swift_deployment_target.nil? && !clang_build_os_version.nil?
+          raise "warning: had different os versions #{swift_deployment_target} #{clang_build_os_version}" if swift_deployment_target != clang_build_os_version
+        end
+        swift_deployment_target || clang_build_os_version
+      end
+
       def app_kwargs
         # maps to kwargs listed for https://github.com/bazelbuild/rules_apple/blob/master/doc/rules-ios.md#ios_application
-        {
+
+        platform_target = pod_target.deployment_target_for_non_library_spec(non_library_spec)
+
+        kwargs = {
           app_icons: [],
           bundle_id: resolved_value_by_build_setting('PRODUCT_BUNDLE_IDENTIFIER') || "org.cocoapods.#{label}",
           bundle_name: nil,
@@ -576,14 +655,19 @@ module Pod
           ipa_post_processor: nil,
           launch_images: [],
           launch_storyboard: nil,
-          minimum_os_version: pod_target.deployment_target_for_non_library_spec(non_library_spec),
+          minimum_os_version: build_os_version || platform_target,
           provisioning_profile: nil,
           resources: [],
           settings_bundle: [],
           strings: [],
           version: [],
-          watch_application: []
+          watch_application: [],
+          visibility: ['//visibility:public']
         }
+
+        # If the user has set a different build os set that here
+        kwargs[:minimum_deployment_os_version] = platform_target if build_os_version
+        kwargs
       end
 
       def app_targeted_device_families
@@ -607,7 +691,7 @@ module Pod
             'slices' => xcframework.slices.map do |slice|
               {
                 'identifier' => slice.identifier,
-                'platform' => slice.platform.name.to_s,
+                '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,

data/lib/cocoapods/bazel/util.rb

@@ -10,6 +10,18 @@ module Pod
         sort_keys.sort_by { |k| [k.phase, k.split, k.value, k.original_index] }.map(&:value)
       end
 
+      # Recursively resolves the variables in string with the given resolved values.
+      #
+      # Example: Given string = "${PODS_ROOT}/Foo", resolved_values = {"PODS_ROOT": "//Pods"}
+      # this function returns "//Pods/Foo".
+      def resolve_value(string, resolved_values:)
+        return string unless string =~ /\$(?:\{([_a-zA-Z0-0]+?)\}|\(([_a-zA-Z0-0]+?)\))/
+
+        match, key = Regexp.last_match.values_at(0, 1, 2).compact
+        sub = resolved_values.fetch(key, '')
+        resolve_value(string.gsub(match, sub), resolved_values: resolved_values)
+      end
+
       class SortKey
         attr_reader :phase, :split, :value, :original_index
 

data/lib/cocoapods/bazel/version.rb

@@ -2,6 +2,6 @@
 
 module Pod
   module Bazel
-    VERSION = '0.1.1'
+    VERSION = '0.1.4'
   end
 end

data/lib/cocoapods/bazel/xcconfig_resolver.rb

@@ -8,8 +8,10 @@ module Pod
       def resolved_build_setting_value(setting, settings:)
         return unless (value = settings[setting])
 
+        # Removes the : bazel prefix for current directory.
         sub_prefix = ->(s) { s.sub(%r{\A:/}, '') }
-        resolved = resolve_string_with_build_settings(value, settings: settings)
+
+        resolved = Pod::Bazel::Util.resolve_value(value, resolved_values: settings)
         if Pod::Target::BuildSettings::PLURAL_SETTINGS.include?(setting)
           resolved.shellsplit.reject(&:empty?).map(&sub_prefix)
         else
@@ -17,20 +19,13 @@ module Pod
         end
       end
 
-      def resolve_string_with_build_settings(string, settings:)
-        return string unless string =~ /\$(?:\{([_a-zA-Z0-0]+?)\}|\(([_a-zA-Z0-0]+?)\))/
-
-        match, key = Regexp.last_match.values_at(0, 1, 2).compact
-        sub = settings.fetch(key, '')
-        resolve_string_with_build_settings(string.gsub(match, sub), settings: settings)
-      end
-
       UNRESOLVED_SETTINGS = [
         'CONFIGURATION', # not needed, only used to help resolve other settings that may use it in substitutions
         'HEADER_SEARCH_PATHS', # serialized into copts, handled natively by Xcode instead of via xcspecs
         'OTHER_CFLAGS', # serialized separately as objc_copts
         'OTHER_SWIFT_FLAGS', # serialized separately as swift_copts
         'OTHER_LDFLAGS', # serialized separately as linkopts
+        'PODS_ROOT', # not needed, used to help resolve the Pods root path relative to the current package
         'PODS_TARGET_SRCROOT', # not needed, used to help resolve file references relative to the current package
         'SDKROOT', # not needed since the SDKROOT gets propagated via the apple configuration transition
         'SRCROOT', # not needed, used to help resolve file references relative to the current workspace

data/lib/cocoapods/bazel.rb

@@ -19,6 +19,10 @@ module Pod
       UI.titled_section 'Generating Bazel files' do
         workspace = installer.config.installation_root
         sandbox = installer.sandbox
+
+        # Ensure we declare the sandbox (Pods/) as a package so each Pod (as a package) belongs to sandbox root package instead
+        FileUtils.touch(File.join(installer.config.sandbox_root, 'BUILD.bazel'))
+
         build_files = Hash.new { |h, k| h[k] = StarlarkCompiler::BuildFile.new(workspace: workspace, package: k) }
         installer.pod_targets.each do |pod_target|
           package = sandbox.pod_dir(pod_target.pod_name).relative_path_from(workspace).to_s
@@ -34,8 +38,25 @@ module Pod
 
           build_file = build_files[package]
 
-          bazel_targets = [Target.new(installer, pod_target, nil, default_xcconfigs)] +
-                          pod_target.file_accessors.reject { |fa| fa.spec.library_specification? }.map { |fa| Target.new(installer, pod_target, fa.spec, default_xcconfigs) }
+          targets_without_library_specification = pod_target.file_accessors.reject { |fa| fa.spec.library_specification? }.map do |fa|
+            Target.new(
+              installer,
+              pod_target,
+              fa.spec,
+              default_xcconfigs,
+              config.experimental_deps_debug_and_release
+            )
+          end
+
+          default_target = Target.new(
+            installer,
+            pod_target,
+            nil,
+            default_xcconfigs,
+            config.experimental_deps_debug_and_release
+          )
+
+          bazel_targets = [default_target] + targets_without_library_specification
 
           bazel_targets.each do |t|
             load = config.load_for(macro: t.type)
@@ -46,6 +67,13 @@ module Pod
 
         build_files.each_value(&:save!)
         format_files(build_files: build_files, buildifier: config.buildifier, workspace: workspace)
+        unless config.build_file_doc.empty?
+          build_files.each_key.each do |key|
+            path = File.join(workspace, key, 'BUILD.bazel')
+            content = File.read(path)
+            File.write(path, "\"\"\"\n#{config.build_file_doc}\n\"\"\"\n\n" + content)
+          end
+        end
 
         cocoapods_bazel_path = File.join(sandbox.root, 'cocoapods-bazel')
         FileUtils.mkdir_p cocoapods_bazel_path
@@ -60,11 +88,23 @@ module Pod
 
       cocoapods_bazel_pkg = Pathname.new(path).relative_path_from Pathname.new(workspace)
       configs_build_file = StarlarkCompiler::BuildFile.new(workspace: workspace, package: cocoapods_bazel_pkg)
-
       configs_build_file.add_load(of: 'string_flag', from: '@bazel_skylib//rules:common_settings.bzl')
       configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new('string_flag', name: 'config', build_setting_default: 'debug', visibility: ['//visibility:public'])
-      configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new('config_setting', name: 'debug', flag_values: { ':config' => 'debug' })
-      configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new('config_setting', name: 'release', flag_values: { ':config' => 'release' })
+      configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new('config_setting', name: 'debug', flag_values: { ':config' => 'debug' }, visibility: ['//visibility:public'])
+      configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new('config_setting', name: 'release', flag_values: { ':config' => 'release' }, visibility: ['//visibility:public'])
+
+      if config.experimental_deps_debug_and_release
+        configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new('string_flag', name: 'deps_config', build_setting_default: 'deps_debug', visibility: ['//visibility:public'])
+        configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new(
+          'config_setting', name: 'deps_debug', flag_values: { ':deps_config' => 'deps_debug' }, visibility: ['//visibility:public']
+        )
+        configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new(
+          'config_setting', name: 'deps_release', flag_values: { ':deps_config' => 'deps_release' }, visibility: ['//visibility:public']
+        )
+        configs_build_file.add_target StarlarkCompiler::AST::FunctionCall.new(
+          'config_setting', name: 'deps_debug_and_release', flag_values: { ':deps_config' => 'deps_debug_and_release' }, visibility: ['//visibility:public']
+        )
+      end
 
       configs_build_file.save!
       format_files(build_files: { cocoapods_bazel_pkg => configs_build_file }, buildifier: config.buildifier, workspace: workspace)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bazel
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Shawn Chen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-22 00:00:00.000000000 Z
+date: 2022-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,7 +55,6 @@ files:
 - ".rubocop_todo.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -76,7 +75,6 @@ homepage: https://github.com/ob/cocoapods-bazel
 licenses:
 - apache2
 metadata:
-  allowed_push_host: https://rubygems.org/
   homepage_uri: https://github.com/ob/cocoapods-bazel
   source_code_uri: https://github.com/ob/cocoapods-bazel
   changelog_uri: https://github.com/ob/cocoapods-bazel/blob/master/CHANGELOG.md
@@ -95,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: A plugin for CocoaPods that generates Bazel build files for pods

data/Gemfile.lock

@@ -1,145 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cocoapods-bazel (0.1.1)
-      starlark_compiler (~> 0.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (3.0.3)
-    activesupport (5.2.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
-    algoliasearch (1.27.5)
-      httpclient (~> 2.8, >= 2.8.3)
-      json (>= 1.5.1)
-    ast (2.4.0)
-    atomos (0.1.3)
-    bacon (1.2.0)
-    claide (1.0.3)
-    clintegracon (0.9.0)
-      colored2 (~> 3.1)
-      diffy
-    cocoapods (1.10.1)
-      addressable (~> 2.6)
-      claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.10.1)
-      cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.4.0, < 2.0)
-      cocoapods-plugins (>= 1.0.0, < 2.0)
-      cocoapods-search (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.4.0, < 2.0)
-      cocoapods-try (>= 1.1.0, < 2.0)
-      colored2 (~> 3.1)
-      escape (~> 0.0.4)
-      fourflusher (>= 2.3.0, < 3.0)
-      gh_inspector (~> 1.0)
-      molinillo (~> 0.6.6)
-      nap (~> 1.0)
-      ruby-macho (~> 1.4)
-      xcodeproj (>= 1.19.0, < 2.0)
-    cocoapods-core (1.10.1)
-      activesupport (> 5.0, < 6)
-      addressable (~> 2.6)
-      algoliasearch (~> 1.0)
-      concurrent-ruby (~> 1.1)
-      fuzzy_match (~> 2.0.4)
-      nap (~> 1.0)
-      netrc (~> 0.11)
-      public_suffix
-      typhoeus (~> 1.0)
-    cocoapods-deintegrate (1.0.4)
-    cocoapods-downloader (1.4.0)
-    cocoapods-plugins (1.0.0)
-      nap
-    cocoapods-search (1.0.0)
-    cocoapods-trunk (1.5.0)
-      nap (>= 0.8, < 2.0)
-      netrc (~> 0.11)
-    cocoapods-try (1.2.0)
-    colored2 (3.1.2)
-    concurrent-ruby (1.1.8)
-    diff-lcs (1.3)
-    diffy (3.3.0)
-    escape (0.0.4)
-    ethon (0.12.0)
-      ffi (>= 1.3.0)
-    ffi (1.14.2)
-    fourflusher (2.3.1)
-    fuzzy_match (2.0.4)
-    gh_inspector (1.1.3)
-    httpclient (2.8.3)
-    i18n (1.8.8)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.5.1)
-    minitest (5.14.3)
-    molinillo (0.6.6)
-    nanaimo (0.3.0)
-    nap (1.1.0)
-    netrc (0.11.0)
-    parallel (1.19.1)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    prettybacon (0.0.2)
-      bacon (~> 1.2)
-    public_suffix (4.0.6)
-    rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.78.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-macho (1.4.0)
-    ruby-progressbar (1.10.1)
-    starlark_compiler (0.3.0)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    xcodeproj (1.19.0)
-      CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.3)
-      claide (>= 1.0.2, < 2.0)
-      colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bacon (~> 1.2)
-  bundler (>= 2.1)
-  clintegracon (~> 0.9.0)
-  cocoapods (~> 1.9)
-  cocoapods-bazel!
-  prettybacon (~> 0.0.2)
-  rake (~> 12.3)
-  rspec (~> 3.9)
-  rubocop (~> 0.78)
-
-BUNDLED WITH
-   2.2.8