Skip to content

feat: support @import of modules in Objective-C code #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 40 commits into from
Feb 23, 2023
Merged

feat: support @import of modules in Objective-C code #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
7e25437
Add pkginfo_targets.modulemap_label_name and
cgrindel Feb 17, 2023
ff8c371
Update swiftpkg_build_files to create generate_modulemap declarations.
cgrindel Feb 17, 2023
567994e
Update unit test to exercise Objc dependnecy
cgrindel Feb 17, 2023
693a018
Enable ios_application and ios_unit_test
cgrindel Feb 18, 2023
42fef82
Comment out the header generation
cgrindel Feb 18, 2023
2a9ea6b
Upgrade firebase to 10.x
cgrindel Feb 18, 2023
721c9dc
Add PrintVersionObjc binary
cgrindel Feb 18, 2023
ac4083a
Create FooSwiftVersionInfo in PrintVersionObjc.
cgrindel Feb 18, 2023
566c16f
Better print to stdout
cgrindel Feb 18, 2023
e1a8292
Add example of Objc @import Swift module.
cgrindel Feb 19, 2023
2ba8b74
Add check for no header files
cgrindel Feb 19, 2023
fa9fa9d
Add initial swift_files files.
cgrindel Feb 19, 2023
38fd481
Creating generate_modulemap declaration for Swift with @objc.
cgrindel Feb 20, 2023
1e99340
Rename pkginfo_target_deps.bazel_label_strs to bzl_select_list.
cgrindel Feb 20, 2023
006961e
Resolve based on depender module.
cgrindel Feb 20, 2023
1e9d085
Make GoogleService-Info.plist available.
cgrindel Feb 21, 2023
2f5459f
Add HACK to confirm that we need to detect SDK frameworks used by
cgrindel Feb 21, 2023
991fd0b
Change generate_builtin_frameworks to take a --go_output option.
cgrindel Feb 21, 2023
ddc5e74
Generate Starlark source file with builtins.
cgrindel Feb 22, 2023
76287bb
Initial objc_files.
cgrindel Feb 22, 2023
b3d0ac9
Fix format of generated builtins for Starlark.
cgrindel Feb 22, 2023
63dae83
Update .bazelrc
cgrindel Feb 22, 2023
5a34693
Fix issues with apple_builtin_frameworks
cgrindel Feb 22, 2023
280b4de
Fix generate_builtin_frameworks and tests
cgrindel Feb 22, 2023
122f4a1
Added #import tests
cgrindel Feb 22, 2023
82498a3
Add @import tests
cgrindel Feb 22, 2023
70e0489
Fix #import parse ranges
cgrindel Feb 22, 2023
beed166
Clean up
cgrindel Feb 22, 2023
00f7cd8
Add tests for collect_builtin_frameworks
cgrindel Feb 22, 2023
67e4dce
Switch to root_path/pkg_path
cgrindel Feb 22, 2023
fe8d0d8
Ensure that we are getting the correct frameworks by platform
cgrindel Feb 23, 2023
a0b7a2f
Generate Bazel select for Apple frameworks
cgrindel Feb 23, 2023
05a3d3d
Add doc to objc_files.
cgrindel Feb 23, 2023
238b153
Remove commented code from appdistribution build files.
cgrindel Feb 23, 2023
aacddc5
Added doc to bazel_apple_platforms
cgrindel Feb 23, 2023
9209410
Mangle TODO comment
cgrindel Feb 23, 2023
60f5832
Move _imports_xctest to swift_files.
cgrindel Feb 23, 2023
4dab9cf
Move has_objc_srcs to objc_files
cgrindel Feb 23, 2023
fba706d
Update clang handler to use _collect_modulemap_deps.
cgrindel Feb 23, 2023
a2c2e32
Clean up
cgrindel Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# To update these lines, execute
# `bazel run @contrib_rules_bazel_integration_test//tools:update_deleted_packages`
build --deleted_packages=examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/http_archive_ext_deps,examples/http_archive_ext_deps/Sources/MyDequeModule,examples/http_archive_ext_deps/Sources/PrintStuff,examples/http_archive_ext_deps/Tests/MyDequeModuleTests,examples/http_archive_ext_deps/third_party,examples/interesting_deps,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/objc_code,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
query --deleted_packages=examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/http_archive_ext_deps,examples/http_archive_ext_deps/Sources/MyDequeModule,examples/http_archive_ext_deps/Sources/PrintStuff,examples/http_archive_ext_deps/Tests/MyDequeModuleTests,examples/http_archive_ext_deps/third_party,examples/interesting_deps,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/objc_code,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
build --deleted_packages=examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/http_archive_ext_deps,examples/http_archive_ext_deps/Sources/MyDequeModule,examples/http_archive_ext_deps/Sources/PrintStuff,examples/http_archive_ext_deps/Tests/MyDequeModuleTests,examples/http_archive_ext_deps/third_party,examples/interesting_deps,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/objc_code,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example
query --deleted_packages=examples/firebase_example,examples/firebase_example/abtesting,examples/firebase_example/abtesting/SharedApp,examples/firebase_example/analytics/AnalyticsExample,examples/firebase_example/appdistribution,examples/firebase_example/appdistribution/AppDistributionExample,examples/firebase_example/appdistribution/AppDistributionTests,examples/http_archive_ext_deps,examples/http_archive_ext_deps/Sources/MyDequeModule,examples/http_archive_ext_deps/Sources/PrintStuff,examples/http_archive_ext_deps/Tests/MyDequeModuleTests,examples/http_archive_ext_deps/third_party,examples/interesting_deps,examples/ios_sim,examples/ios_sim/Sources/Foo,examples/ios_sim/Tests/FooTests,examples/objc_code,examples/pkg_manifest_minimal,examples/pkg_manifest_minimal/Sources/MyExecutable,examples/pkg_manifest_minimal/Sources/MyLibrary,examples/pkg_manifest_minimal/Tests/MyLibraryTests,examples/pkg_manifest_minimal/third_party,examples/vapor_example,examples/vapor_example/Sources/App,examples/vapor_example/Sources/Run,examples/vapor_example/Tests/AppTests,examples/vapor_example/swift,examples/xcmetrics_example

