diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index 13feb413..92aeb2f6 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -1,12 +1,6 @@ matrix: - bazel: ["6.x", "7.x"] + bazel: ["7.x"] tasks: - verify_build_targets_bazel_6: - name: Verify Build targets on macOS with Bazel 6 - platform: macos_arm64 - bazel: 6.x - build_targets: - - "@rules_ios//rules/..." verify_build_targets_bazel_7: name: Verify Build targets on macOS with Bazel 7 platform: macos_arm64 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2d39b228..902c73f1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - bazel_version: [6.5.0, 7.1.0] + bazel_version: [7.1.0] xcode_version: [15.2] virtual_frameworks: [true, false] sandbox: [true, false] @@ -85,7 +85,7 @@ jobs: strategy: fail-fast: false matrix: - bazel_version: [6.5.0, 7.1.0] + bazel_version: [7.1.0] sandbox: [true, false] xcode_version: [15.2] env: @@ -164,7 +164,7 @@ jobs: strategy: fail-fast: false matrix: - bazel_version: [6.5.0, 7.1.0] + bazel_version: [7.1.0] xcode_version: [15.2] env: XCODE_VERSION: ${{ matrix.xcode_version }} diff --git a/MODULE.bazel b/MODULE.bazel index c11671fb..23dbee47 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,7 +8,7 @@ module( name = "rules_ios", version = "0", bazel_compatibility = [ - ">=6.0.0", + ">=7.0.0", ], compatibility_level = 1, repo_name = "build_bazel_rules_ios", diff --git a/README.md b/README.md index 311cfe71..d3b57c22 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ See the following table for supported release versions. | Bazel release | Minimum supported rules version | Final supported rules version |:-------------------:|:-------------------------:|:-------------------------: | 7.* | 4.4.0 | current -| 6.* | 2.0.0 | current +| 6.* | 2.0.0 | 5.3.0 | 5.* | 1.0.0 | 3.2.2 | 4.* | 1.0.0 | 1.0.0 diff --git a/rules/framework.bzl b/rules/framework.bzl index 01b5a21d..22d854a7 100644 --- a/rules/framework.bzl +++ b/rules/framework.bzl @@ -572,9 +572,10 @@ def _get_cc_info_linker_inputs(*, deps): if not CcInfo in dep: continue - linker_inputs.append(dep[CcInfo].linking_context.linker_inputs) + for linker_input in dep[CcInfo].linking_context.linker_inputs.to_list(): + linker_inputs.append(linker_input) - return depset([], transitive = linker_inputs) + return depset(linker_inputs) def _create_swiftmodule(attrs): kwargs = {}