diff --git a/Datadog/Datadog.xcodeproj/project.pbxproj b/Datadog/Datadog.xcodeproj/project.pbxproj index 43f34b955f..bf490d330b 100644 --- a/Datadog/Datadog.xcodeproj/project.pbxproj +++ b/Datadog/Datadog.xcodeproj/project.pbxproj @@ -325,6 +325,11 @@ 61B3BD52266128D300A9BEF0 /* LoggerE2ETests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B3BD51266128D300A9BEF0 /* LoggerE2ETests.swift */; }; 61B558CF2469561C001460D3 /* LoggerBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B558CE2469561C001460D3 /* LoggerBuilderTests.swift */; }; 61B558D42469CDD8001460D3 /* TracingUUIDGeneratorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B558D32469CDD8001460D3 /* TracingUUIDGeneratorTests.swift */; }; + 61B5E42126DF85C7000B0A5F /* DDRUMMonitor+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5E42026DF85C7000B0A5F /* DDRUMMonitor+apiTests.m */; }; + 61B5E42526DFAFBC000B0A5F /* DDGlobal+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5E42426DFAFBC000B0A5F /* DDGlobal+apiTests.m */; }; + 61B5E42726DFB145000B0A5F /* DDDatadog+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5E42626DFB145000B0A5F /* DDDatadog+apiTests.m */; }; + 61B5E42926DFB60A000B0A5F /* DDConfiguration+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5E42826DFB60A000B0A5F /* DDConfiguration+apiTests.m */; }; + 61B5E42B26DFC433000B0A5F /* DDNSURLSessionDelegate+apiTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5E42A26DFC433000B0A5F /* DDNSURLSessionDelegate+apiTests.m */; }; 61B6811F25F0EA860015B4AF /* CrashReportingWithLoggingScenarioTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B6811E25F0EA860015B4AF /* CrashReportingWithLoggingScenarioTests.swift */; }; 61B6815E25F135890015B4AF /* CrashReportingWithRUMScenarioTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B6815D25F135890015B4AF /* CrashReportingWithRUMScenarioTests.swift */; }; 61B7885D25C180CB002675B5 /* DatadogCrashReporting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B7885425C180CB002675B5 /* DatadogCrashReporting.framework */; }; @@ -948,6 +953,11 @@ 61B3BD51266128D300A9BEF0 /* LoggerE2ETests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggerE2ETests.swift; sourceTree = ""; }; 61B558CE2469561C001460D3 /* LoggerBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggerBuilderTests.swift; sourceTree = ""; }; 61B558D32469CDD8001460D3 /* TracingUUIDGeneratorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TracingUUIDGeneratorTests.swift; sourceTree = ""; }; + 61B5E42026DF85C7000B0A5F /* DDRUMMonitor+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDRUMMonitor+apiTests.m"; sourceTree = ""; }; + 61B5E42426DFAFBC000B0A5F /* DDGlobal+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDGlobal+apiTests.m"; sourceTree = ""; }; + 61B5E42626DFB145000B0A5F /* DDDatadog+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDDatadog+apiTests.m"; sourceTree = ""; }; + 61B5E42826DFB60A000B0A5F /* DDConfiguration+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDConfiguration+apiTests.m"; sourceTree = ""; }; + 61B5E42A26DFC433000B0A5F /* DDNSURLSessionDelegate+apiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "DDNSURLSessionDelegate+apiTests.m"; sourceTree = ""; }; 61B6811E25F0EA860015B4AF /* CrashReportingWithLoggingScenarioTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportingWithLoggingScenarioTests.swift; sourceTree = ""; }; 61B6815D25F135890015B4AF /* CrashReportingWithRUMScenarioTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashReportingWithRUMScenarioTests.swift; sourceTree = ""; }; 61B7885425C180CB002675B5 /* DatadogCrashReporting.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = DatadogCrashReporting.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1550,6 +1560,7 @@ 61133C132423990D00786299 /* DatadogObjc */ = { isa = PBXGroup; children = ( + 61B5E41F26DF857E000B0A5F /* ObjcAPITests */, 61133C142423990D00786299 /* DDDatadogTests.swift */, 61133C162423990D00786299 /* DDConfigurationTests.swift */, 616B6683259CAE3300968EE8 /* DDGlobalTests.swift */, @@ -2605,6 +2616,18 @@ path = Logging; sourceTree = ""; }; + 61B5E41F26DF857E000B0A5F /* ObjcAPITests */ = { + isa = PBXGroup; + children = ( + 61B5E42626DFB145000B0A5F /* DDDatadog+apiTests.m */, + 61B5E42826DFB60A000B0A5F /* DDConfiguration+apiTests.m */, + 61B5E42026DF85C7000B0A5F /* DDRUMMonitor+apiTests.m */, + 61B5E42A26DFC433000B0A5F /* DDNSURLSessionDelegate+apiTests.m */, + 61B5E42426DFAFBC000B0A5F /* DDGlobal+apiTests.m */, + ); + path = ObjcAPITests; + sourceTree = ""; + }; 61B6811D25F0E8480015B4AF /* CrashReporting */ = { isa = PBXGroup; children = ( @@ -3890,6 +3913,7 @@ 61133C672423990D00786299 /* LogConsoleOutputTests.swift in Sources */, 6114FDEC257659E90084E372 /* FeatureDirectoriesMock.swift in Sources */, 61122EE825B1C92500F9C7F5 /* SpanSanitizerTests.swift in Sources */, + 61B5E42526DFAFBC000B0A5F /* DDGlobal+apiTests.m in Sources */, 61FB222D244A21ED00902D19 /* LoggingFeatureMocks.swift in Sources */, 617B954224BF4E7600E6F443 /* RUMMonitorConfigurationTests.swift in Sources */, 614BF37E2670AE9D002379C8 /* AttributesMocks.swift in Sources */, @@ -3978,12 +4002,14 @@ 614B0A5124EBDC8000A2A780 /* RUMConnectivityInfoProviderTests.swift in Sources */, 611F82032563C66100CB9BDB /* UIKitRUMViewsPredicateTests.swift in Sources */, 61133C652423990D00786299 /* LogBuilderTests.swift in Sources */, + 61B5E42B26DFC433000B0A5F /* DDNSURLSessionDelegate+apiTests.m in Sources */, 61F8CC092469295500FE2908 /* DatadogConfigurationBuilderTests.swift in Sources */, 61F1A623249B811200075390 /* Encoding.swift in Sources */, 6114FE3B25768AA90084E372 /* ConsentProviderTests.swift in Sources */, 61133C642423990D00786299 /* LoggerTests.swift in Sources */, 617B953D24BF4D8F00E6F443 /* RUMMonitorTests.swift in Sources */, 61F187FC25FA7DD60022CE9A /* InternalMonitoringFeatureTests.swift in Sources */, + 61B5E42126DF85C7000B0A5F /* DDRUMMonitor+apiTests.m in Sources */, 61786F7724FCDE05009E6BAB /* RUMDebuggingTests.swift in Sources */, 61F9CA712512450B000A5E61 /* RUMAutoInstrumentationTests.swift in Sources */, 6156CB9324DDAA34008CB2B2 /* RUMCurrentContextTests.swift in Sources */, @@ -4004,9 +4030,11 @@ 61F2724925C943C500D54BF8 /* CrashReporterTests.swift in Sources */, 6172472725D673D7007085B3 /* CrashContextTests.swift in Sources */, 61BAD46A26415FCE001886CA /* OTSpanTests.swift in Sources */, + 61B5E42726DFB145000B0A5F /* DDDatadog+apiTests.m in Sources */, 6121627C247D220500AC5D67 /* LoggingForTracingAdapterTests.swift in Sources */, 61133C532423990D00786299 /* MobileDeviceTests.swift in Sources */, 61FF282124B8981D000B3D9B /* RUMEventBuilderTests.swift in Sources */, + 61B5E42926DFB60A000B0A5F /* DDConfiguration+apiTests.m in Sources */, 61345613244756E300E7DA6B /* PerformancePresetTests.swift in Sources */, 616A9CD22535D38200DB83CF /* UIKitHierarchyInspectorTests.swift in Sources */, ); diff --git a/DatadogSDKCrashReporting.podspec b/DatadogSDKCrashReporting.podspec index a5edf1ef4e..f8b919a66e 100644 --- a/DatadogSDKCrashReporting.podspec +++ b/DatadogSDKCrashReporting.podspec @@ -17,6 +17,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '11.0' s.source = { :git => 'https://github.com/DataDog/dd-sdk-ios.git', :tag => s.version.to_s } + s.static_framework = true s.source_files = "Sources/DatadogCrashReporting/**/*.swift" s.dependency 'DatadogSDK', '1.7.0-beta4' diff --git a/DatadogSDKCrashReporting.podspec.src b/DatadogSDKCrashReporting.podspec.src index cd9fde6dab..7fcd894895 100644 --- a/DatadogSDKCrashReporting.podspec.src +++ b/DatadogSDKCrashReporting.podspec.src @@ -17,6 +17,7 @@ Pod::Spec.new do |s| s.ios.deployment_target = '11.0' s.source = { :git => 'https://github.com/DataDog/dd-sdk-ios.git', :tag => s.version.to_s } + s.static_framework = true s.source_files = "Sources/DatadogCrashReporting/**/*.swift" s.dependency 'DatadogSDK', '__DATADOG_VERSION__' diff --git a/Sources/DatadogObjc/Datadog+objc.swift b/Sources/DatadogObjc/Datadog+objc.swift index 6f9681c019..d8c7883460 100644 --- a/Sources/DatadogObjc/Datadog+objc.swift +++ b/Sources/DatadogObjc/Datadog+objc.swift @@ -110,4 +110,11 @@ public class DDDatadog: NSObject { public static func setTrackingConsent(consent: DDTrackingConsent) { Datadog.set(trackingConsent: consent.sdkConsent) } + +#if DD_SDK_COMPILED_FOR_TESTING + @objc + public static func flushAndDeinitialize() { + Datadog.flushAndDeinitialize() + } +#endif } diff --git a/Sources/DatadogObjc/RUMMonitor+objc.swift b/Sources/DatadogObjc/RUMMonitor+objc.swift index bbe0ccbb21..8324c0c31a 100644 --- a/Sources/DatadogObjc/RUMMonitor+objc.swift +++ b/Sources/DatadogObjc/RUMMonitor+objc.swift @@ -36,6 +36,7 @@ public class DDRUMView: NSObject { /// - Parameters: /// - name: the RUM View name, appearing as `VIEW NAME` in RUM Explorer. /// - attributes: additional attributes to associate with the RUM View. + @objc public init(name: String, attributes: [String: Any]) { swiftView = RUMView( name: name, @@ -71,6 +72,7 @@ public class DDRUMAction: NSObject { /// - Parameters: /// - name: the RUM Action name, appearing as `ACTION NAME` in RUM Explorer. /// - attributes: additional attributes to associate with the RUM Action. + @objc public init(name: String, attributes: [String: Any]) { swiftAction = RUMAction( name: name, diff --git a/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDConfiguration+apiTests.m b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDConfiguration+apiTests.m new file mode 100644 index 0000000000..5b0d63dd20 --- /dev/null +++ b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDConfiguration+apiTests.m @@ -0,0 +1,111 @@ +/* +* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. +* This product includes software developed at Datadog (https://www.datadoghq.com/). +* Copyright 2019-2020 Datadog, Inc. +*/ + +#import +@import DatadogObjc; +@import DatadogCrashReporting; + +// MARK: - DDUIKitRUMViewsPredicate + +@interface CustomDDUIKitRUMViewsPredicate: NSObject +@end + +@interface CustomDDUIKitRUMViewsPredicate () +@end + +@implementation CustomDDUIKitRUMViewsPredicate +- (DDRUMView * _Nullable)rumViewFor:(UIViewController * _Nonnull)viewController { return nil; } +@end + +// MARK: - DDUIKitRUMViewsPredicate + +@interface CustomDDUIKitRUMUserActionsPredicate: NSObject +@end + +@interface CustomDDUIKitRUMUserActionsPredicate () +@end + +@implementation CustomDDUIKitRUMUserActionsPredicate +- (DDRUMAction * _Nullable)rumActionWithTargetView:(UIView * _Nonnull)targetView { return nil; } +@end + +// MARK: - Tests + +@interface DDConfiguration_apiTests : XCTestCase +@end + +/* + * `DatadogObjc` APIs smoke tests - only check if the interface is available to Objc. + */ +@implementation DDConfiguration_apiTests + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-value" + +- (void)testDDEndpointAPI { + [DDEndpoint eu]; + [DDEndpoint eu1]; + [DDEndpoint gov]; + [DDEndpoint us]; + [DDEndpoint us1]; + [DDEndpoint us1]; + [DDEndpoint us1_fed]; + [DDEndpoint us3]; +} + +- (void)testDDBatchSizeAPI { + DDBatchSizeSmall; DDBatchSizeMedium; DDBatchSizeLarge; +} + +- (void)testDDUploadFrequencyAPI { + DDUploadFrequencyRare; DDUploadFrequencyAverage; DDUploadFrequencyFrequent; +} + +- (void)testDDConfigurationAPI { + [DDConfiguration builderWithClientToken:@"" environment:@""]; + [DDConfiguration builderWithRumApplicationID:@"" clientToken:@"" environment:@""]; +} + +- (void)testDDConfigurationBuilderAPI { + DDConfigurationBuilder *builder = [DDConfiguration builderWithClientToken:@"" environment:@""]; + [builder enableLogging:YES]; + [builder enableTracing:YES]; + [builder enableRUM:YES]; + [builder enableCrashReportingUsing:[DDCrashReportingPlugin new]]; + [builder setWithEndpoint:[DDEndpoint us]]; + [builder setWithCustomLogsEndpoint:[NSURL new]]; + [builder setWithCustomTracesEndpoint:[NSURL new]]; + [builder setWithCustomRUMEndpoint:[NSURL new]]; + [builder trackURLSessionWithFirstPartyHosts:[NSSet setWithArray:@[]]]; + [builder setWithServiceName:@""]; + [builder setWithRumSessionsSamplingRate:50]; + [builder trackUIKitRUMViews]; + [builder trackUIKitRUMViewsUsing:[CustomDDUIKitRUMViewsPredicate new]]; + [builder trackUIKitRUMActions]; + [builder trackUIKitRUMActionsUsing:[CustomDDUIKitRUMUserActionsPredicate new]]; + [builder setRUMViewEventMapper:^DDRUMViewEvent * _Nonnull(DDRUMViewEvent * _Nonnull viewEvent) { + viewEvent.view.url = @""; + return viewEvent; + }]; + [builder setRUMResourceEventMapper:^DDRUMResourceEvent * _Nullable(DDRUMResourceEvent * _Nonnull resourceEvent) { + resourceEvent.resource.url = @""; + return resourceEvent; + }]; + [builder setRUMActionEventMapper:^DDRUMActionEvent * _Nullable(DDRUMActionEvent * _Nonnull actionEvent) { + return nil; + }]; + [builder setRUMErrorEventMapper:^DDRUMErrorEvent * _Nullable(DDRUMErrorEvent * _Nonnull errorEvent) { + return nil; + }]; + [builder setWithBatchSize:DDBatchSizeMedium]; + [builder setWithUploadFrequency:DDUploadFrequencyAverage]; + [builder setWithAdditionalConfiguration:@{}]; + [builder build]; +} + +#pragma clang diagnostic pop + +@end diff --git a/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDDatadog+apiTests.m b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDDatadog+apiTests.m new file mode 100644 index 0000000000..008a55bb17 --- /dev/null +++ b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDDatadog+apiTests.m @@ -0,0 +1,50 @@ +/* +* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. +* This product includes software developed at Datadog (https://www.datadoghq.com/). +* Copyright 2019-2020 Datadog, Inc. +*/ + +#import +@import DatadogObjc; + +@interface DDDatadog_apiTests : XCTestCase +@end + +/* + * `DatadogObjc` APIs smoke tests - only check if the interface is available to Objc. + */ +@implementation DDDatadog_apiTests + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-value" + +- (void)testDDTrackingConsentAPI { + [DDTrackingConsent granted]; + [DDTrackingConsent notGranted]; + [DDTrackingConsent pending]; +} + +- (void)testDDAppContextAPI { + [[DDAppContext alloc] initWithMainBundle:[NSBundle mainBundle]]; + [[DDAppContext alloc] init]; +} + +- (void)testDDDatadog { + DDConfiguration *configuration = [[DDConfiguration builderWithClientToken:@"abc" environment:@"def"] build]; + + [DDDatadog initializeWithAppContext:[[DDAppContext alloc] init] + trackingConsent:[DDTrackingConsent notGranted] + configuration:configuration]; + + DDSDKVerbosityLevel verbosity = [DDDatadog verbosityLevel]; + [DDDatadog setVerbosityLevel:verbosity]; + + [DDDatadog setUserInfoWithId:@"" name:@"" email:@"" extraInfo:@{}]; + [DDDatadog setTrackingConsentWithConsent:[DDTrackingConsent notGranted]]; + + [DDDatadog flushAndDeinitialize]; +} + +#pragma clang diagnostic pop + +@end diff --git a/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDGlobal+apiTests.m b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDGlobal+apiTests.m new file mode 100644 index 0000000000..de515494f1 --- /dev/null +++ b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDGlobal+apiTests.m @@ -0,0 +1,28 @@ +/* +* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. +* This product includes software developed at Datadog (https://www.datadoghq.com/). +* Copyright 2019-2020 Datadog, Inc. +*/ + +#import +@import DatadogObjc; + +@interface DDGlobal_apiTests : XCTestCase +@end + +/* + * `DatadogObjc` APIs smoke tests - only check if the interface is available to Objc. + */ +@implementation DDGlobal_apiTests + +- (void)testSharedTracerAPI { + id tracer = DDGlobal.sharedTracer; + DDGlobal.sharedTracer = tracer; +} + +- (void)testRUMAPI { + id rum = DDGlobal.rum; + DDGlobal.rum = rum; +} + +@end diff --git a/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDNSURLSessionDelegate+apiTests.m b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDNSURLSessionDelegate+apiTests.m new file mode 100644 index 0000000000..17ea657127 --- /dev/null +++ b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDNSURLSessionDelegate+apiTests.m @@ -0,0 +1,28 @@ +/* +* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. +* This product includes software developed at Datadog (https://www.datadoghq.com/). +* Copyright 2019-2020 Datadog, Inc. +*/ + +#import +@import DatadogObjc; + +@interface DDNSURLSessionDelegate_apiTests : XCTestCase +@end + +/* + * `DatadogObjc` APIs smoke tests - only check if the interface is available to Objc. + */ +@implementation DDNSURLSessionDelegate_apiTests + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-value" + +- (void)testDDNSURLSessionDelegateAPI { + [[DDNSURLSessionDelegate alloc] init]; + [[DDNSURLSessionDelegate alloc] initWithAdditionalFirstPartyHosts:[NSSet setWithArray:@[]]]; +} + +#pragma clang diagnostic pop + +@end diff --git a/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDRUMMonitor+apiTests.m b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDRUMMonitor+apiTests.m new file mode 100644 index 0000000000..20e297d6c8 --- /dev/null +++ b/Tests/DatadogTests/DatadogObjc/ObjcAPITests/DDRUMMonitor+apiTests.m @@ -0,0 +1,76 @@ +/* +* Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0. +* This product includes software developed at Datadog (https://www.datadoghq.com/). +* Copyright 2019-2020 Datadog, Inc. +*/ + +#import +@import DatadogObjc; + +@interface DDRUMMonitor_apiTests : XCTestCase +@end + +/* + * `DatadogObjc` APIs smoke tests - only check if the interface is available to Objc. + */ +@implementation DDRUMMonitor_apiTests + +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-value" + +- (void)testDDRUMViewAPI { + DDRUMView *view = [[DDRUMView alloc] initWithName:@"abc" attributes:@{@"foo": @"bar"}]; + XCTAssertEqual(view.name, @"abc"); + XCTAssertNotNil(view.attributes[@"foo"]); // TODO: RUMM-1583 assert with `XCTAssertEqual` +} + +- (void)testDDRUMActionAPI { + DDRUMAction *action = [[DDRUMAction alloc] initWithName:@"abc" attributes:@{@"foo": @"bar"}]; + XCTAssertEqual(action.name, @"abc"); + XCTAssertNotNil(action.attributes[@"foo"]); // TODO: RUMM-1583 assert with `XCTAssertEqual` +} + +- (void)testDDRUMErrorSourceAPI { + DDRUMErrorSourceSource; DDRUMErrorSourceNetwork; DDRUMErrorSourceWebview; DDRUMErrorSourceConsole; DDRUMErrorSourceCustom; +} + +- (void)testDDRUMUserActionTypeAPI { + DDRUMUserActionTypeTap; DDRUMUserActionTypeScroll; DDRUMUserActionTypeSwipe; DDRUMUserActionTypeCustom; +} + +- (void)testDDRUMResourceTypeAPI { + DDRUMResourceTypeImage; DDRUMResourceTypeXhr; DDRUMResourceTypeBeacon; DDRUMResourceTypeCss; DDRUMResourceTypeDocument; + DDRUMResourceTypeFetch; DDRUMResourceTypeFont; DDRUMResourceTypeJs; DDRUMResourceTypeMedia; DDRUMResourceTypeOther; +} + +- (void)testDDRUMMethodAPI { + DDRUMMethodPost; DDRUMMethodGet; DDRUMMethodHead; DDRUMMethodPut; DDRUMMethodDelete; DDRUMMethodPatch; +} + +- (void)testDDRUMMonitorAPI { + UIViewController *anyVC = [UIViewController new]; + + DDRUMMonitor *monitor = [DDRUMMonitor new]; + [monitor startViewWithViewController:anyVC name:@"" attributes:@{}]; + [monitor stopViewWithViewController:anyVC attributes:@{}]; + [monitor startViewWithKey:@"" name:nil attributes:@{}]; + [monitor stopViewWithKey:@"" attributes:@{}]; + [monitor addErrorWithMessage:@"" source:DDRUMErrorSourceCustom stack:nil attributes:@{}]; + [monitor addErrorWithError:[NSError new] source:DDRUMErrorSourceNetwork attributes:@{}]; + [monitor startResourceLoadingWithResourceKey:@"" request:[NSURLRequest new] attributes:@{}]; + [monitor startResourceLoadingWithResourceKey:@"" url:[NSURL new] attributes:@{}]; + [monitor startResourceLoadingWithResourceKey:@"" httpMethod:DDRUMMethodGet urlString:@"" attributes:@{}]; + [monitor addResourceMetricsWithResourceKey:@"" metrics:[NSURLSessionTaskMetrics new] attributes:@{}]; + [monitor stopResourceLoadingWithResourceKey:@"" response:[NSURLResponse new] size:nil attributes:@{}]; + [monitor stopResourceLoadingWithResourceKey:@"" statusCode:nil kind:DDRUMResourceTypeOther size:nil attributes:@{}]; + [monitor stopResourceLoadingWithErrorWithResourceKey:@"" error:[NSError new] response:nil attributes:@{}]; + [monitor stopResourceLoadingWithErrorWithResourceKey:@"" errorMessage:@"" response:nil attributes:@{}]; + [monitor startUserActionWithType:DDRUMUserActionTypeSwipe name:@"" attributes:@{}]; + [monitor stopUserActionWithType:DDRUMUserActionTypeSwipe name:nil attributes:@{}]; + [monitor addUserActionWithType:DDRUMUserActionTypeTap name:@"" attributes:@{}]; + [monitor addAttributeForKey:@"" value:@""]; +} + +#pragma clang diagnostic pop + +@end diff --git a/bitrise.yml b/bitrise.yml index da95cb8bb9..7fd3eabd0d 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -214,7 +214,7 @@ workflows: set -e make test-spm ci=${CI} - xcodebuild: - title: Build SPMProject for tests - Catalyst + title: Check Mac Catalyst compatibility (build SPMProject for Catalyst) inputs: - scheme: SPMProject - destination: platform=macOS,variant=Mac Catalyst @@ -230,7 +230,6 @@ workflows: - project_path: "$BITRISE_SOURCE_DIR/dependency-manager-tests/spm/SPMProject.xcodeproj" - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/SPMProject-tests.html" - script: - # Carthage doesn't support Catalyst, so we don't test CTProject for `variant=Mac Catalyst` title: Test Carthage compatibility inputs: - content: |- @@ -253,22 +252,24 @@ workflows: #!/usr/bin/env bash set -e make test-cocoapods ci=${CI} - - xcodebuild: - title: Build CPProject for tests - Catalyst + - xcode-test: + title: Run CPProject tests with 'use_frameworks!' inputs: - - scheme: CPProject - - destination: platform=macOS,variant=Mac Catalyst - - project_path: "$BITRISE_SOURCE_DIR/dependency-manager-tests/cocoapods/CPProject.xcodeproj" - - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/CPProject-catalyst-sanity-check.html" + - scheme: CPProjectUseFrameworks + - simulator_device: iPhone 11 + - is_clean_build: 'yes' + - cache_level: none + - project_path: "$BITRISE_SOURCE_DIR/dependency-manager-tests/cocoapods/CPProject.xcworkspace" + - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/CPProject-use_frameworks-tests.html" - xcode-test: - title: Run CPProject tests + title: Run CPProject tests with no 'use_frameworks!' inputs: - - scheme: CPProject + - scheme: CPProjectNoUseFrameworks - simulator_device: iPhone 11 - is_clean_build: 'yes' - cache_level: none - project_path: "$BITRISE_SOURCE_DIR/dependency-manager-tests/cocoapods/CPProject.xcworkspace" - - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/CPProject-tests.html" + - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/CPProject-no_use_frameworks-tests.html" create_dogfooding_pr: description: |- diff --git a/dependency-manager-tests/.gitignore b/dependency-manager-tests/.gitignore index ffc5a47759..d068bfb2cf 100644 --- a/dependency-manager-tests/.gitignore +++ b/dependency-manager-tests/.gitignore @@ -15,6 +15,6 @@ xcuserdata # Cocoapods test # - ignore `Podfile.lock` and `Podfile` as they will be re-created for every test run -/cocoapods/Pods -/cocoapods/Podfile.lock -/cocoapods/Podfile +/cocoapods/**/Pods +/cocoapods/**/Podfile.lock +/cocoapods/**/Podfile diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj index 2b630c4aff..102e2603c4 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj @@ -7,181 +7,224 @@ objects = { /* Begin PBXBuildFile section */ - 531C3FE9C2034D6CA1287A2B /* Pods_CPProject_CPProjectTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 93E0EA15A59822C848CE2682 /* Pods_CPProject_CPProjectTests.framework */; }; - 61C363932436318E00C4D4E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363922436318E00C4D4E6 /* AppDelegate.swift */; }; - 61C363952436318E00C4D4E6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363942436318E00C4D4E6 /* SceneDelegate.swift */; }; - 61C363972436318E00C4D4E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363962436318E00C4D4E6 /* ViewController.swift */; }; - 61C3639A2436318E00C4D4E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C363982436318E00C4D4E6 /* Main.storyboard */; }; - 61C3639F2436319000C4D4E6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C3639D2436319000C4D4E6 /* LaunchScreen.storyboard */; }; - 61C363AA2436319000C4D4E6 /* CPProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363A92436319000C4D4E6 /* CPProjectUITests.swift */; }; - 61C364552437568300C4D4E6 /* CPProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C364542437568300C4D4E6 /* CPProjectTests.swift */; }; - 7EFE9B5530413599C43DEF11 /* Pods_CPProject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 394ABB8D53A46EFC06232B89 /* Pods_CPProject.framework */; }; - 8051FF40D3D1CDD4E547A094 /* Pods_CPProject_CPProjectUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16AA6425CE83208EBE1AEF5B /* Pods_CPProject_CPProjectUITests.framework */; }; + 2FF2A19F9C78FC98880874FF /* Pods_Common_CPProjectUseFrameworks.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 424F6BCFD46A729DA7F32FC9 /* Pods_Common_CPProjectUseFrameworks.framework */; }; + 61373B5926E0E7C900E0F46E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C30626E0E278006EDF53 /* AppDelegate.swift */; }; + 61373B5A26E0E7CD00E0F46E /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C30826E0E278006EDF53 /* SceneDelegate.swift */; }; + 61373B5B26E0E7D100E0F46E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C30A26E0E278006EDF53 /* ViewController.swift */; }; + 61373B5C26E0E7D800E0F46E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61B8C30C26E0E278006EDF53 /* Main.storyboard */; }; + 61373B5E26E0E7DF00E0F46E /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61B8C31126E0E27A006EDF53 /* LaunchScreen.storyboard */; }; + 61373B5F26E0E7E400E0F46E /* CPProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C31D26E0E27A006EDF53 /* CPProjectTests.swift */; }; + 61373B6126E0EA2500E0F46E /* CPProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C32826E0E27A006EDF53 /* CPProjectUITests.swift */; }; + 61B8C30726E0E278006EDF53 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C30626E0E278006EDF53 /* AppDelegate.swift */; }; + 61B8C30926E0E278006EDF53 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C30826E0E278006EDF53 /* SceneDelegate.swift */; }; + 61B8C30B26E0E278006EDF53 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C30A26E0E278006EDF53 /* ViewController.swift */; }; + 61B8C30E26E0E278006EDF53 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61B8C30C26E0E278006EDF53 /* Main.storyboard */; }; + 61B8C31326E0E27A006EDF53 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61B8C31126E0E27A006EDF53 /* LaunchScreen.storyboard */; }; + 61B8C31E26E0E27A006EDF53 /* CPProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C31D26E0E27A006EDF53 /* CPProjectTests.swift */; }; + 61B8C32926E0E27A006EDF53 /* CPProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61B8C32826E0E27A006EDF53 /* CPProjectUITests.swift */; }; + A154B5926600D17ECDD21D84 /* libPods-CPProjectNoUseFrameworksTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2DA1BBBF19485F5F93D1E62 /* libPods-CPProjectNoUseFrameworksTests.a */; }; + FB53D921A5A47E18B605B20B /* libPods-Common-CPProjectNoUseFrameworks.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 99AEBB22D577EFFA7CED4C35 /* libPods-Common-CPProjectNoUseFrameworks.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 61C363A62436319000C4D4E6 /* PBXContainerItemProxy */ = { + 61373B3F26E0E78500E0F46E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 61C363872436318E00C4D4E6 /* Project object */; + containerPortal = 61B8C2FB26E0E278006EDF53 /* Project object */; proxyType = 1; - remoteGlobalIDString = 61C3638E2436318E00C4D4E6; + remoteGlobalIDString = 61373B2826E0E78300E0F46E; + remoteInfo = CPProjectNoUseFrameworks; + }; + 61373B4A26E0E78500E0F46E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61B8C2FB26E0E278006EDF53 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61373B2826E0E78300E0F46E; + remoteInfo = CPProjectNoUseFrameworks; + }; + 61B8C31A26E0E27A006EDF53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61B8C2FB26E0E278006EDF53 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61B8C30226E0E278006EDF53; remoteInfo = CPProject; }; - 61C364572437568300C4D4E6 /* PBXContainerItemProxy */ = { + 61B8C32526E0E27A006EDF53 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 61C363872436318E00C4D4E6 /* Project object */; + containerPortal = 61B8C2FB26E0E278006EDF53 /* Project object */; proxyType = 1; - remoteGlobalIDString = 61C3638E2436318E00C4D4E6; + remoteGlobalIDString = 61B8C30226E0E278006EDF53; remoteInfo = CPProject; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 023E9F71B1FFBEAF47AD599B /* Pods-CPProject-CPProjectUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProject-CPProjectUITests.debug.xcconfig"; path = "Target Support Files/Pods-CPProject-CPProjectUITests/Pods-CPProject-CPProjectUITests.debug.xcconfig"; sourceTree = ""; }; - 0D9B145559078D7130D6AA72 /* Pods-CPProject-CPProjectTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProject-CPProjectTests.release.xcconfig"; path = "Target Support Files/Pods-CPProject-CPProjectTests/Pods-CPProject-CPProjectTests.release.xcconfig"; sourceTree = ""; }; - 16AA6425CE83208EBE1AEF5B /* Pods_CPProject_CPProjectUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CPProject_CPProjectUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 394ABB8D53A46EFC06232B89 /* Pods_CPProject.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CPProject.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 5ACCCE7D06C5874130D7D6D4 /* Pods-CPProjectUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProjectUITests.debug.xcconfig"; path = "Target Support Files/Pods-CPProjectUITests/Pods-CPProjectUITests.debug.xcconfig"; sourceTree = ""; }; - 5AD49F84C2EA2EE5CB99586F /* Pods-CPProject.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProject.debug.xcconfig"; path = "Target Support Files/Pods-CPProject/Pods-CPProject.debug.xcconfig"; sourceTree = ""; }; - 61C3638F2436318E00C4D4E6 /* CPProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CPProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 61C363922436318E00C4D4E6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 61C363942436318E00C4D4E6 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 61C363962436318E00C4D4E6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; - 61C363992436318E00C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 61C3639E2436319000C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 61C363A02436319000C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 61C363A52436319000C4D4E6 /* CPProjectUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CPProjectUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 61C363A92436319000C4D4E6 /* CPProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPProjectUITests.swift; sourceTree = ""; }; - 61C363AB2436319000C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 61C364522437568300C4D4E6 /* CPProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CPProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 61C364542437568300C4D4E6 /* CPProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPProjectTests.swift; sourceTree = ""; }; - 61C364562437568300C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 61ED26E42461D29E00752D66 /* Datadog.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Datadog.xcconfig; sourceTree = ""; }; - 61ED26E52461D29E00752D66 /* Datadog.local.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Datadog.local.xcconfig; sourceTree = ""; }; - 6C29934101A436B996950B9C /* Pods-CPProject-CPProjectTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProject-CPProjectTests.debug.xcconfig"; path = "Target Support Files/Pods-CPProject-CPProjectTests/Pods-CPProject-CPProjectTests.debug.xcconfig"; sourceTree = ""; }; - 93E0EA15A59822C848CE2682 /* Pods_CPProject_CPProjectTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CPProject_CPProjectTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 9E33ADFE7E2CECC33A07A795 /* Pods-CPProjectTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProjectTests.debug.xcconfig"; path = "Target Support Files/Pods-CPProjectTests/Pods-CPProjectTests.debug.xcconfig"; sourceTree = ""; }; - A9A539012CEB94D3DDBEEFAF /* Pods-CPProjectUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProjectUITests.release.xcconfig"; path = "Target Support Files/Pods-CPProjectUITests/Pods-CPProjectUITests.release.xcconfig"; sourceTree = ""; }; - C7DE97263B77DC87F0FC27F0 /* Pods-CPProject.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProject.release.xcconfig"; path = "Target Support Files/Pods-CPProject/Pods-CPProject.release.xcconfig"; sourceTree = ""; }; - E4221836EB9A6AB7B55FCA4E /* Pods-CPProjectTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProjectTests.release.xcconfig"; path = "Target Support Files/Pods-CPProjectTests/Pods-CPProjectTests.release.xcconfig"; sourceTree = ""; }; - EB80E12EA30834731C20BC88 /* Pods-CPProject-CPProjectUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProject-CPProjectUITests.release.xcconfig"; path = "Target Support Files/Pods-CPProject-CPProjectUITests/Pods-CPProject-CPProjectUITests.release.xcconfig"; sourceTree = ""; }; + 01FD54C4011C8F113E285585 /* Pods-Common-CPProjectNoUseFrameworks.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectNoUseFrameworks.debug.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectNoUseFrameworks/Pods-Common-CPProjectNoUseFrameworks.debug.xcconfig"; sourceTree = ""; }; + 02265FB44AE08BD3D3454745 /* Pods-CPProjectNoUseFrameworksTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProjectNoUseFrameworksTests.release.xcconfig"; path = "Target Support Files/Pods-CPProjectNoUseFrameworksTests/Pods-CPProjectNoUseFrameworksTests.release.xcconfig"; sourceTree = ""; }; + 0614566C30EF2E2D7BAF1117 /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.debug.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.debug.xcconfig"; sourceTree = ""; }; + 17E75BD7BB8D512DB90A9632 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.release.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.release.xcconfig"; sourceTree = ""; }; + 1F5643EF45F5157D39302AB4 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.debug.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.debug.xcconfig"; sourceTree = ""; }; + 3D97712BEE25C98C566E565A /* Pods-Common-CPProjectNoUseFrameworks.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectNoUseFrameworks.release.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectNoUseFrameworks/Pods-Common-CPProjectNoUseFrameworks.release.xcconfig"; sourceTree = ""; }; + 424F6BCFD46A729DA7F32FC9 /* Pods_Common_CPProjectUseFrameworks.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Common_CPProjectUseFrameworks.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 51776B4903CB23F278458BB6 /* Pods-CPProjectNoUseFrameworksTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CPProjectNoUseFrameworksTests.debug.xcconfig"; path = "Target Support Files/Pods-CPProjectNoUseFrameworksTests/Pods-CPProjectNoUseFrameworksTests.debug.xcconfig"; sourceTree = ""; }; + 586B9607FFDD69DAD0C23F22 /* Pods-Common-CPProjectUseFrameworks.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectUseFrameworks.debug.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectUseFrameworks/Pods-Common-CPProjectUseFrameworks.debug.xcconfig"; sourceTree = ""; }; + 61373B2926E0E78300E0F46E /* CPProjectNoUseFrameworks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CPProjectNoUseFrameworks.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 61373B3E26E0E78500E0F46E /* CPProjectNoUseFrameworksTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CPProjectNoUseFrameworksTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61373B4926E0E78500E0F46E /* CPProjectNoUseFrameworksUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CPProjectNoUseFrameworksUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61B8C30326E0E278006EDF53 /* CPProjectUseFrameworks.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CPProjectUseFrameworks.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 61B8C30626E0E278006EDF53 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 61B8C30826E0E278006EDF53 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 61B8C30A26E0E278006EDF53 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 61B8C30D26E0E278006EDF53 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 61B8C31226E0E27A006EDF53 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 61B8C31426E0E27A006EDF53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61B8C31926E0E27A006EDF53 /* CPProjectUseFrameworksTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CPProjectUseFrameworksTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61B8C31D26E0E27A006EDF53 /* CPProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPProjectTests.swift; sourceTree = ""; }; + 61B8C31F26E0E27A006EDF53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61B8C32426E0E27A006EDF53 /* CPProjectUseFrameworksUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CPProjectUseFrameworksUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61B8C32826E0E27A006EDF53 /* CPProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CPProjectUITests.swift; sourceTree = ""; }; + 61B8C32A26E0E27A006EDF53 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 7BC8294072C54F7BAD098B99 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.debug.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.debug.xcconfig"; sourceTree = ""; }; + 811F6A3208073739F8E4C83E /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.release.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.release.xcconfig"; sourceTree = ""; }; + 93617EDCE36F9B3020CD3EB1 /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.release.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.release.xcconfig"; sourceTree = ""; }; + 99AEBB22D577EFFA7CED4C35 /* libPods-Common-CPProjectNoUseFrameworks.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Common-CPProjectNoUseFrameworks.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9D6D3B3BC8427FCEF169BBEC /* Pods-Common-CPProjectUseFrameworks.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectUseFrameworks.release.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectUseFrameworks/Pods-Common-CPProjectUseFrameworks.release.xcconfig"; sourceTree = ""; }; + B2DA1BBBF19485F5F93D1E62 /* libPods-CPProjectNoUseFrameworksTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-CPProjectNoUseFrameworksTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + BAC50E424C491462E9E6E288 /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.debug.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests/Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.debug.xcconfig"; sourceTree = ""; }; + BC677EB73CB7FE4A474BB0D5 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.release.xcconfig"; path = "Target Support Files/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests/Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 61C3638C2436318E00C4D4E6 /* Frameworks */ = { + 61373B2626E0E78300E0F46E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7EFE9B5530413599C43DEF11 /* Pods_CPProject.framework in Frameworks */, + FB53D921A5A47E18B605B20B /* libPods-Common-CPProjectNoUseFrameworks.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 61C363A22436319000C4D4E6 /* Frameworks */ = { + 61373B3B26E0E78500E0F46E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 8051FF40D3D1CDD4E547A094 /* Pods_CPProject_CPProjectUITests.framework in Frameworks */, + A154B5926600D17ECDD21D84 /* libPods-CPProjectNoUseFrameworksTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 61C3644F2437568300C4D4E6 /* Frameworks */ = { + 61373B4626E0E78500E0F46E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61B8C30026E0E278006EDF53 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 2FF2A19F9C78FC98880874FF /* Pods_Common_CPProjectUseFrameworks.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61B8C31626E0E27A006EDF53 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61B8C32126E0E27A006EDF53 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 531C3FE9C2034D6CA1287A2B /* Pods_CPProject_CPProjectTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0157255130C038561709B7CF /* Pods */ = { - isa = PBXGroup; - children = ( - 5AD49F84C2EA2EE5CB99586F /* Pods-CPProject.debug.xcconfig */, - C7DE97263B77DC87F0FC27F0 /* Pods-CPProject.release.xcconfig */, - 9E33ADFE7E2CECC33A07A795 /* Pods-CPProjectTests.debug.xcconfig */, - E4221836EB9A6AB7B55FCA4E /* Pods-CPProjectTests.release.xcconfig */, - 5ACCCE7D06C5874130D7D6D4 /* Pods-CPProjectUITests.debug.xcconfig */, - A9A539012CEB94D3DDBEEFAF /* Pods-CPProjectUITests.release.xcconfig */, - 6C29934101A436B996950B9C /* Pods-CPProject-CPProjectTests.debug.xcconfig */, - 0D9B145559078D7130D6AA72 /* Pods-CPProject-CPProjectTests.release.xcconfig */, - 023E9F71B1FFBEAF47AD599B /* Pods-CPProject-CPProjectUITests.debug.xcconfig */, - EB80E12EA30834731C20BC88 /* Pods-CPProject-CPProjectUITests.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; - 61C363862436318E00C4D4E6 = { + 61B8C2FA26E0E278006EDF53 = { isa = PBXGroup; children = ( - 61ED26E32461D29E00752D66 /* xcconfigs */, - 61C363912436318E00C4D4E6 /* CPProject */, - 61C364532437568300C4D4E6 /* CPProjectTests */, - 61C363A82436319000C4D4E6 /* CPProjectUITests */, - 61C363902436318E00C4D4E6 /* Products */, - 0157255130C038561709B7CF /* Pods */, - A0508E6A3FA3F45E84391D24 /* Frameworks */, + 61B8C30526E0E278006EDF53 /* CPProject */, + 61B8C31C26E0E27A006EDF53 /* CPProjectTests */, + 61B8C32726E0E27A006EDF53 /* CPProjectUITests */, + 61B8C30426E0E278006EDF53 /* Products */, + 8F60E2E92A8515F0E47A9B30 /* Pods */, + 914DF2FA9D66773F6CA5E53E /* Frameworks */, ); sourceTree = ""; }; - 61C363902436318E00C4D4E6 /* Products */ = { + 61B8C30426E0E278006EDF53 /* Products */ = { isa = PBXGroup; children = ( - 61C3638F2436318E00C4D4E6 /* CPProject.app */, - 61C363A52436319000C4D4E6 /* CPProjectUITests.xctest */, - 61C364522437568300C4D4E6 /* CPProjectTests.xctest */, + 61B8C30326E0E278006EDF53 /* CPProjectUseFrameworks.app */, + 61B8C31926E0E27A006EDF53 /* CPProjectUseFrameworksTests.xctest */, + 61B8C32426E0E27A006EDF53 /* CPProjectUseFrameworksUITests.xctest */, + 61373B2926E0E78300E0F46E /* CPProjectNoUseFrameworks.app */, + 61373B3E26E0E78500E0F46E /* CPProjectNoUseFrameworksTests.xctest */, + 61373B4926E0E78500E0F46E /* CPProjectNoUseFrameworksUITests.xctest */, ); name = Products; sourceTree = ""; }; - 61C363912436318E00C4D4E6 /* CPProject */ = { + 61B8C30526E0E278006EDF53 /* CPProject */ = { isa = PBXGroup; children = ( - 61C363922436318E00C4D4E6 /* AppDelegate.swift */, - 61C363942436318E00C4D4E6 /* SceneDelegate.swift */, - 61C363962436318E00C4D4E6 /* ViewController.swift */, - 61C363982436318E00C4D4E6 /* Main.storyboard */, - 61C3639D2436319000C4D4E6 /* LaunchScreen.storyboard */, - 61C363A02436319000C4D4E6 /* Info.plist */, + 61B8C30626E0E278006EDF53 /* AppDelegate.swift */, + 61B8C30826E0E278006EDF53 /* SceneDelegate.swift */, + 61B8C30A26E0E278006EDF53 /* ViewController.swift */, + 61B8C30C26E0E278006EDF53 /* Main.storyboard */, + 61B8C31126E0E27A006EDF53 /* LaunchScreen.storyboard */, + 61B8C31426E0E27A006EDF53 /* Info.plist */, ); path = CPProject; sourceTree = ""; }; - 61C363A82436319000C4D4E6 /* CPProjectUITests */ = { + 61B8C31C26E0E27A006EDF53 /* CPProjectTests */ = { isa = PBXGroup; children = ( - 61C363A92436319000C4D4E6 /* CPProjectUITests.swift */, - 61C363AB2436319000C4D4E6 /* Info.plist */, + 61B8C31D26E0E27A006EDF53 /* CPProjectTests.swift */, + 61B8C31F26E0E27A006EDF53 /* Info.plist */, ); - path = CPProjectUITests; + path = CPProjectTests; sourceTree = ""; }; - 61C364532437568300C4D4E6 /* CPProjectTests */ = { + 61B8C32726E0E27A006EDF53 /* CPProjectUITests */ = { isa = PBXGroup; children = ( - 61C364542437568300C4D4E6 /* CPProjectTests.swift */, - 61C364562437568300C4D4E6 /* Info.plist */, + 61B8C32826E0E27A006EDF53 /* CPProjectUITests.swift */, + 61B8C32A26E0E27A006EDF53 /* Info.plist */, ); - path = CPProjectTests; + path = CPProjectUITests; sourceTree = ""; }; - 61ED26E32461D29E00752D66 /* xcconfigs */ = { + 8F60E2E92A8515F0E47A9B30 /* Pods */ = { isa = PBXGroup; children = ( - 61ED26E42461D29E00752D66 /* Datadog.xcconfig */, - 61ED26E52461D29E00752D66 /* Datadog.local.xcconfig */, + 586B9607FFDD69DAD0C23F22 /* Pods-Common-CPProjectUseFrameworks.debug.xcconfig */, + 9D6D3B3BC8427FCEF169BBEC /* Pods-Common-CPProjectUseFrameworks.release.xcconfig */, + 0614566C30EF2E2D7BAF1117 /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.debug.xcconfig */, + 811F6A3208073739F8E4C83E /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksTests.release.xcconfig */, + BAC50E424C491462E9E6E288 /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.debug.xcconfig */, + 93617EDCE36F9B3020CD3EB1 /* Pods-Common-CPProjectUseFrameworks-CPProjectUseFrameworksUITests.release.xcconfig */, + 01FD54C4011C8F113E285585 /* Pods-Common-CPProjectNoUseFrameworks.debug.xcconfig */, + 3D97712BEE25C98C566E565A /* Pods-Common-CPProjectNoUseFrameworks.release.xcconfig */, + 1F5643EF45F5157D39302AB4 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.debug.xcconfig */, + 17E75BD7BB8D512DB90A9632 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksTests.release.xcconfig */, + 7BC8294072C54F7BAD098B99 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.debug.xcconfig */, + BC677EB73CB7FE4A474BB0D5 /* Pods-Common-CPProjectNoUseFrameworks-CPProjectNoUseFrameworksUITests.release.xcconfig */, + 51776B4903CB23F278458BB6 /* Pods-CPProjectNoUseFrameworksTests.debug.xcconfig */, + 02265FB44AE08BD3D3454745 /* Pods-CPProjectNoUseFrameworksTests.release.xcconfig */, ); - name = xcconfigs; - path = ../../xcconfigs; + path = Pods; sourceTree = ""; }; - A0508E6A3FA3F45E84391D24 /* Frameworks */ = { + 914DF2FA9D66773F6CA5E53E /* Frameworks */ = { isa = PBXGroup; children = ( - 394ABB8D53A46EFC06232B89 /* Pods_CPProject.framework */, - 93E0EA15A59822C848CE2682 /* Pods_CPProject_CPProjectTests.framework */, - 16AA6425CE83208EBE1AEF5B /* Pods_CPProject_CPProjectUITests.framework */, + 424F6BCFD46A729DA7F32FC9 /* Pods_Common_CPProjectUseFrameworks.framework */, + 99AEBB22D577EFFA7CED4C35 /* libPods-Common-CPProjectNoUseFrameworks.a */, + B2DA1BBBF19485F5F93D1E62 /* libPods-CPProjectNoUseFrameworksTests.a */, ); name = Frameworks; sourceTree = ""; @@ -189,90 +232,150 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 61C3638E2436318E00C4D4E6 /* CPProject */ = { + 61373B2826E0E78300E0F46E /* CPProjectNoUseFrameworks */ = { isa = PBXNativeTarget; - buildConfigurationList = 61C363AE2436319000C4D4E6 /* Build configuration list for PBXNativeTarget "CPProject" */; + buildConfigurationList = 61373B5026E0E78500E0F46E /* Build configuration list for PBXNativeTarget "CPProjectNoUseFrameworks" */; buildPhases = ( - B5E3E8D262C8003866F38F23 /* [CP] Check Pods Manifest.lock */, - 61C3638B2436318E00C4D4E6 /* Sources */, - 61C3638C2436318E00C4D4E6 /* Frameworks */, - 61C3638D2436318E00C4D4E6 /* Resources */, - 61C3645E24376AEF00C4D4E6 /* ⚙️ Run linter */, - 1D03F40EC3476C946BC0FE93 /* [CP] Embed Pods Frameworks */, + 8D0504D0CD7CAFBBB5B63F13 /* [CP] Check Pods Manifest.lock */, + 61373B2526E0E78300E0F46E /* Sources */, + 61373B2626E0E78300E0F46E /* Frameworks */, + 61373B2726E0E78300E0F46E /* Resources */, ); buildRules = ( ); dependencies = ( ); - name = CPProject; - productName = CPProject; - productReference = 61C3638F2436318E00C4D4E6 /* CPProject.app */; + name = CPProjectNoUseFrameworks; + productName = CPProjectNoUseFrameworks; + productReference = 61373B2926E0E78300E0F46E /* CPProjectNoUseFrameworks.app */; productType = "com.apple.product-type.application"; }; - 61C363A42436319000C4D4E6 /* CPProjectUITests */ = { + 61373B3D26E0E78500E0F46E /* CPProjectNoUseFrameworksTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 61C363B12436319000C4D4E6 /* Build configuration list for PBXNativeTarget "CPProjectUITests" */; + buildConfigurationList = 61373B5326E0E78500E0F46E /* Build configuration list for PBXNativeTarget "CPProjectNoUseFrameworksTests" */; buildPhases = ( - 46BAFB96F3CF8A0594FB8A8D /* [CP] Check Pods Manifest.lock */, - 61C363A12436319000C4D4E6 /* Sources */, - 61C363A22436319000C4D4E6 /* Frameworks */, - 61C363A32436319000C4D4E6 /* Resources */, - 567E049B7EEB3FF26416E3A0 /* [CP] Embed Pods Frameworks */, + D6011F89065F1B0B4B52E465 /* [CP] Check Pods Manifest.lock */, + 61373B3A26E0E78500E0F46E /* Sources */, + 61373B3B26E0E78500E0F46E /* Frameworks */, + 61373B3C26E0E78500E0F46E /* Resources */, ); buildRules = ( ); dependencies = ( - 61C363A72436319000C4D4E6 /* PBXTargetDependency */, + 61373B4026E0E78500E0F46E /* PBXTargetDependency */, ); - name = CPProjectUITests; - productName = CPProjectUITests; - productReference = 61C363A52436319000C4D4E6 /* CPProjectUITests.xctest */; + name = CPProjectNoUseFrameworksTests; + productName = CPProjectNoUseFrameworksTests; + productReference = 61373B3E26E0E78500E0F46E /* CPProjectNoUseFrameworksTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 61373B4826E0E78500E0F46E /* CPProjectNoUseFrameworksUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61373B5626E0E78500E0F46E /* Build configuration list for PBXNativeTarget "CPProjectNoUseFrameworksUITests" */; + buildPhases = ( + 61373B4526E0E78500E0F46E /* Sources */, + 61373B4626E0E78500E0F46E /* Frameworks */, + 61373B4726E0E78500E0F46E /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61373B4B26E0E78500E0F46E /* PBXTargetDependency */, + ); + name = CPProjectNoUseFrameworksUITests; + productName = CPProjectNoUseFrameworksUITests; + productReference = 61373B4926E0E78500E0F46E /* CPProjectNoUseFrameworksUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; - 61C364512437568300C4D4E6 /* CPProjectTests */ = { + 61B8C30226E0E278006EDF53 /* CPProjectUseFrameworks */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61B8C32D26E0E27A006EDF53 /* Build configuration list for PBXNativeTarget "CPProjectUseFrameworks" */; + buildPhases = ( + 5645FD027BB938478818FE88 /* [CP] Check Pods Manifest.lock */, + 61B8C2FF26E0E278006EDF53 /* Sources */, + 61B8C30026E0E278006EDF53 /* Frameworks */, + 61B8C30126E0E278006EDF53 /* Resources */, + 31384BB2056A865F3ED23F38 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = CPProjectUseFrameworks; + productName = CPProject; + productReference = 61B8C30326E0E278006EDF53 /* CPProjectUseFrameworks.app */; + productType = "com.apple.product-type.application"; + }; + 61B8C31826E0E27A006EDF53 /* CPProjectUseFrameworksTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 61C3645B2437568300C4D4E6 /* Build configuration list for PBXNativeTarget "CPProjectTests" */; + buildConfigurationList = 61B8C33026E0E27A006EDF53 /* Build configuration list for PBXNativeTarget "CPProjectUseFrameworksTests" */; buildPhases = ( - E0C0BFBDF1EBCFBACB1B053D /* [CP] Check Pods Manifest.lock */, - 61C3644E2437568300C4D4E6 /* Sources */, - 61C3644F2437568300C4D4E6 /* Frameworks */, - 61C364502437568300C4D4E6 /* Resources */, - D8E080EFA5BC75427C8EA6A2 /* [CP] Embed Pods Frameworks */, + 61B8C31526E0E27A006EDF53 /* Sources */, + 61B8C31626E0E27A006EDF53 /* Frameworks */, + 61B8C31726E0E27A006EDF53 /* Resources */, ); buildRules = ( ); dependencies = ( - 61C364582437568300C4D4E6 /* PBXTargetDependency */, + 61B8C31B26E0E27A006EDF53 /* PBXTargetDependency */, ); - name = CPProjectTests; + name = CPProjectUseFrameworksTests; productName = CPProjectTests; - productReference = 61C364522437568300C4D4E6 /* CPProjectTests.xctest */; + productReference = 61B8C31926E0E27A006EDF53 /* CPProjectUseFrameworksTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; + 61B8C32326E0E27A006EDF53 /* CPProjectUseFrameworksUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61B8C33326E0E27A006EDF53 /* Build configuration list for PBXNativeTarget "CPProjectUseFrameworksUITests" */; + buildPhases = ( + 61B8C32026E0E27A006EDF53 /* Sources */, + 61B8C32126E0E27A006EDF53 /* Frameworks */, + 61B8C32226E0E27A006EDF53 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61B8C32626E0E27A006EDF53 /* PBXTargetDependency */, + ); + name = CPProjectUseFrameworksUITests; + productName = CPProjectUITests; + productReference = 61B8C32426E0E27A006EDF53 /* CPProjectUseFrameworksUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 61C363872436318E00C4D4E6 /* Project object */ = { + 61B8C2FB26E0E278006EDF53 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1140; - LastUpgradeCheck = 1140; - ORGANIZATIONNAME = Datadog; + LastSwiftUpdateCheck = 1250; + LastUpgradeCheck = 1250; TargetAttributes = { - 61C3638E2436318E00C4D4E6 = { - CreatedOnToolsVersion = 11.4; + 61373B2826E0E78300E0F46E = { + CreatedOnToolsVersion = 12.5; + }; + 61373B3D26E0E78500E0F46E = { + CreatedOnToolsVersion = 12.5; + TestTargetID = 61373B2826E0E78300E0F46E; + }; + 61373B4826E0E78500E0F46E = { + CreatedOnToolsVersion = 12.5; + TestTargetID = 61373B2826E0E78300E0F46E; }; - 61C363A42436319000C4D4E6 = { - CreatedOnToolsVersion = 11.4; - TestTargetID = 61C3638E2436318E00C4D4E6; + 61B8C30226E0E278006EDF53 = { + CreatedOnToolsVersion = 12.5; }; - 61C364512437568300C4D4E6 = { - CreatedOnToolsVersion = 11.4; - TestTargetID = 61C3638E2436318E00C4D4E6; + 61B8C31826E0E27A006EDF53 = { + CreatedOnToolsVersion = 12.5; + TestTargetID = 61B8C30226E0E278006EDF53; + }; + 61B8C32326E0E27A006EDF53 = { + CreatedOnToolsVersion = 12.5; + TestTargetID = 61B8C30226E0E278006EDF53; }; }; }; - buildConfigurationList = 61C3638A2436318E00C4D4E6 /* Build configuration list for PBXProject "CPProject" */; + buildConfigurationList = 61B8C2FE26E0E278006EDF53 /* Build configuration list for PBXProject "CPProject" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -280,102 +383,89 @@ en, Base, ); - mainGroup = 61C363862436318E00C4D4E6; - productRefGroup = 61C363902436318E00C4D4E6 /* Products */; + mainGroup = 61B8C2FA26E0E278006EDF53; + productRefGroup = 61B8C30426E0E278006EDF53 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 61C3638E2436318E00C4D4E6 /* CPProject */, - 61C364512437568300C4D4E6 /* CPProjectTests */, - 61C363A42436319000C4D4E6 /* CPProjectUITests */, + 61B8C30226E0E278006EDF53 /* CPProjectUseFrameworks */, + 61B8C31826E0E27A006EDF53 /* CPProjectUseFrameworksTests */, + 61B8C32326E0E27A006EDF53 /* CPProjectUseFrameworksUITests */, + 61373B2826E0E78300E0F46E /* CPProjectNoUseFrameworks */, + 61373B3D26E0E78500E0F46E /* CPProjectNoUseFrameworksTests */, + 61373B4826E0E78500E0F46E /* CPProjectNoUseFrameworksUITests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 61C3638D2436318E00C4D4E6 /* Resources */ = { + 61373B2726E0E78300E0F46E /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61C3639F2436319000C4D4E6 /* LaunchScreen.storyboard in Resources */, - 61C3639A2436318E00C4D4E6 /* Main.storyboard in Resources */, + 61373B5E26E0E7DF00E0F46E /* LaunchScreen.storyboard in Resources */, + 61373B5C26E0E7D800E0F46E /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 61C363A32436319000C4D4E6 /* Resources */ = { + 61373B3C26E0E78500E0F46E /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 61C364502437568300C4D4E6 /* Resources */ = { + 61373B4726E0E78500E0F46E /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - 1D03F40EC3476C946BC0FE93 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; + 61B8C30126E0E278006EDF53 /* Resources */ = { + isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CPProject/Pods-CPProject-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CPProject/Pods-CPProject-frameworks-${CONFIGURATION}-output-files.xcfilelist", + 61B8C31326E0E27A006EDF53 /* LaunchScreen.storyboard in Resources */, + 61B8C30E26E0E278006EDF53 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CPProject/Pods-CPProject-frameworks.sh\"\n"; - showEnvVarsInLog = 0; }; - 46BAFB96F3CF8A0594FB8A8D /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; + 61B8C31726E0E27A006EDF53 /* Resources */ = { + isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CPProject-CPProjectUITests-checkManifestLockResult.txt", + runOnlyForDeploymentPostprocessing = 0; + }; + 61B8C32226E0E27A006EDF53 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( ); runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; }; - 567E049B7EEB3FF26416E3A0 /* [CP] Embed Pods Frameworks */ = { +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 31384BB2056A865F3ED23F38 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CPProject-CPProjectUITests/Pods-CPProject-CPProjectUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Common-CPProjectUseFrameworks/Pods-Common-CPProjectUseFrameworks-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CPProject-CPProjectUITests/Pods-CPProject-CPProjectUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-Common-CPProjectUseFrameworks/Pods-Common-CPProjectUseFrameworks-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CPProject-CPProjectUITests/Pods-CPProject-CPProjectUITests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Common-CPProjectUseFrameworks/Pods-Common-CPProjectUseFrameworks-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - 61C3645E24376AEF00C4D4E6 /* ⚙️ Run linter */ = { + 5645FD027BB938478818FE88 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -383,18 +473,21 @@ inputFileListPaths = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "⚙️ Run linter"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Common-CPProjectUseFrameworks-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n cd ${SOURCE_ROOT}/../../\n ./tools/lint/run-linter.sh\nfi\n"; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - B5E3E8D262C8003866F38F23 /* [CP] Check Pods Manifest.lock */ = { + 8D0504D0CD7CAFBBB5B63F13 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -409,31 +502,14 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CPProject-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-Common-CPProjectNoUseFrameworks-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D8E080EFA5BC75427C8EA6A2 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CPProject-CPProjectTests/Pods-CPProject-CPProjectTests-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-CPProject-CPProjectTests/Pods-CPProject-CPProjectTests-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CPProject-CPProjectTests/Pods-CPProject-CPProjectTests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - E0C0BFBDF1EBCFBACB1B053D /* [CP] Check Pods Manifest.lock */ = { + D6011F89065F1B0B4B52E465 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -448,7 +524,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CPProject-CPProjectTests-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-CPProjectNoUseFrameworksTests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -458,60 +534,96 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 61C3638B2436318E00C4D4E6 /* Sources */ = { + 61373B2526E0E78300E0F46E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61373B5B26E0E7D100E0F46E /* ViewController.swift in Sources */, + 61373B5926E0E7C900E0F46E /* AppDelegate.swift in Sources */, + 61373B5A26E0E7CD00E0F46E /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61373B3A26E0E78500E0F46E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61C363972436318E00C4D4E6 /* ViewController.swift in Sources */, - 61C363932436318E00C4D4E6 /* AppDelegate.swift in Sources */, - 61C363952436318E00C4D4E6 /* SceneDelegate.swift in Sources */, + 61373B5F26E0E7E400E0F46E /* CPProjectTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 61C363A12436319000C4D4E6 /* Sources */ = { + 61373B4526E0E78500E0F46E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61C363AA2436319000C4D4E6 /* CPProjectUITests.swift in Sources */, + 61373B6126E0EA2500E0F46E /* CPProjectUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 61C3644E2437568300C4D4E6 /* Sources */ = { + 61B8C2FF26E0E278006EDF53 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 61C364552437568300C4D4E6 /* CPProjectTests.swift in Sources */, + 61B8C30B26E0E278006EDF53 /* ViewController.swift in Sources */, + 61B8C30726E0E278006EDF53 /* AppDelegate.swift in Sources */, + 61B8C30926E0E278006EDF53 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61B8C31526E0E27A006EDF53 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61B8C31E26E0E27A006EDF53 /* CPProjectTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61B8C32026E0E27A006EDF53 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61B8C32926E0E27A006EDF53 /* CPProjectUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 61C363A72436319000C4D4E6 /* PBXTargetDependency */ = { + 61373B4026E0E78500E0F46E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 61C3638E2436318E00C4D4E6 /* CPProject */; - targetProxy = 61C363A62436319000C4D4E6 /* PBXContainerItemProxy */; + target = 61373B2826E0E78300E0F46E /* CPProjectNoUseFrameworks */; + targetProxy = 61373B3F26E0E78500E0F46E /* PBXContainerItemProxy */; }; - 61C364582437568300C4D4E6 /* PBXTargetDependency */ = { + 61373B4B26E0E78500E0F46E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 61C3638E2436318E00C4D4E6 /* CPProject */; - targetProxy = 61C364572437568300C4D4E6 /* PBXContainerItemProxy */; + target = 61373B2826E0E78300E0F46E /* CPProjectNoUseFrameworks */; + targetProxy = 61373B4A26E0E78500E0F46E /* PBXContainerItemProxy */; + }; + 61B8C31B26E0E27A006EDF53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61B8C30226E0E278006EDF53 /* CPProjectUseFrameworks */; + targetProxy = 61B8C31A26E0E27A006EDF53 /* PBXContainerItemProxy */; + }; + 61B8C32626E0E27A006EDF53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61B8C30226E0E278006EDF53 /* CPProjectUseFrameworks */; + targetProxy = 61B8C32526E0E27A006EDF53 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 61C363982436318E00C4D4E6 /* Main.storyboard */ = { + 61B8C30C26E0E278006EDF53 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 61C363992436318E00C4D4E6 /* Base */, + 61B8C30D26E0E278006EDF53 /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 61C3639D2436319000C4D4E6 /* LaunchScreen.storyboard */ = { + 61B8C31126E0E27A006EDF53 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 61C3639E2436319000C4D4E6 /* Base */, + 61B8C31226E0E27A006EDF53 /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; @@ -519,9 +631,128 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 61C363AC2436319000C4D4E6 /* Debug */ = { + 61373B5126E0E78500E0F46E /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 01FD54C4011C8F113E285585 /* Pods-Common-CPProjectNoUseFrameworks.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProject/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectNoUseFrameworks; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 61373B5226E0E78500E0F46E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 3D97712BEE25C98C566E565A /* Pods-Common-CPProjectNoUseFrameworks.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProject/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectNoUseFrameworks; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 61373B5426E0E78500E0F46E /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 51776B4903CB23F278458BB6 /* Pods-CPProjectNoUseFrameworksTests.debug.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectNoUseFrameworksTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProjectNoUseFrameworks.app/CPProjectNoUseFrameworks"; + }; + name = Debug; + }; + 61373B5526E0E78500E0F46E /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 02265FB44AE08BD3D3454745 /* Pods-CPProjectNoUseFrameworksTests.release.xcconfig */; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectNoUseFrameworksTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProjectNoUseFrameworks.app/CPProjectNoUseFrameworks"; + }; + name = Release; + }; + 61373B5726E0E78500E0F46E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectNoUseFrameworksUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = CPProjectNoUseFrameworks; + }; + name = Debug; + }; + 61373B5826E0E78500E0F46E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectNoUseFrameworksUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = CPProjectNoUseFrameworks; + }; + name = Release; + }; + 61B8C32B26E0E27A006EDF53 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 61ED26E42461D29E00752D66 /* Datadog.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -546,6 +777,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -580,9 +812,8 @@ }; name = Debug; }; - 61C363AD2436319000C4D4E6 /* Release */ = { + 61B8C32C26E0E27A006EDF53 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 61ED26E42461D29E00752D66 /* Datadog.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -607,6 +838,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -635,188 +867,194 @@ }; name = Release; }; - 61C363AF2436319000C4D4E6 /* Debug */ = { + 61B8C32E26E0E27A006EDF53 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5AD49F84C2EA2EE5CB99586F /* Pods-CPProject.debug.xcconfig */; + baseConfigurationReference = 586B9607FFDD69DAD0C23F22 /* Pods-Common-CPProjectUseFrameworks.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; INFOPLIST_FILE = CPProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProject; + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectUseFrameworks; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; - SUPPORTS_MACCATALYST = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 61C363B02436319000C4D4E6 /* Release */ = { + 61B8C32F26E0E27A006EDF53 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C7DE97263B77DC87F0FC27F0 /* Pods-CPProject.release.xcconfig */; + baseConfigurationReference = 9D6D3B3BC8427FCEF169BBEC /* Pods-Common-CPProjectUseFrameworks.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; INFOPLIST_FILE = CPProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProject; + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectUseFrameworks; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; - SUPPORTS_MACCATALYST = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; - 61C363B22436319000C4D4E6 /* Debug */ = { + 61B8C33126E0E27A006EDF53 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 023E9F71B1FFBEAF47AD599B /* Pods-CPProject-CPProjectUITests.debug.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = CPProjectUITests/Info.plist; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectUITests; + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectUseFrameworksTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG COMPILING_FOR_USE_FRAMEWORKS"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = CPProject; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProjectUseFrameworks.app/CPProjectUseFrameworks"; }; name = Debug; }; - 61C363B32436319000C4D4E6 /* Release */ = { + 61B8C33226E0E27A006EDF53 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EB80E12EA30834731C20BC88 /* Pods-CPProject-CPProjectUITests.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = CPProjectUITests/Info.plist; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectUITests; + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectUseFrameworksTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = CPProject; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProjectUseFrameworks.app/CPProjectUseFrameworks"; }; name = Release; }; - 61C364592437568300C4D4E6 /* Debug */ = { + 61B8C33426E0E27A006EDF53 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6C29934101A436B996950B9C /* Pods-CPProject-CPProjectTests.debug.xcconfig */; buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = CPProjectTests/Info.plist; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectUseFrameworksUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; + PROVISIONING_PROFILE = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; + TEST_TARGET_NAME = CPProjectUseFrameworks; }; name = Debug; }; - 61C3645A2437568300C4D4E6 /* Release */ = { + 61B8C33526E0E27A006EDF53 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0D9B145559078D7130D6AA72 /* Pods-CPProject-CPProjectTests.release.xcconfig */; buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; - CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; - INFOPLIST_FILE = CPProjectTests/Info.plist; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = JKFCB4CN7C; + INFOPLIST_FILE = CPProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", ); - PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; + PRODUCT_BUNDLE_IDENTIFIER = com.datadoghq.CPProjectUseFrameworksUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; + PROVISIONING_PROFILE = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; + TEST_TARGET_NAME = CPProjectUseFrameworks; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 61C3638A2436318E00C4D4E6 /* Build configuration list for PBXProject "CPProject" */ = { + 61373B5026E0E78500E0F46E /* Build configuration list for PBXNativeTarget "CPProjectNoUseFrameworks" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61373B5126E0E78500E0F46E /* Debug */, + 61373B5226E0E78500E0F46E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61373B5326E0E78500E0F46E /* Build configuration list for PBXNativeTarget "CPProjectNoUseFrameworksTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61373B5426E0E78500E0F46E /* Debug */, + 61373B5526E0E78500E0F46E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61373B5626E0E78500E0F46E /* Build configuration list for PBXNativeTarget "CPProjectNoUseFrameworksUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61373B5726E0E78500E0F46E /* Debug */, + 61373B5826E0E78500E0F46E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61B8C2FE26E0E278006EDF53 /* Build configuration list for PBXProject "CPProject" */ = { isa = XCConfigurationList; buildConfigurations = ( - 61C363AC2436319000C4D4E6 /* Debug */, - 61C363AD2436319000C4D4E6 /* Release */, + 61B8C32B26E0E27A006EDF53 /* Debug */, + 61B8C32C26E0E27A006EDF53 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 61C363AE2436319000C4D4E6 /* Build configuration list for PBXNativeTarget "CPProject" */ = { + 61B8C32D26E0E27A006EDF53 /* Build configuration list for PBXNativeTarget "CPProjectUseFrameworks" */ = { isa = XCConfigurationList; buildConfigurations = ( - 61C363AF2436319000C4D4E6 /* Debug */, - 61C363B02436319000C4D4E6 /* Release */, + 61B8C32E26E0E27A006EDF53 /* Debug */, + 61B8C32F26E0E27A006EDF53 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 61C363B12436319000C4D4E6 /* Build configuration list for PBXNativeTarget "CPProjectUITests" */ = { + 61B8C33026E0E27A006EDF53 /* Build configuration list for PBXNativeTarget "CPProjectUseFrameworksTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 61C363B22436319000C4D4E6 /* Debug */, - 61C363B32436319000C4D4E6 /* Release */, + 61B8C33126E0E27A006EDF53 /* Debug */, + 61B8C33226E0E27A006EDF53 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 61C3645B2437568300C4D4E6 /* Build configuration list for PBXNativeTarget "CPProjectTests" */ = { + 61B8C33326E0E27A006EDF53 /* Build configuration list for PBXNativeTarget "CPProjectUseFrameworksUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 61C364592437568300C4D4E6 /* Debug */, - 61C3645A2437568300C4D4E6 /* Release */, + 61B8C33426E0E27A006EDF53 /* Debug */, + 61B8C33526E0E27A006EDF53 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 61C363872436318E00C4D4E6 /* Project object */; + rootObject = 61B8C2FB26E0E278006EDF53 /* Project object */; } diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata index a295d0dc32..919434a625 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProjectNoUseFrameworks.xcscheme b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProjectNoUseFrameworks.xcscheme new file mode 100644 index 0000000000..82c4219962 --- /dev/null +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProjectNoUseFrameworks.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProjectUseFrameworks.xcscheme similarity index 75% rename from dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme rename to dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProjectUseFrameworks.xcscheme index 4cef192bd3..d834e8e16f 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProjectUseFrameworks.xcscheme @@ -1,6 +1,6 @@ @@ -32,9 +32,9 @@ skipped = "NO"> @@ -42,9 +42,9 @@ skipped = "NO"> @@ -64,9 +64,9 @@ runnableDebuggingMode = "0"> @@ -81,9 +81,9 @@ runnableDebuggingMode = "0"> diff --git a/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard b/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard index 49690bb98b..650f1fd723 100644 --- a/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard +++ b/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard @@ -1,57 +1,45 @@ - + - + + - + - - - - - - - - - - - - - - - - - - - + - + + - - + + - - + + + + + + diff --git a/dependency-manager-tests/cocoapods/CPProject/Info.plist b/dependency-manager-tests/cocoapods/CPProject/Info.plist index 2a3483c0d2..5b531f7b27 100644 --- a/dependency-manager-tests/cocoapods/CPProject/Info.plist +++ b/dependency-manager-tests/cocoapods/CPProject/Info.plist @@ -39,6 +39,8 @@ + UIApplicationSupportsIndirectInputEvents + UILaunchStoryboardName LaunchScreen UIMainStoryboardFile diff --git a/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift b/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift index 1a55f0036d..4f709bdb72 100644 --- a/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift +++ b/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift @@ -5,7 +5,11 @@ */ import XCTest -@testable import CPProject +#if COMPILING_FOR_USE_FRAMEWORKS +@testable import CPProjectUseFrameworks +#else +@testable import CPProjectNoUseFrameworks +#endif class CPProjectTests: XCTestCase { func testCallingLogicThatLoadsSDK() throws { diff --git a/dependency-manager-tests/cocoapods/Makefile b/dependency-manager-tests/cocoapods/Makefile index eaf79ed28d..6a27fff1e2 100644 --- a/dependency-manager-tests/cocoapods/Makefile +++ b/dependency-manager-tests/cocoapods/Makefile @@ -11,4 +11,4 @@ test: @sed "s|REMOTE_GIT_REFERENCE|${GIT_REFERENCE}|g" Podfile.src > Podfile @rm -rf Pods/ pod update - @echo "OK 👌" + @echo "👌 'pod update' OK" diff --git a/dependency-manager-tests/cocoapods/Podfile.src b/dependency-manager-tests/cocoapods/Podfile.src index d108cd4d6c..dee2004ee1 100644 --- a/dependency-manager-tests/cocoapods/Podfile.src +++ b/dependency-manager-tests/cocoapods/Podfile.src @@ -1,31 +1,18 @@ -platform :ios, '12.0' +platform :ios, '13.0' -use_frameworks! - -target 'CPProject' do +abstract_target 'Common' do pod 'DatadogSDK', :git => 'https://github.com/DataDog/dd-sdk-ios.git', :REMOTE_GIT_REFERENCE pod 'DatadogSDKAlamofireExtension', :git => 'https://github.com/DataDog/dd-sdk-ios.git', :REMOTE_GIT_REFERENCE pod 'DatadogSDKCrashReporting', :git => 'https://github.com/DataDog/dd-sdk-ios.git', :REMOTE_GIT_REFERENCE pod 'Alamofire' - target 'CPProjectTests' do - inherit! :complete - end - target 'CPProjectUITests' do - inherit! :complete + target 'CPProjectUseFrameworks' do + use_frameworks! end -end -static_frameworks = ['DatadogSDKCrashReporting','PLCrashReporter'] -pre_install do |installer| - installer.pod_targets.each do |pod| - if static_frameworks.include?(pod.name) - def pod.static_framework?; - true - end - def pod.build_type; - Pod::BuildType.static_library - end + target 'CPProjectNoUseFrameworks' do + target 'CPProjectNoUseFrameworksTests' do + inherit! :search_paths end end end