# Import Shared settings
import %workspace%/shared.bazelrc
Expand Down
32 changes: 16 additions & 16 deletions examples/firebase_example/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/firebase_example/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ import PackageDescription
let package = Package(
name: "firebase_example",
dependencies: [
.package(url: "https://github.com/firebase/firebase-ios-sdk", .exact("8.9.1")),
.package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMajor(from: "10.0.0")),
]
)
9 changes: 4 additions & 5 deletions examples/firebase_example/appdistribution/AppDistributionExample/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ swift_library(
tags = ["manual"],
visibility = ["//visibility:public"],
# GH202: Incomplete deps are generated.
deps = ["@swiftpkg_firebase_ios_sdk//:SwiftPM-PlatformExclude_FirebaseAppDistributionWrap_FirebaseAppDistributionTarget"],
deps = [
"@swiftpkg_firebase_ios_sdk//:SwiftPM-PlatformExclude_FirebaseAppDistributionWrap_FirebaseAppDistributionTarget",
],
)

ios_application(
Expand All @@ -29,10 +31,7 @@ ios_application(
["Assets.xcassets/**"],
exclude = ["Assets.xcassets/AppIcon.appiconset/**"],
) + [
":GoogleService-Info.plist",
"//appdistribution:shared_resources",
],
# GH208: This fails due to an Objc module not being found by another Objc module.
# Marking as manual so that they do not run during CI.
tags = ["manual"],
deps = [":AppDistributionExample"],
)
3 changes: 0 additions & 3 deletions examples/firebase_example/appdistribution/AppDistributionTests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ swift_library(
ios_unit_test(
name = "FooTests",
minimum_os_version = "13.0",
# GH208: This fails due to an Objc module not being found by another Objc module.
# Marking as manual so that they do not run during CI.
tags = ["manual"],
visibility = ["//visibility:private"],
deps = [":AppDistributionTests"],
)
7 changes: 7 additions & 0 deletions examples/firebase_example/appdistribution/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
filegroup(
name = "shared_resources",
srcs = [
"GoogleService-Info.plist",
],
visibility = ["//appdistribution:__subpackages__"],
)
20 changes: 10 additions & 10 deletions examples/firebase_example/swift_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,31 @@ def swift_dependencies():
# version: 0.20200225.4
swift_package(
name = "swiftpkg_abseil_cpp_swiftpm",
commit = "fffc3c2729be5747390ad02d5100291a0d9ad26a",
commit = "583de9bd60f66b40e78d08599cc92036c2e7e4e1",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/firebase/abseil-cpp-SwiftPM.git",
)

# version: 0.7.2
swift_package(
name = "swiftpkg_boringssl_swiftpm",
commit = "734a8247442fde37df4364c21f6a0085b6a36728",
commit = "dd3eda2b05a3f459fc3073695ad1b28659066eab",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/firebase/boringssl-SwiftPM.git",
)

# version: 8.9.1
swift_package(
name = "swiftpkg_firebase_ios_sdk",
commit = "839cc6b0cd80b0b8bf81fe9bd82b743b25dc6446",
commit = "f567ed9a2b30e29159df258049a9c662c517688e",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/firebase/firebase-ios-sdk",
)

# version: 8.9.1
swift_package(
name = "swiftpkg_googleappmeasurement",
commit = "9b2f6aca5b4685c45f9f5481f19bee8e7982c538",
commit = "9a09ece724128e8d1e14c5133b87c0e236844ac0",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/google/GoogleAppMeasurement.git",
)
Expand All @@ -49,18 +49,18 @@ def swift_dependencies():
remote = "https://github.com/google/GoogleUtilities.git",
)

# version: 1.28.4
# version: 1.44.3-grpc
swift_package(
name = "swiftpkg_grpc_swiftpm",
commit = "fb405dd2c7901485f7e158b24e3a0a47e4efd8b5",
name = "swiftpkg_grpc_ios",
commit = "8440b914756e0d26d4f4d054a1c1581daedfc5b6",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/firebase/grpc-SwiftPM.git",
remote = "https://github.com/grpc/grpc-ios.git",
)

# version: 1.7.2
swift_package(
name = "swiftpkg_gtm_session_fetcher",
commit = "4e9bbf2808b8fee444e84a48f5f3c12641987d3e",
commit = "96d7cc73a71ce950723aa3c50ce4fb275ae180b8",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/google/gtm-session-fetcher.git",
)
Expand All @@ -76,7 +76,7 @@ def swift_dependencies():
# version: 2.30908.0
swift_package(
name = "swiftpkg_nanopb",
commit = "7ee9ef9f627d85cbe1b8c4f49a3ed26eed216c77",
commit = "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
dependencies_index = "@//:swift_deps_index.json",
remote = "https://github.com/firebase/nanopb.git",
)
Expand Down
Loading