From 2df9f35e6777644d54d4bc245757d63a2d3019ff Mon Sep 17 00:00:00 2001 From: Sergii Khliustin <51409210+sergeykhliustin@users.noreply.github.com> Date: Fri, 1 Mar 2024 01:07:17 +0100 Subject: [PATCH] Fix module_name and bundle_name for test specs (#118) --- .../Analyzer/Analyzers/BaseAnalyzer.swift | 2 +- .../Build/PodBuildFile+makeAppspecs.swift | 4 ---- .../Specs/Protocols/BaseInfoRepresentable.swift | 6 +++++- .../Specs/Protocols/XCConfigRepresentable.swift | 6 ++++++ .../BazelPodsCore/Targets/TestSpecs/iOSUITest.swift | 1 + .../Targets/TestSpecs/iOSUnitTest.swift | 1 + Tests/Recorded/CoreStore/BUILD.bazel | 13 +++++++------ Tests/Recorded/CwlCatchException/BUILD.bazel | 3 ++- Tests/Recorded/CwlPreconditionTesting/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseABTesting/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseAuth/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseCore/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseCoreInternal/BUILD.bazel | 6 ++++-- Tests/Recorded/FirebaseCrashlytics/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseDatabase/BUILD.bazel | 6 ++++-- Tests/Recorded/FirebaseFunctions/BUILD.bazel | 6 ++++-- Tests/Recorded/FirebaseInstallations/BUILD.bazel | 6 ++++-- Tests/Recorded/FirebasePerformance/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseSessions/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseSharedSwift/BUILD.bazel | 3 ++- Tests/Recorded/FirebaseStorage/BUILD.bazel | 3 ++- Tests/Recorded/GTMSessionFetcher/BUILD.bazel | 3 ++- Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel | 3 ++- Tests/Recorded/GoogleDataTransport/BUILD.bazel | 3 ++- Tests/Recorded/GoogleUtilities/BUILD.bazel | 6 ++++-- Tests/Recorded/PromisesObjC/BUILD.bazel | 6 ++++-- Tests/Recorded/ViewInspector/BUILD.bazel | 3 ++- Tests/Recorded/Wire/BUILD.bazel | 3 ++- 29 files changed, 77 insertions(+), 40 deletions(-) diff --git a/Sources/BazelPodsCore/Analyzer/Analyzers/BaseAnalyzer.swift b/Sources/BazelPodsCore/Analyzer/Analyzers/BaseAnalyzer.swift index f1050c3..ebcedb0 100644 --- a/Sources/BazelPodsCore/Analyzer/Analyzers/BaseAnalyzer.swift +++ b/Sources/BazelPodsCore/Analyzer/Analyzers/BaseAnalyzer.swift @@ -36,7 +36,7 @@ struct BaseAnalyzer { let name = spec.name let version = spec.version let platformVersion = try resolvePlatformVersion(platform) - let moduleName: String = spec.resolveModuleName(platform) + let moduleName: String = spec.resolveModuleName(platform, options: options) let platforms = [platform.bazelKey: platformVersion] let swiftVersion: String? if let versions = spec.attr(\.swiftVersions).platform(platform)??.compactMap({ Double($0) }) { diff --git a/Sources/BazelPodsCore/Build/PodBuildFile+makeAppspecs.swift b/Sources/BazelPodsCore/Build/PodBuildFile+makeAppspecs.swift index 041ff0a..5a845b1 100644 --- a/Sources/BazelPodsCore/Build/PodBuildFile+makeAppspecs.swift +++ b/Sources/BazelPodsCore/Build/PodBuildFile+makeAppspecs.swift @@ -26,10 +26,6 @@ extension PodBuildFile { continue } - for patch in options.patches { - - } - let (resourceTargets, resourceInfoplists) = makeResourceBundles( targetName: targetName, baseInfo: analyzer.baseInfo, diff --git a/Sources/BazelPodsCore/Models/Specs/Protocols/BaseInfoRepresentable.swift b/Sources/BazelPodsCore/Models/Specs/Protocols/BaseInfoRepresentable.swift index 96b6d7b..3c2e057 100644 --- a/Sources/BazelPodsCore/Models/Specs/Protocols/BaseInfoRepresentable.swift +++ b/Sources/BazelPodsCore/Models/Specs/Protocols/BaseInfoRepresentable.swift @@ -60,9 +60,13 @@ extension BaseInfoRepresentable { } } - func resolveModuleName(_ platform: Platform) -> String { + func resolveModuleName(_ platform: Platform, options: BuildOptions) -> String { if let specModuleName = moduleName ?? platformRepresentable(platform)?.moduleName { return specModuleName + } else if let buildSettings = self as? XCConfigRepresentable, let moduleName = buildSettings.moduleName { + return moduleName + } else if let testSpec = self as? TestSpecRepresentable { + return [options.podName, testSpec.testType.rawValue.capitalized, name].joined(separator: "_") } else { return name.replacingOccurrences(of: "-", with: "_") } diff --git a/Sources/BazelPodsCore/Models/Specs/Protocols/XCConfigRepresentable.swift b/Sources/BazelPodsCore/Models/Specs/Protocols/XCConfigRepresentable.swift index 9973dbc..a66ec7b 100644 --- a/Sources/BazelPodsCore/Models/Specs/Protocols/XCConfigRepresentable.swift +++ b/Sources/BazelPodsCore/Models/Specs/Protocols/XCConfigRepresentable.swift @@ -13,6 +13,12 @@ protocol XCConfigRepresentable: BaseRepresentable { var xcconfig: [String: String] { get } } +extension XCConfigRepresentable { + var moduleName: String? { + return podTargetXcconfig["SWIFT_MODULE_NAME"] + } +} + private enum Keys: String { case pod_target_xcconfig case user_target_xcconfig diff --git a/Sources/BazelPodsCore/Targets/TestSpecs/iOSUITest.swift b/Sources/BazelPodsCore/Targets/TestSpecs/iOSUITest.swift index 46b49b1..0ed0de3 100644 --- a/Sources/BazelPodsCore/Targets/TestSpecs/iOSUITest.swift +++ b/Sources/BazelPodsCore/Targets/TestSpecs/iOSUITest.swift @@ -43,6 +43,7 @@ struct iOSUITest: BazelTarget { let lines: [StarlarkFunctionArgument] = [ .named(name: "name", value: name.toStarlark()), + .named(name: "bundle_name", value: info.moduleName.toStarlark()), .named(name: "module_name", value: info.moduleName.toStarlark()), .named(name: "minimum_os_version", value: info.minimumOsVersion.toStarlark()), .named(name: "test_host", value: test_host.toStarlark()), diff --git a/Sources/BazelPodsCore/Targets/TestSpecs/iOSUnitTest.swift b/Sources/BazelPodsCore/Targets/TestSpecs/iOSUnitTest.swift index 1517106..7196e7e 100644 --- a/Sources/BazelPodsCore/Targets/TestSpecs/iOSUnitTest.swift +++ b/Sources/BazelPodsCore/Targets/TestSpecs/iOSUnitTest.swift @@ -43,6 +43,7 @@ struct iOSUnitTest: BazelTarget { let lines: [StarlarkFunctionArgument] = [ .named(name: "name", value: name.toStarlark()), + .named(name: "bundle_name", value: info.moduleName.toStarlark()), .named(name: "module_name", value: info.moduleName.toStarlark()), .named(name: "minimum_os_version", value: info.minimumOsVersion.toStarlark()), .named(name: "test_host", value: test_host.toStarlark()), diff --git a/Tests/Recorded/CoreStore/BUILD.bazel b/Tests/Recorded/CoreStore/BUILD.bazel index e6adba6..0065e72 100644 --- a/Tests/Recorded/CoreStore/BUILD.bazel +++ b/Tests/Recorded/CoreStore/BUILD.bazel @@ -129,7 +129,8 @@ EOF""" ) ios_unit_test( name = "CoreStore_CoreStoreTests_Tests", - module_name = "CoreStoreTests", + bundle_name = "CoreStore_Unit_CoreStoreTests", + module_name = "CoreStore_Unit_CoreStoreTests", minimum_os_version = "13.0", infoplists = [ ":CoreStore_CoreStoreTests_Tests_InfoPlist" @@ -158,18 +159,18 @@ ios_unit_test( ), deps = [ ":CoreStore", - ":CoreStoreTests_CoreStoreTests_Bundle" + ":CoreStore_Unit_CoreStoreTests_CoreStoreTests_Bundle" ], visibility = [ "//visibility:public" ] ) precompiled_apple_resource_bundle( - name = "CoreStoreTests_CoreStoreTests_Bundle", + name = "CoreStore_Unit_CoreStoreTests_CoreStoreTests_Bundle", bundle_id = "org.cocoapods.CoreStoreTests", bundle_name = "CoreStoreTests", infoplists = [ - ":CoreStoreTests_CoreStoreTests_Bundle_InfoPlist" + ":CoreStore_Unit_CoreStoreTests_CoreStoreTests_Bundle_InfoPlist" ], resources = glob( [ @@ -178,10 +179,10 @@ precompiled_apple_resource_bundle( ) ) genrule( - name = "CoreStoreTests_CoreStoreTests_Bundle_InfoPlist", + name = "CoreStore_Unit_CoreStoreTests_CoreStoreTests_Bundle_InfoPlist", srcs = [], outs = [ - "CoreStoreTests_CoreStoreTests_Bundle_InfoPlist.plist" + "CoreStore_Unit_CoreStoreTests_CoreStoreTests_Bundle_InfoPlist.plist" ], cmd = """cat < $@ diff --git a/Tests/Recorded/CwlCatchException/BUILD.bazel b/Tests/Recorded/CwlCatchException/BUILD.bazel index 6fc0cda..ce45b07 100644 --- a/Tests/Recorded/CwlCatchException/BUILD.bazel +++ b/Tests/Recorded/CwlCatchException/BUILD.bazel @@ -101,7 +101,8 @@ EOF""" ) ios_unit_test( name = "CwlCatchException_Tests_Tests", - module_name = "Tests", + bundle_name = "CwlCatchException_Unit_Tests", + module_name = "CwlCatchException_Unit_Tests", minimum_os_version = "10.0", infoplists = [ ":CwlCatchException_Tests_Tests_InfoPlist" diff --git a/Tests/Recorded/CwlPreconditionTesting/BUILD.bazel b/Tests/Recorded/CwlPreconditionTesting/BUILD.bazel index 9de9bbb..da95eca 100644 --- a/Tests/Recorded/CwlPreconditionTesting/BUILD.bazel +++ b/Tests/Recorded/CwlPreconditionTesting/BUILD.bazel @@ -103,7 +103,8 @@ EOF""" ) ios_unit_test( name = "CwlPreconditionTesting_Tests_Tests", - module_name = "Tests", + bundle_name = "CwlPreconditionTesting_Unit_Tests", + module_name = "CwlPreconditionTesting_Unit_Tests", minimum_os_version = "10.0", infoplists = [ ":CwlPreconditionTesting_Tests_Tests_InfoPlist" diff --git a/Tests/Recorded/FirebaseABTesting/BUILD.bazel b/Tests/Recorded/FirebaseABTesting/BUILD.bazel index efd1f27..58bdacc 100644 --- a/Tests/Recorded/FirebaseABTesting/BUILD.bazel +++ b/Tests/Recorded/FirebaseABTesting/BUILD.bazel @@ -117,7 +117,8 @@ EOF""" ) ios_unit_test( name = "FirebaseABTesting_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseABTesting_Unit_unit", + module_name = "FirebaseABTesting_Unit_unit", minimum_os_version = "11.0", test_host = ":FirebaseABTesting_unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseAuth/BUILD.bazel b/Tests/Recorded/FirebaseAuth/BUILD.bazel index 5971537..bc7d9ec 100644 --- a/Tests/Recorded/FirebaseAuth/BUILD.bazel +++ b/Tests/Recorded/FirebaseAuth/BUILD.bazel @@ -127,7 +127,8 @@ EOF""" ) ios_unit_test( name = "FirebaseAuth_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseAuth_Unit_unit", + module_name = "FirebaseAuth_Unit_unit", minimum_os_version = "11.0", test_host = ":FirebaseAuth_unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseCore/BUILD.bazel b/Tests/Recorded/FirebaseCore/BUILD.bazel index 5aa81c1..7bb1dd8 100644 --- a/Tests/Recorded/FirebaseCore/BUILD.bazel +++ b/Tests/Recorded/FirebaseCore/BUILD.bazel @@ -129,7 +129,8 @@ EOF""" ) ios_unit_test( name = "FirebaseCore_swift-unit_Tests", - module_name = "swift_unit", + bundle_name = "FirebaseCore_Unit_swift-unit", + module_name = "FirebaseCore_Unit_swift-unit", minimum_os_version = "10.0", test_host = ":FirebaseCore_swift-unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseCoreInternal/BUILD.bazel b/Tests/Recorded/FirebaseCoreInternal/BUILD.bazel index a830b91..ec4c043 100644 --- a/Tests/Recorded/FirebaseCoreInternal/BUILD.bazel +++ b/Tests/Recorded/FirebaseCoreInternal/BUILD.bazel @@ -102,7 +102,8 @@ EOF""" ) ios_unit_test( name = "FirebaseCoreInternal_Unit_Tests", - module_name = "Unit", + bundle_name = "FirebaseCoreInternal_Unit_Unit", + module_name = "FirebaseCoreInternal_Unit_Unit", minimum_os_version = "10.0", test_host = ":FirebaseCoreInternal_Unit_AppHost", infoplists = [ @@ -291,7 +292,8 @@ ios_application_native( ) ios_unit_test( name = "FirebaseCoreInternal_Integration_Tests", - module_name = "Integration", + bundle_name = "FirebaseCoreInternal_Unit_Integration", + module_name = "FirebaseCoreInternal_Unit_Integration", minimum_os_version = "10.0", test_host = ":FirebaseCoreInternal_Integration_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseCrashlytics/BUILD.bazel b/Tests/Recorded/FirebaseCrashlytics/BUILD.bazel index c9605c9..662901d 100644 --- a/Tests/Recorded/FirebaseCrashlytics/BUILD.bazel +++ b/Tests/Recorded/FirebaseCrashlytics/BUILD.bazel @@ -155,7 +155,8 @@ EOF""" ) ios_unit_test( name = "FirebaseCrashlytics_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseCrashlytics_Unit_unit", + module_name = "FirebaseCrashlytics_Unit_unit", minimum_os_version = "11.0", test_host = ":FirebaseCrashlytics_unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseDatabase/BUILD.bazel b/Tests/Recorded/FirebaseDatabase/BUILD.bazel index c23d229..51dc08b 100644 --- a/Tests/Recorded/FirebaseDatabase/BUILD.bazel +++ b/Tests/Recorded/FirebaseDatabase/BUILD.bazel @@ -134,7 +134,8 @@ EOF""" ) ios_unit_test( name = "FirebaseDatabase_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseDatabase_Unit_unit", + module_name = "FirebaseDatabase_Unit_unit", minimum_os_version = "11.0", infoplists = [ ":FirebaseDatabase_unit_Tests_InfoPlist" @@ -208,7 +209,8 @@ EOF""" ) ios_unit_test( name = "FirebaseDatabase_integration_Tests", - module_name = "integration", + bundle_name = "FirebaseDatabase_Unit_integration", + module_name = "FirebaseDatabase_Unit_integration", minimum_os_version = "11.0", test_host = ":FirebaseDatabase_integration_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseFunctions/BUILD.bazel b/Tests/Recorded/FirebaseFunctions/BUILD.bazel index 73a9fcd..ab6b28c 100644 --- a/Tests/Recorded/FirebaseFunctions/BUILD.bazel +++ b/Tests/Recorded/FirebaseFunctions/BUILD.bazel @@ -108,7 +108,8 @@ EOF""" ) ios_unit_test( name = "FirebaseFunctions_objc_Tests", - module_name = "objc", + bundle_name = "FirebaseFunctions_Unit_objc", + module_name = "FirebaseFunctions_Unit_objc", minimum_os_version = "11.0", test_host = ":FirebaseFunctions_objc_AppHost", infoplists = [ @@ -307,7 +308,8 @@ ios_application_native( ) ios_unit_test( name = "FirebaseFunctions_integration_Tests", - module_name = "integration", + bundle_name = "FirebaseFunctions_Unit_integration", + module_name = "FirebaseFunctions_Unit_integration", minimum_os_version = "11.0", test_host = ":FirebaseFunctions_integration_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseInstallations/BUILD.bazel b/Tests/Recorded/FirebaseInstallations/BUILD.bazel index 50526c7..57088e6 100644 --- a/Tests/Recorded/FirebaseInstallations/BUILD.bazel +++ b/Tests/Recorded/FirebaseInstallations/BUILD.bazel @@ -124,7 +124,8 @@ EOF""" ) ios_unit_test( name = "FirebaseInstallations_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseInstallations_Unit_unit", + module_name = "FirebaseInstallations_Unit_unit", minimum_os_version = "10.0", test_host = ":FirebaseInstallations_unit_AppHost", infoplists = [ @@ -333,7 +334,8 @@ ios_application_native( ) ios_unit_test( name = "FirebaseInstallations_integration_Tests", - module_name = "integration", + bundle_name = "FirebaseInstallations_Unit_integration", + module_name = "FirebaseInstallations_Unit_integration", minimum_os_version = "10.0", test_host = ":FirebaseInstallations_integration_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebasePerformance/BUILD.bazel b/Tests/Recorded/FirebasePerformance/BUILD.bazel index 43b6bfb..2079558 100644 --- a/Tests/Recorded/FirebasePerformance/BUILD.bazel +++ b/Tests/Recorded/FirebasePerformance/BUILD.bazel @@ -139,7 +139,8 @@ EOF""" ) ios_unit_test( name = "FirebasePerformance_unit_Tests", - module_name = "unit", + bundle_name = "FirebasePerformance_Unit_unit", + module_name = "FirebasePerformance_Unit_unit", minimum_os_version = "11.0", test_host = ":FirebasePerformance_unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel b/Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel index c14c21e..94051f4 100644 --- a/Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel +++ b/Tests/Recorded/FirebaseRemoteConfig/BUILD.bazel @@ -127,7 +127,8 @@ EOF""" ) ios_unit_test( name = "FirebaseRemoteConfig_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseRemoteConfig_Unit_unit", + module_name = "FirebaseRemoteConfig_Unit_unit", minimum_os_version = "11.0", test_host = ":FirebaseRemoteConfig_unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseSessions/BUILD.bazel b/Tests/Recorded/FirebaseSessions/BUILD.bazel index 45efbbd..7be9161 100644 --- a/Tests/Recorded/FirebaseSessions/BUILD.bazel +++ b/Tests/Recorded/FirebaseSessions/BUILD.bazel @@ -129,7 +129,8 @@ EOF""" ) ios_unit_test( name = "FirebaseSessions_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseSessions_Unit_unit", + module_name = "FirebaseSessions_Unit_unit", minimum_os_version = "11.0", test_host = ":FirebaseSessions_unit_AppHost", infoplists = [ diff --git a/Tests/Recorded/FirebaseSharedSwift/BUILD.bazel b/Tests/Recorded/FirebaseSharedSwift/BUILD.bazel index 552f8d8..39c4702 100644 --- a/Tests/Recorded/FirebaseSharedSwift/BUILD.bazel +++ b/Tests/Recorded/FirebaseSharedSwift/BUILD.bazel @@ -98,7 +98,8 @@ EOF""" ) ios_unit_test( name = "FirebaseSharedSwift_unit_Tests", - module_name = "unit", + bundle_name = "FirebaseSharedSwift_Unit_unit", + module_name = "FirebaseSharedSwift_Unit_unit", minimum_os_version = "11.0", infoplists = [ ":FirebaseSharedSwift_unit_Tests_InfoPlist" diff --git a/Tests/Recorded/FirebaseStorage/BUILD.bazel b/Tests/Recorded/FirebaseStorage/BUILD.bazel index 49e129c..5185a8f 100644 --- a/Tests/Recorded/FirebaseStorage/BUILD.bazel +++ b/Tests/Recorded/FirebaseStorage/BUILD.bazel @@ -111,7 +111,8 @@ EOF""" ) ios_unit_test( name = "FirebaseStorage_ObjCIntegration_Tests", - module_name = "ObjCIntegration", + bundle_name = "FirebaseStorage_Unit_ObjCIntegration", + module_name = "FirebaseStorage_Unit_ObjCIntegration", minimum_os_version = "11.0", test_host = ":FirebaseStorage_ObjCIntegration_AppHost", infoplists = [ diff --git a/Tests/Recorded/GTMSessionFetcher/BUILD.bazel b/Tests/Recorded/GTMSessionFetcher/BUILD.bazel index 9f5fa07..bd50838 100644 --- a/Tests/Recorded/GTMSessionFetcher/BUILD.bazel +++ b/Tests/Recorded/GTMSessionFetcher/BUILD.bazel @@ -224,7 +224,8 @@ EOF""" ) ios_unit_test( name = "GTMSessionFetcher_Tests_Tests", - module_name = "Tests", + bundle_name = "GTMSessionFetcher_Unit_Tests", + module_name = "GTMSessionFetcher_Unit_Tests", minimum_os_version = "10.0", infoplists = [ ":GTMSessionFetcher_Tests_Tests_InfoPlist" diff --git a/Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel b/Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel index 27f0eab..c764fd6 100644 --- a/Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel +++ b/Tests/Recorded/GoogleAPIClientForREST/BUILD.bazel @@ -163,7 +163,8 @@ EOF""" ) ios_unit_test( name = "GoogleAPIClientForREST_Tests_Tests", - module_name = "Tests", + bundle_name = "GoogleAPIClientForREST_Unit_Tests", + module_name = "GoogleAPIClientForREST_Unit_Tests", minimum_os_version = "10.0", infoplists = [ ":GoogleAPIClientForREST_Tests_Tests_InfoPlist" diff --git a/Tests/Recorded/GoogleDataTransport/BUILD.bazel b/Tests/Recorded/GoogleDataTransport/BUILD.bazel index 638d51d..9441d64 100644 --- a/Tests/Recorded/GoogleDataTransport/BUILD.bazel +++ b/Tests/Recorded/GoogleDataTransport/BUILD.bazel @@ -152,7 +152,8 @@ EOF""" ) ios_unit_test( name = "GoogleDataTransport_Tests-Unit_Tests", - module_name = "Tests_Unit", + bundle_name = "GoogleDataTransport_Unit_Tests-Unit", + module_name = "GoogleDataTransport_Unit_Tests-Unit", minimum_os_version = "10.0", infoplists = [ ":GoogleDataTransport_Tests-Unit_Tests_InfoPlist" diff --git a/Tests/Recorded/GoogleUtilities/BUILD.bazel b/Tests/Recorded/GoogleUtilities/BUILD.bazel index a001781..8eec44d 100644 --- a/Tests/Recorded/GoogleUtilities/BUILD.bazel +++ b/Tests/Recorded/GoogleUtilities/BUILD.bazel @@ -153,7 +153,8 @@ EOF""" ) ios_unit_test( name = "GoogleUtilities_unit_Tests", - module_name = "unit", + bundle_name = "GoogleUtilities_Unit_unit", + module_name = "GoogleUtilities_Unit_unit", minimum_os_version = "10.0", test_host = ":GoogleUtilities_unit_AppHost", infoplists = [ @@ -343,7 +344,8 @@ ios_application_native( ) ios_unit_test( name = "GoogleUtilities_unit-swift_Tests", - module_name = "unit_swift", + bundle_name = "GoogleUtilities_Unit_unit-swift", + module_name = "GoogleUtilities_Unit_unit-swift", minimum_os_version = "10.0", test_host = ":GoogleUtilities_unit-swift_AppHost", infoplists = [ diff --git a/Tests/Recorded/PromisesObjC/BUILD.bazel b/Tests/Recorded/PromisesObjC/BUILD.bazel index a224b46..3fb483d 100644 --- a/Tests/Recorded/PromisesObjC/BUILD.bazel +++ b/Tests/Recorded/PromisesObjC/BUILD.bazel @@ -111,7 +111,8 @@ EOF""" ) ios_unit_test( name = "PromisesObjC_Tests_Tests", - module_name = "Tests", + bundle_name = "PromisesObjC_Unit_Tests", + module_name = "PromisesObjC_Unit_Tests", minimum_os_version = "10.0", infoplists = [ ":PromisesObjC_Tests_Tests_InfoPlist" @@ -157,7 +158,8 @@ EOF""" ) ios_unit_test( name = "PromisesObjC_PerformanceTests_Tests", - module_name = "PerformanceTests", + bundle_name = "PromisesObjC_Unit_PerformanceTests", + module_name = "PromisesObjC_Unit_PerformanceTests", minimum_os_version = "10.0", infoplists = [ ":PromisesObjC_PerformanceTests_Tests_InfoPlist" diff --git a/Tests/Recorded/ViewInspector/BUILD.bazel b/Tests/Recorded/ViewInspector/BUILD.bazel index bddb74c..af7d33e 100644 --- a/Tests/Recorded/ViewInspector/BUILD.bazel +++ b/Tests/Recorded/ViewInspector/BUILD.bazel @@ -106,7 +106,8 @@ EOF""" ) ios_unit_test( name = "ViewInspector_Tests_Tests", - module_name = "Tests", + bundle_name = "ViewInspector_Unit_Tests", + module_name = "ViewInspector_Unit_Tests", minimum_os_version = "10.0", infoplists = [ ":ViewInspector_Tests_Tests_InfoPlist" diff --git a/Tests/Recorded/Wire/BUILD.bazel b/Tests/Recorded/Wire/BUILD.bazel index 5345682..f1fd7a0 100644 --- a/Tests/Recorded/Wire/BUILD.bazel +++ b/Tests/Recorded/Wire/BUILD.bazel @@ -98,7 +98,8 @@ EOF""" ) ios_unit_test( name = "Wire_Tests_Tests", - module_name = "Tests", + bundle_name = "Wire_Unit_Tests", + module_name = "Wire_Unit_Tests", minimum_os_version = "11.0", infoplists = [ ":Wire_Tests_Tests_InfoPlist"