From 294fb256594357ba58e5bbe01c04eafb1b936787 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 13:03:39 +0200 Subject: [PATCH 01/15] RUMM-346 Change SPMProject to be "Single View" app --- dependency-manager-tests/spm/.gitignore | 5 - dependency-manager-tests/spm/Makefile | 4 +- dependency-manager-tests/spm/README.md | 6 +- .../spm/SPMProject.xcodeproj/project.pbxproj | 322 ++++++++---------- .../xcshareddata/swiftpm/Package.resolved | 16 + .../spm/SPMProject/AppDelegate.swift | 57 +--- .../AppIcon.appiconset/Contents.json | 98 ------ .../SPMProject/Assets.xcassets/Contents.json | 6 - .../spm/SPMProject/Base.lproj/Main.storyboard | 125 +------ .../spm/SPMProject/DetailViewController.swift | 34 -- .../spm/SPMProject/Info.plist | 10 - .../spm/SPMProject/MasterViewController.swift | 174 ---------- .../SPMProject.xcdatamodeld/.xccurrentversion | 8 - .../SPMProject.xcdatamodel/contents | 9 - .../spm/SPMProject/SceneDelegate.swift | 49 +-- .../spm/SPMProject/ViewController.swift | 13 + .../spm/SPMProjectTests/SPMProjectTests.swift | 7 +- .../SPMProjectUITests/SPMProjectUITests.swift | 18 - 18 files changed, 183 insertions(+), 778 deletions(-) create mode 100644 dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved delete mode 100644 dependency-manager-tests/spm/SPMProject/Assets.xcassets/AppIcon.appiconset/Contents.json delete mode 100644 dependency-manager-tests/spm/SPMProject/Assets.xcassets/Contents.json delete mode 100644 dependency-manager-tests/spm/SPMProject/DetailViewController.swift delete mode 100644 dependency-manager-tests/spm/SPMProject/MasterViewController.swift delete mode 100644 dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/.xccurrentversion delete mode 100644 dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/SPMProject.xcdatamodel/contents create mode 100644 dependency-manager-tests/spm/SPMProject/ViewController.swift diff --git a/dependency-manager-tests/spm/.gitignore b/dependency-manager-tests/spm/.gitignore index d163174c68..55ea59c820 100644 --- a/dependency-manager-tests/spm/.gitignore +++ b/dependency-manager-tests/spm/.gitignore @@ -1,8 +1,3 @@ .DS_Store /.build -/Packages xcuserdata/ - -# Ignore `Package.resolved` and `Package.swift` as they will be re-created for every test run. -Package.resolved -Package.swift diff --git a/dependency-manager-tests/spm/Makefile b/dependency-manager-tests/spm/Makefile index d861b16e29..5666d31660 100644 --- a/dependency-manager-tests/spm/Makefile +++ b/dependency-manager-tests/spm/Makefile @@ -5,6 +5,6 @@ else endif test: - @echo "⚙️ Testing SPM for remote branch: '${GIT_BRANCH}'..." - @sed -i "" "s|branch = *.;|branch = ${GIT_BRANCH};|g" SPMProject.xcodeproj/project.pbxproj + @echo "⚙️ Configuring SPMProject with remote branch: '${GIT_BRANCH}'..." + @sed -i "" "s|branch = master;|branch = ${GIT_BRANCH};|g" SPMProject.xcodeproj/project.pbxproj @echo "OK 👌" diff --git a/dependency-manager-tests/spm/README.md b/dependency-manager-tests/spm/README.md index ca37b91b37..e3767d9d7d 100644 --- a/dependency-manager-tests/spm/README.md +++ b/dependency-manager-tests/spm/README.md @@ -1,14 +1,14 @@ # SPMProject -`SPMProject` is a skeleton of an SPM package used for testing SPM compatibility of the current branch. +`SPMProject` is a skeleton project for testing SPM compatibility of the current branch. After pushing current branch to remote, run: ```bash $ make ``` -to check if SPM is able to fetch `Datadog` dependency from current branch and build the project. +Then, open `SPMProject.xcodeproj` to check if SPM is able to fetch `Datadog` dependency from current branch and build the project. ## Important Note: `make` auto-magically changes current branch for `Datadog` dependency. -By default, current branch is `master`; if you open `SPMProject.xcodeproj` and build, you will fetch `Datadog:master` +By default, current branch is `master`; if you open `SPMProject.xcodeproj`, it will fetch `Datadog:master`. diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj index 705ec5029a..f7b8e50ddd 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj @@ -7,72 +7,66 @@ objects = { /* Begin PBXBuildFile section */ - 9EC2945C242CEA8800D970DB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC2945B242CEA8800D970DB /* AppDelegate.swift */; }; - 9EC2945F242CEA8800D970DB /* SPMProject.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9EC2945D242CEA8800D970DB /* SPMProject.xcdatamodeld */; }; - 9EC29461242CEA8800D970DB /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC29460242CEA8800D970DB /* SceneDelegate.swift */; }; - 9EC29463242CEA8800D970DB /* MasterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC29462242CEA8800D970DB /* MasterViewController.swift */; }; - 9EC29465242CEA8800D970DB /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC29464242CEA8800D970DB /* DetailViewController.swift */; }; - 9EC29468242CEA8800D970DB /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9EC29466242CEA8800D970DB /* Main.storyboard */; }; - 9EC2946A242CEA8800D970DB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9EC29469242CEA8800D970DB /* Assets.xcassets */; }; - 9EC2946D242CEA8800D970DB /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9EC2946B242CEA8800D970DB /* LaunchScreen.storyboard */; }; - 9EC29478242CEA8800D970DB /* SPMProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC29477242CEA8800D970DB /* SPMProjectTests.swift */; }; - 9EC29483242CEA8800D970DB /* SPMProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EC29482242CEA8800D970DB /* SPMProjectUITests.swift */; }; - 9EC29492242CEAA000D970DB /* Datadog in Frameworks */ = {isa = PBXBuildFile; productRef = 9EC29491242CEAA000D970DB /* Datadog */; }; + 61C363DA24374D5F00C4D4E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */; }; + 61C363DC24374D5F00C4D4E6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */; }; + 61C363DE24374D5F00C4D4E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363DD24374D5F00C4D4E6 /* ViewController.swift */; }; + 61C363E124374D5F00C4D4E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C363DF24374D5F00C4D4E6 /* Main.storyboard */; }; + 61C363E624374D6000C4D4E6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C363E424374D6000C4D4E6 /* LaunchScreen.storyboard */; }; + 61C363F124374D6100C4D4E6 /* SPMProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363F024374D6100C4D4E6 /* SPMProjectTests.swift */; }; + 61C363FC24374D6100C4D4E6 /* SPMProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */; }; + 61C3640B24374DF200C4D4E6 /* Datadog in Frameworks */ = {isa = PBXBuildFile; productRef = 61C3640A24374DF200C4D4E6 /* Datadog */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 9EC29474242CEA8800D970DB /* PBXContainerItemProxy */ = { + 61C363ED24374D6100C4D4E6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 9EC29450242CEA8800D970DB /* Project object */; + containerPortal = 61C363CE24374D5F00C4D4E6 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9EC29457242CEA8800D970DB; + remoteGlobalIDString = 61C363D524374D5F00C4D4E6; remoteInfo = SPMProject; }; - 9EC2947F242CEA8800D970DB /* PBXContainerItemProxy */ = { + 61C363F824374D6100C4D4E6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 9EC29450242CEA8800D970DB /* Project object */; + containerPortal = 61C363CE24374D5F00C4D4E6 /* Project object */; proxyType = 1; - remoteGlobalIDString = 9EC29457242CEA8800D970DB; + remoteGlobalIDString = 61C363D524374D5F00C4D4E6; remoteInfo = SPMProject; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 9EC29458242CEA8800D970DB /* SPMProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SPMProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 9EC2945B242CEA8800D970DB /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 9EC2945E242CEA8800D970DB /* SPMProject.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = SPMProject.xcdatamodel; sourceTree = ""; }; - 9EC29460242CEA8800D970DB /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; - 9EC29462242CEA8800D970DB /* MasterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MasterViewController.swift; sourceTree = ""; }; - 9EC29464242CEA8800D970DB /* DetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = ""; }; - 9EC29467242CEA8800D970DB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; - 9EC29469242CEA8800D970DB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 9EC2946C242CEA8800D970DB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 9EC2946E242CEA8800D970DB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9EC29473242CEA8800D970DB /* SPMProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 9EC29477242CEA8800D970DB /* SPMProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectTests.swift; sourceTree = ""; }; - 9EC29479242CEA8800D970DB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9EC2947E242CEA8800D970DB /* SPMProjectUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 9EC29482242CEA8800D970DB /* SPMProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectUITests.swift; sourceTree = ""; }; - 9EC29484242CEA8800D970DB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C363D624374D5F00C4D4E6 /* SPMProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SPMProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 61C363DD24374D5F00C4D4E6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 61C363E024374D5F00C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 61C363E524374D6000C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 61C363E724374D6000C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C363EC24374D6100C4D4E6 /* SPMProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C363F024374D6100C4D4E6 /* SPMProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectTests.swift; sourceTree = ""; }; + 61C363F224374D6100C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectUITests.swift; sourceTree = ""; }; + 61C363FD24374D6100C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 9EC29455242CEA8800D970DB /* Frameworks */ = { + 61C363D324374D5F00C4D4E6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9EC29492242CEAA000D970DB /* Datadog in Frameworks */, + 61C3640B24374DF200C4D4E6 /* Datadog in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 9EC29470242CEA8800D970DB /* Frameworks */ = { + 61C363E924374D6100C4D4E6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 9EC2947B242CEA8800D970DB /* Frameworks */ = { + 61C363F424374D6100C4D4E6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -82,56 +76,53 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 9EC2944F242CEA8800D970DB = { + 61C363CD24374D5F00C4D4E6 = { isa = PBXGroup; children = ( - 9EC2945A242CEA8800D970DB /* SPMProject */, - 9EC29476242CEA8800D970DB /* SPMProjectTests */, - 9EC29481242CEA8800D970DB /* SPMProjectUITests */, - 9EC29459242CEA8800D970DB /* Products */, + 61C363D824374D5F00C4D4E6 /* SPMProject */, + 61C363EF24374D6100C4D4E6 /* SPMProjectTests */, + 61C363FA24374D6100C4D4E6 /* SPMProjectUITests */, + 61C363D724374D5F00C4D4E6 /* Products */, ); sourceTree = ""; }; - 9EC29459242CEA8800D970DB /* Products */ = { + 61C363D724374D5F00C4D4E6 /* Products */ = { isa = PBXGroup; children = ( - 9EC29458242CEA8800D970DB /* SPMProject.app */, - 9EC29473242CEA8800D970DB /* SPMProjectTests.xctest */, - 9EC2947E242CEA8800D970DB /* SPMProjectUITests.xctest */, + 61C363D624374D5F00C4D4E6 /* SPMProject.app */, + 61C363EC24374D6100C4D4E6 /* SPMProjectTests.xctest */, + 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */, ); name = Products; sourceTree = ""; }; - 9EC2945A242CEA8800D970DB /* SPMProject */ = { + 61C363D824374D5F00C4D4E6 /* SPMProject */ = { isa = PBXGroup; children = ( - 9EC2945B242CEA8800D970DB /* AppDelegate.swift */, - 9EC29460242CEA8800D970DB /* SceneDelegate.swift */, - 9EC29462242CEA8800D970DB /* MasterViewController.swift */, - 9EC29464242CEA8800D970DB /* DetailViewController.swift */, - 9EC29466242CEA8800D970DB /* Main.storyboard */, - 9EC29469242CEA8800D970DB /* Assets.xcassets */, - 9EC2946B242CEA8800D970DB /* LaunchScreen.storyboard */, - 9EC2946E242CEA8800D970DB /* Info.plist */, - 9EC2945D242CEA8800D970DB /* SPMProject.xcdatamodeld */, + 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */, + 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */, + 61C363DD24374D5F00C4D4E6 /* ViewController.swift */, + 61C363DF24374D5F00C4D4E6 /* Main.storyboard */, + 61C363E424374D6000C4D4E6 /* LaunchScreen.storyboard */, + 61C363E724374D6000C4D4E6 /* Info.plist */, ); path = SPMProject; sourceTree = ""; }; - 9EC29476242CEA8800D970DB /* SPMProjectTests */ = { + 61C363EF24374D6100C4D4E6 /* SPMProjectTests */ = { isa = PBXGroup; children = ( - 9EC29477242CEA8800D970DB /* SPMProjectTests.swift */, - 9EC29479242CEA8800D970DB /* Info.plist */, + 61C363F024374D6100C4D4E6 /* SPMProjectTests.swift */, + 61C363F224374D6100C4D4E6 /* Info.plist */, ); path = SPMProjectTests; sourceTree = ""; }; - 9EC29481242CEA8800D970DB /* SPMProjectUITests */ = { + 61C363FA24374D6100C4D4E6 /* SPMProjectUITests */ = { isa = PBXGroup; children = ( - 9EC29482242CEA8800D970DB /* SPMProjectUITests.swift */, - 9EC29484242CEA8800D970DB /* Info.plist */, + 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */, + 61C363FD24374D6100C4D4E6 /* Info.plist */, ); path = SPMProjectUITests; sourceTree = ""; @@ -139,14 +130,13 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 9EC29457242CEA8800D970DB /* SPMProject */ = { + 61C363D524374D5F00C4D4E6 /* SPMProject */ = { isa = PBXNativeTarget; - buildConfigurationList = 9EC29487242CEA8800D970DB /* Build configuration list for PBXNativeTarget "SPMProject" */; + buildConfigurationList = 61C3640024374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProject" */; buildPhases = ( - 9EC29454242CEA8800D970DB /* Sources */, - 9EC29455242CEA8800D970DB /* Frameworks */, - 9EC29456242CEA8800D970DB /* Resources */, - 9E54E98A242D0932007FE632 /* Run Linter */, + 61C363D224374D5F00C4D4E6 /* Sources */, + 61C363D324374D5F00C4D4E6 /* Frameworks */, + 61C363D424374D5F00C4D4E6 /* Resources */, ); buildRules = ( ); @@ -154,72 +144,72 @@ ); name = SPMProject; packageProductDependencies = ( - 9EC29491242CEAA000D970DB /* Datadog */, + 61C3640A24374DF200C4D4E6 /* Datadog */, ); productName = SPMProject; - productReference = 9EC29458242CEA8800D970DB /* SPMProject.app */; + productReference = 61C363D624374D5F00C4D4E6 /* SPMProject.app */; productType = "com.apple.product-type.application"; }; - 9EC29472242CEA8800D970DB /* SPMProjectTests */ = { + 61C363EB24374D6100C4D4E6 /* SPMProjectTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 9EC2948A242CEA8800D970DB /* Build configuration list for PBXNativeTarget "SPMProjectTests" */; + buildConfigurationList = 61C3640324374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectTests" */; buildPhases = ( - 9EC2946F242CEA8800D970DB /* Sources */, - 9EC29470242CEA8800D970DB /* Frameworks */, - 9EC29471242CEA8800D970DB /* Resources */, + 61C363E824374D6100C4D4E6 /* Sources */, + 61C363E924374D6100C4D4E6 /* Frameworks */, + 61C363EA24374D6100C4D4E6 /* Resources */, ); buildRules = ( ); dependencies = ( - 9EC29475242CEA8800D970DB /* PBXTargetDependency */, + 61C363EE24374D6100C4D4E6 /* PBXTargetDependency */, ); name = SPMProjectTests; productName = SPMProjectTests; - productReference = 9EC29473242CEA8800D970DB /* SPMProjectTests.xctest */; + productReference = 61C363EC24374D6100C4D4E6 /* SPMProjectTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 9EC2947D242CEA8800D970DB /* SPMProjectUITests */ = { + 61C363F624374D6100C4D4E6 /* SPMProjectUITests */ = { isa = PBXNativeTarget; - buildConfigurationList = 9EC2948D242CEA8800D970DB /* Build configuration list for PBXNativeTarget "SPMProjectUITests" */; + buildConfigurationList = 61C3640624374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectUITests" */; buildPhases = ( - 9EC2947A242CEA8800D970DB /* Sources */, - 9EC2947B242CEA8800D970DB /* Frameworks */, - 9EC2947C242CEA8800D970DB /* Resources */, + 61C363F324374D6100C4D4E6 /* Sources */, + 61C363F424374D6100C4D4E6 /* Frameworks */, + 61C363F524374D6100C4D4E6 /* Resources */, ); buildRules = ( ); dependencies = ( - 9EC29480242CEA8800D970DB /* PBXTargetDependency */, + 61C363F924374D6100C4D4E6 /* PBXTargetDependency */, ); name = SPMProjectUITests; productName = SPMProjectUITests; - productReference = 9EC2947E242CEA8800D970DB /* SPMProjectUITests.xctest */; + productReference = 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 9EC29450242CEA8800D970DB /* Project object */ = { + 61C363CE24374D5F00C4D4E6 /* Project object */ = { isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1140; LastUpgradeCheck = 1140; ORGANIZATIONNAME = Datadog; TargetAttributes = { - 9EC29457242CEA8800D970DB = { + 61C363D524374D5F00C4D4E6 = { CreatedOnToolsVersion = 11.4; }; - 9EC29472242CEA8800D970DB = { + 61C363EB24374D6100C4D4E6 = { CreatedOnToolsVersion = 11.4; - TestTargetID = 9EC29457242CEA8800D970DB; + TestTargetID = 61C363D524374D5F00C4D4E6; }; - 9EC2947D242CEA8800D970DB = { + 61C363F624374D6100C4D4E6 = { CreatedOnToolsVersion = 11.4; - TestTargetID = 9EC29457242CEA8800D970DB; + TestTargetID = 61C363D524374D5F00C4D4E6; }; }; }; - buildConfigurationList = 9EC29453242CEA8800D970DB /* Build configuration list for PBXProject "SPMProject" */; + buildConfigurationList = 61C363D124374D5F00C4D4E6 /* Build configuration list for PBXProject "SPMProject" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -227,40 +217,39 @@ en, Base, ); - mainGroup = 9EC2944F242CEA8800D970DB; + mainGroup = 61C363CD24374D5F00C4D4E6; packageReferences = ( - 9EC29490242CEAA000D970DB /* XCRemoteSwiftPackageReference "dd-sdk-ios" */, + 61C3640924374DF200C4D4E6 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */, ); - productRefGroup = 9EC29459242CEA8800D970DB /* Products */; + productRefGroup = 61C363D724374D5F00C4D4E6 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 9EC29457242CEA8800D970DB /* SPMProject */, - 9EC29472242CEA8800D970DB /* SPMProjectTests */, - 9EC2947D242CEA8800D970DB /* SPMProjectUITests */, + 61C363D524374D5F00C4D4E6 /* SPMProject */, + 61C363EB24374D6100C4D4E6 /* SPMProjectTests */, + 61C363F624374D6100C4D4E6 /* SPMProjectUITests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 9EC29456242CEA8800D970DB /* Resources */ = { + 61C363D424374D5F00C4D4E6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9EC2946D242CEA8800D970DB /* LaunchScreen.storyboard in Resources */, - 9EC2946A242CEA8800D970DB /* Assets.xcassets in Resources */, - 9EC29468242CEA8800D970DB /* Main.storyboard in Resources */, + 61C363E624374D6000C4D4E6 /* LaunchScreen.storyboard in Resources */, + 61C363E124374D5F00C4D4E6 /* Main.storyboard in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 9EC29471242CEA8800D970DB /* Resources */ = { + 61C363EA24374D6100C4D4E6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; - 9EC2947C242CEA8800D970DB /* Resources */ = { + 61C363F524374D6100C4D4E6 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( @@ -269,85 +258,61 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 9E54E98A242D0932007FE632 /* Run Linter */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Run Linter"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n cd ${SOURCE_ROOT}/../../\n ./tools/lint/run-linter.sh\nfi\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ - 9EC29454242CEA8800D970DB /* Sources */ = { + 61C363D224374D5F00C4D4E6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9EC29463242CEA8800D970DB /* MasterViewController.swift in Sources */, - 9EC2945F242CEA8800D970DB /* SPMProject.xcdatamodeld in Sources */, - 9EC29465242CEA8800D970DB /* DetailViewController.swift in Sources */, - 9EC2945C242CEA8800D970DB /* AppDelegate.swift in Sources */, - 9EC29461242CEA8800D970DB /* SceneDelegate.swift in Sources */, + 61C363DE24374D5F00C4D4E6 /* ViewController.swift in Sources */, + 61C363DA24374D5F00C4D4E6 /* AppDelegate.swift in Sources */, + 61C363DC24374D5F00C4D4E6 /* SceneDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 9EC2946F242CEA8800D970DB /* Sources */ = { + 61C363E824374D6100C4D4E6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9EC29478242CEA8800D970DB /* SPMProjectTests.swift in Sources */, + 61C363F124374D6100C4D4E6 /* SPMProjectTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 9EC2947A242CEA8800D970DB /* Sources */ = { + 61C363F324374D6100C4D4E6 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9EC29483242CEA8800D970DB /* SPMProjectUITests.swift in Sources */, + 61C363FC24374D6100C4D4E6 /* SPMProjectUITests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 9EC29475242CEA8800D970DB /* PBXTargetDependency */ = { + 61C363EE24374D6100C4D4E6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 9EC29457242CEA8800D970DB /* SPMProject */; - targetProxy = 9EC29474242CEA8800D970DB /* PBXContainerItemProxy */; + target = 61C363D524374D5F00C4D4E6 /* SPMProject */; + targetProxy = 61C363ED24374D6100C4D4E6 /* PBXContainerItemProxy */; }; - 9EC29480242CEA8800D970DB /* PBXTargetDependency */ = { + 61C363F924374D6100C4D4E6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 9EC29457242CEA8800D970DB /* SPMProject */; - targetProxy = 9EC2947F242CEA8800D970DB /* PBXContainerItemProxy */; + target = 61C363D524374D5F00C4D4E6 /* SPMProject */; + targetProxy = 61C363F824374D6100C4D4E6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 9EC29466242CEA8800D970DB /* Main.storyboard */ = { + 61C363DF24374D5F00C4D4E6 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( - 9EC29467242CEA8800D970DB /* Base */, + 61C363E024374D5F00C4D4E6 /* Base */, ); name = Main.storyboard; sourceTree = ""; }; - 9EC2946B242CEA8800D970DB /* LaunchScreen.storyboard */ = { + 61C363E424374D6000C4D4E6 /* LaunchScreen.storyboard */ = { isa = PBXVariantGroup; children = ( - 9EC2946C242CEA8800D970DB /* Base */, + 61C363E524374D6000C4D4E6 /* Base */, ); name = LaunchScreen.storyboard; sourceTree = ""; @@ -355,7 +320,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 9EC29485242CEA8800D970DB /* Debug */ = { + 61C363FE24374D6100C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -405,7 +370,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -415,7 +380,7 @@ }; name = Debug; }; - 9EC29486242CEA8800D970DB /* Release */ = { + 61C363FF24374D6100C4D4E6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -459,7 +424,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -469,7 +434,7 @@ }; name = Release; }; - 9EC29488242CEA8800D970DB /* Debug */ = { + 61C3640124374D6100C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -486,7 +451,7 @@ }; name = Debug; }; - 9EC29489242CEA8800D970DB /* Release */ = { + 61C3640224374D6100C4D4E6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; @@ -503,7 +468,7 @@ }; name = Release; }; - 9EC2948B242CEA8800D970DB /* Debug */ = { + 61C3640424374D6100C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -524,7 +489,7 @@ }; name = Debug; }; - 9EC2948C242CEA8800D970DB /* Release */ = { + 61C3640524374D6100C4D4E6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -545,7 +510,7 @@ }; name = Release; }; - 9EC2948E242CEA8800D970DB /* Debug */ = { + 61C3640724374D6100C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -564,7 +529,7 @@ }; name = Debug; }; - 9EC2948F242CEA8800D970DB /* Release */ = { + 61C3640824374D6100C4D4E6 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; @@ -586,38 +551,38 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 9EC29453242CEA8800D970DB /* Build configuration list for PBXProject "SPMProject" */ = { + 61C363D124374D5F00C4D4E6 /* Build configuration list for PBXProject "SPMProject" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9EC29485242CEA8800D970DB /* Debug */, - 9EC29486242CEA8800D970DB /* Release */, + 61C363FE24374D6100C4D4E6 /* Debug */, + 61C363FF24374D6100C4D4E6 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9EC29487242CEA8800D970DB /* Build configuration list for PBXNativeTarget "SPMProject" */ = { + 61C3640024374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProject" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9EC29488242CEA8800D970DB /* Debug */, - 9EC29489242CEA8800D970DB /* Release */, + 61C3640124374D6100C4D4E6 /* Debug */, + 61C3640224374D6100C4D4E6 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9EC2948A242CEA8800D970DB /* Build configuration list for PBXNativeTarget "SPMProjectTests" */ = { + 61C3640324374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9EC2948B242CEA8800D970DB /* Debug */, - 9EC2948C242CEA8800D970DB /* Release */, + 61C3640424374D6100C4D4E6 /* Debug */, + 61C3640524374D6100C4D4E6 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 9EC2948D242CEA8800D970DB /* Build configuration list for PBXNativeTarget "SPMProjectUITests" */ = { + 61C3640624374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectUITests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 9EC2948E242CEA8800D970DB /* Debug */, - 9EC2948F242CEA8800D970DB /* Release */, + 61C3640724374D6100C4D4E6 /* Debug */, + 61C3640824374D6100C4D4E6 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -625,9 +590,9 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 9EC29490242CEAA000D970DB /* XCRemoteSwiftPackageReference "dd-sdk-ios" */ = { + 61C3640924374DF200C4D4E6 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/DataDog/dd-sdk-ios/"; + repositoryURL = "https://github.com/DataDog/dd-sdk-ios"; requirement = { branch = master; kind = branch; @@ -636,25 +601,12 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 9EC29491242CEAA000D970DB /* Datadog */ = { + 61C3640A24374DF200C4D4E6 /* Datadog */ = { isa = XCSwiftPackageProductDependency; - package = 9EC29490242CEAA000D970DB /* XCRemoteSwiftPackageReference "dd-sdk-ios" */; + package = 61C3640924374DF200C4D4E6 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */; productName = Datadog; }; /* End XCSwiftPackageProductDependency section */ - -/* Begin XCVersionGroup section */ - 9EC2945D242CEA8800D970DB /* SPMProject.xcdatamodeld */ = { - isa = XCVersionGroup; - children = ( - 9EC2945E242CEA8800D970DB /* SPMProject.xcdatamodel */, - ); - currentVersion = 9EC2945E242CEA8800D970DB /* SPMProject.xcdatamodel */; - path = SPMProject.xcdatamodeld; - sourceTree = ""; - versionGroupType = wrapper.xcdatamodel; - }; -/* End XCVersionGroup section */ }; - rootObject = 9EC29450242CEA8800D970DB /* Project object */; + rootObject = 61C363CE24374D5F00C4D4E6 /* Project object */; } diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000000..d6c2e5ebea --- /dev/null +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,16 @@ +{ + "object": { + "pins": [ + { + "package": "Datadog", + "repositoryURL": "https://github.com/DataDog/dd-sdk-ios", + "state": { + "branch": "master", + "revision": "44f013c0e2ce8c00c70afaeef309ff33a1cef205", + "version": null + } + } + ] + }, + "version": 1 +} diff --git a/dependency-manager-tests/spm/SPMProject/AppDelegate.swift b/dependency-manager-tests/spm/SPMProject/AppDelegate.swift index 863268de9d..c8ded5126a 100644 --- a/dependency-manager-tests/spm/SPMProject/AppDelegate.swift +++ b/dependency-manager-tests/spm/SPMProject/AppDelegate.swift @@ -5,74 +5,19 @@ */ import UIKit -import CoreData - -import Datadog @UIApplicationMain -internal class AppDelegate: UIResponder, UIApplicationDelegate { +class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - // Override point for customization after application launch. return true } // MARK: UISceneSession Lifecycle - @available(iOS 13.0, *) func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { - // Called when a new scene session is being created. - // Use this method to select a configuration to create the new scene with. return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) } - @available(iOS 13.0, *) func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { - // Called when the user discards a scene session. - // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions. - // Use this method to release any resources that were specific to the discarded scenes, as they will not return. - } - - // MARK: - Core Data stack - - lazy var persistentContainer: NSPersistentContainer = { - /* - The persistent container for the application. This implementation - creates and returns a container, having loaded the store for the - application to it. This property is optional since there are legitimate - error conditions that could cause the creation of the store to fail. - */ - let container = NSPersistentContainer(name: "SPMProject") - container.loadPersistentStores { storeDescription, error in - if let error = error as NSError? { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - /* - Typical reasons for an error here include: - * The parent directory does not exist, cannot be created, or disallows writing. - * The persistent store is not accessible, due to permissions or data protection when the device is locked. - * The device is out of space. - * The store could not be migrated to the current model version. - Check the error message to determine what the actual problem was. - */ - fatalError("Unresolved error \(error), \(error.userInfo)") - } - } - return container - }() - - // MARK: - Core Data Saving support - - func saveContext () { - let context = persistentContainer.viewContext - if context.hasChanges { - do { - try context.save() - } catch { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - let nserror = error as NSError - fatalError("Unresolved error \(nserror), \(nserror.userInfo)") - } - } } } diff --git a/dependency-manager-tests/spm/SPMProject/Assets.xcassets/AppIcon.appiconset/Contents.json b/dependency-manager-tests/spm/SPMProject/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 9221b9bb1a..0000000000 --- a/dependency-manager-tests/spm/SPMProject/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/dependency-manager-tests/spm/SPMProject/Assets.xcassets/Contents.json b/dependency-manager-tests/spm/SPMProject/Assets.xcassets/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/dependency-manager-tests/spm/SPMProject/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard b/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard index a504101667..25a763858e 100644 --- a/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard +++ b/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard @@ -1,133 +1,24 @@ - + - + - - + + - - - - - - - - - - - - - - - - - + + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - diff --git a/dependency-manager-tests/spm/SPMProject/DetailViewController.swift b/dependency-manager-tests/spm/SPMProject/DetailViewController.swift deleted file mode 100644 index f25bd2ac19..0000000000 --- a/dependency-manager-tests/spm/SPMProject/DetailViewController.swift +++ /dev/null @@ -1,34 +0,0 @@ -/* -* 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 UIKit - -internal class DetailViewController: UIViewController { - @IBOutlet weak var detailDescriptionLabel: UILabel! - - func configureView() { - // Update the user interface for the detail item. - if let detail = detailItem { - if let label = detailDescriptionLabel, - let timestamp = detail.timestamp { - label.text = timestamp.description - } - } - } - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view. - configureView() - } - - var detailItem: Event? { - didSet { - // Update the view. - configureView() - } - } -} diff --git a/dependency-manager-tests/spm/SPMProject/Info.plist b/dependency-manager-tests/spm/SPMProject/Info.plist index e7f6f585ee..2a3483c0d2 100644 --- a/dependency-manager-tests/spm/SPMProject/Info.plist +++ b/dependency-manager-tests/spm/SPMProject/Info.plist @@ -47,16 +47,6 @@ armv7 - UIStatusBarTintParameters - - UINavigationBar - - Style - UIBarStyleDefault - Translucent - - - UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/dependency-manager-tests/spm/SPMProject/MasterViewController.swift b/dependency-manager-tests/spm/SPMProject/MasterViewController.swift deleted file mode 100644 index 70b99e9b20..0000000000 --- a/dependency-manager-tests/spm/SPMProject/MasterViewController.swift +++ /dev/null @@ -1,174 +0,0 @@ -/* -* 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 UIKit -import CoreData - -internal class MasterViewController: UITableViewController, NSFetchedResultsControllerDelegate { - var detailViewController: DetailViewController? = nil - var managedObjectContext: NSManagedObjectContext! = nil // swiftlint:disable:this implicitly_unwrapped_optional - - override func viewDidLoad() { - super.viewDidLoad() - // Do any additional setup after loading the view. - navigationItem.leftBarButtonItem = editButtonItem - - let addButton = UIBarButtonItem(barButtonSystemItem: .add, target: self, action: #selector(insertNewObject(_:))) - navigationItem.rightBarButtonItem = addButton - if let split = splitViewController { - let controllers = split.viewControllers - detailViewController = (controllers[controllers.count - 1] as! UINavigationController).topViewController as? DetailViewController // swiftlint:disable:this force_cast - } - } - - override func viewWillAppear(_ animated: Bool) { - clearsSelectionOnViewWillAppear = splitViewController?.isCollapsed ?? false - super.viewWillAppear(animated) - } - - @objc - func insertNewObject(_ sender: Any) { - let context = self.fetchedResultsController.managedObjectContext - let newEvent = Event(context: context) - // If appropriate, configure the new managed object. - newEvent.timestamp = Date() - - // Save the context. - do { - try context.save() - } catch { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - let nserror = error as NSError - fatalError("Unresolved error \(nserror), \(nserror.userInfo)") - } - } - - // MARK: - Segues - - override func prepare(for segue: UIStoryboardSegue, sender: Any?) { - if segue.identifier == "showDetail" { - if let indexPath = tableView.indexPathForSelectedRow { - let object = fetchedResultsController.object(at: indexPath) - let controller = (segue.destination as! UINavigationController).topViewController as! DetailViewController // swiftlint:disable:this force_cast - controller.detailItem = object - controller.navigationItem.leftBarButtonItem = splitViewController?.displayModeButtonItem - controller.navigationItem.leftItemsSupplementBackButton = true - detailViewController = controller - } - } - } - - // MARK: - Table View - - override func numberOfSections(in tableView: UITableView) -> Int { - return fetchedResultsController.sections?.count ?? 0 - } - - override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { - let sectionInfo = fetchedResultsController.sections?[section] - return sectionInfo?.numberOfObjects ?? 0 - } - - override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { - let cell = tableView.dequeueReusableCell(withIdentifier: "Cell", for: indexPath) - let event = fetchedResultsController.object(at: indexPath) - configureCell(cell, withEvent: event) - return cell - } - - override func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { - // Return false if you do not want the specified item to be editable. - return true - } - - override func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) { - if editingStyle == .delete { - let context = fetchedResultsController.managedObjectContext - context.delete(fetchedResultsController.object(at: indexPath)) - do { - try context.save() - } catch { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - let nserror = error as NSError - fatalError("Unresolved error \(nserror), \(nserror.userInfo)") - } - } - } - - func configureCell(_ cell: UITableViewCell, withEvent event: Event) { - cell.textLabel?.text = event.timestamp?.description ?? "nil" - } - - // MARK: - Fetched results controller - - lazy var fetchedResultsController: NSFetchedResultsController = { - let fetchRequest: NSFetchRequest = Event.fetchRequest() - // Set the batch size to a suitable number. - fetchRequest.fetchBatchSize = 20 - // Edit the sort key as appropriate. - let sortDescriptor = NSSortDescriptor(key: "timestamp", ascending: false) - fetchRequest.sortDescriptors = [sortDescriptor] - // Edit the section name key path and cache name if appropriate. - // nil for section name key path means "no sections". - let aFetchedResultsController = NSFetchedResultsController(fetchRequest: fetchRequest, managedObjectContext: self.managedObjectContext, sectionNameKeyPath: nil, cacheName: "Master") - aFetchedResultsController.delegate = self - do { - try aFetchedResultsController.performFetch() - } catch { - // Replace this implementation with code to handle the error appropriately. - // fatalError() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development. - let nserror = error as NSError - fatalError("Unresolved error \(nserror), \(nserror.userInfo)") - } - return aFetchedResultsController - }() - - func controllerWillChangeContent(_ controller: NSFetchedResultsController) { - tableView.beginUpdates() - } - - func controller(_ controller: NSFetchedResultsController, didChange sectionInfo: NSFetchedResultsSectionInfo, atSectionIndex sectionIndex: Int, for type: NSFetchedResultsChangeType) { - switch type { - case .insert: - tableView.insertSections(IndexSet(integer: sectionIndex), with: .fade) - case .delete: - tableView.deleteSections(IndexSet(integer: sectionIndex), with: .fade) - default: - return - } - } - - func controllerDidChangeContent(_ controller: NSFetchedResultsController) { - tableView.endUpdates() - } - - /* - func controller(_ controller: NSFetchedResultsController, didChange anObject: Any, at indexPath: IndexPath?, for type: NSFetchedResultsChangeType, newIndexPath: IndexPath?) { - switch type { - case .insert: - tableView.insertRows(at: [newIndexPath!], with: .fade) - case .delete: - tableView.deleteRows(at: [indexPath!], with: .fade) - case .update: - configureCell(tableView.cellForRow(at: indexPath!)!, withEvent: anObject as! Event) - case .move: - configureCell(tableView.cellForRow(at: indexPath!)!, withEvent: anObject as! Event) - tableView.moveRow(at: indexPath!, to: newIndexPath!) - default: - return - } - } - - // Implementing the above methods to update the table view in response to individual changes may have performance implications if a large number of changes are made simultaneously. If this proves to be an issue, you can instead just implement controllerDidChangeContent: which notifies the delegate that all section and object changes have been processed. - - func controllerDidChangeContent(controller: NSFetchedResultsController) { - // In the simplest, most efficient, case, reload the table view. - tableView.reloadData() - } - */ -} diff --git a/dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/.xccurrentversion b/dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/.xccurrentversion deleted file mode 100644 index 15d00521f4..0000000000 --- a/dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/.xccurrentversion +++ /dev/null @@ -1,8 +0,0 @@ - - - - - _XCCurrentVersionName - SPMProject.xcdatamodel - - diff --git a/dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/SPMProject.xcdatamodel/contents b/dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/SPMProject.xcdatamodel/contents deleted file mode 100644 index f9b114fedf..0000000000 --- a/dependency-manager-tests/spm/SPMProject/SPMProject.xcdatamodeld/SPMProject.xcdatamodel/contents +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift b/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift index 33fd65798d..36001ae61f 100644 --- a/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift +++ b/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift @@ -6,70 +6,25 @@ import UIKit -@available(iOS 13.0, *) -internal class SceneDelegate: UIResponder, UIWindowSceneDelegate, UISplitViewControllerDelegate { +class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow? func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - // Use this method to optionally configure and attach the UIWindow `window` to the provided UIWindowScene `scene`. - // If using a storyboard, the `window` property will automatically be initialized and attached to the scene. - // This delegate does not imply the connecting scene or session are new (see `application:configurationForConnectingSceneSession` instead). - guard let window = window, - let splitViewController = window.rootViewController as? UISplitViewController, - let navigationController = splitViewController.viewControllers.last as? UINavigationController, - let masterNavigationController = splitViewController.viewControllers[0] as? UINavigationController, - let controller = masterNavigationController.topViewController as? MasterViewController else { - return - } - navigationController.topViewController?.navigationItem.leftBarButtonItem = splitViewController.displayModeButtonItem - navigationController.topViewController?.navigationItem.leftItemsSupplementBackButton = true - splitViewController.delegate = self - - controller.managedObjectContext = (UIApplication.shared.delegate as? AppDelegate)?.persistentContainer.viewContext + guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_ scene: UIScene) { - // Called as the scene is being released by the system. - // This occurs shortly after the scene enters the background, or when its session is discarded. - // Release any resources associated with this scene that can be re-created the next time the scene connects. - // The scene may re-connect later, as its session was not neccessarily discarded (see `application:didDiscardSceneSessions` instead). } func sceneDidBecomeActive(_ scene: UIScene) { - // Called when the scene has moved from an inactive state to an active state. - // Use this method to restart any tasks that were paused (or not yet started) when the scene was inactive. } func sceneWillResignActive(_ scene: UIScene) { - // Called when the scene will move from an active state to an inactive state. - // This may occur due to temporary interruptions (ex. an incoming phone call). } func sceneWillEnterForeground(_ scene: UIScene) { - // Called as the scene transitions from the background to the foreground. - // Use this method to undo the changes made on entering the background. } func sceneDidEnterBackground(_ scene: UIScene) { - // Called as the scene transitions from the foreground to the background. - // Use this method to save data, release shared resources, and store enough scene-specific state information - // to restore the scene back to its current state. - - // Save changes in the application's managed object context when the application transitions to the background. - (UIApplication.shared.delegate as? AppDelegate)?.saveContext() - } - - // MARK: - Split view - - func splitViewController(_ splitViewController: UISplitViewController, collapseSecondary secondaryViewController: UIViewController, onto primaryViewController: UIViewController) -> Bool { - guard let secondaryAsNavController = secondaryViewController as? UINavigationController, - let topAsDetailController = secondaryAsNavController.topViewController as? DetailViewController else { - return false - } - if topAsDetailController.detailItem == nil { - // Return true to indicate that we have handled the collapse by doing nothing; the secondary controller will be discarded. - return true - } - return false } } diff --git a/dependency-manager-tests/spm/SPMProject/ViewController.swift b/dependency-manager-tests/spm/SPMProject/ViewController.swift new file mode 100644 index 0000000000..9021495b9d --- /dev/null +++ b/dependency-manager-tests/spm/SPMProject/ViewController.swift @@ -0,0 +1,13 @@ +/* +* 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 UIKit + +class ViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + } +} diff --git a/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift b/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift index 06cf16f052..d45c9456e1 100644 --- a/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift +++ b/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift @@ -8,11 +8,6 @@ import XCTest @testable import SPMProject class SPMProjectTests: XCTestCase { - override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in the class. - } - - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in the class. + func testExample() throws { } } diff --git a/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift b/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift index 9db9bcef4b..2b496c02e3 100644 --- a/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift +++ b/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift @@ -7,26 +7,8 @@ import XCTest class SPMProjectUITests: XCTestCase { - override func setUp() { - self.continueAfterFailure = false - print("Setup...") - } - func testExample() throws { - // UI tests must launch the application that they test. let app = XCUIApplication() app.launch() - - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testLaunchPerformance() throws { - if #available(macOS 10.15, iOS 13.0, tvOS 13.0, *) { - // This measures how long it takes to launch your application. - measure(metrics: [XCTOSSignpostMetric.applicationLaunch]) { - XCUIApplication().launch() - } - } } } From d30398f8873f6497aa3a35eb185adcd858fa9d92 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 13:30:37 +0200 Subject: [PATCH 02/15] RUMM-346 Create CTProject app project --- bitrise.yml | 17 +- dependency-manager-tests/carthage/.gitignore | 2 + .../CTProject.xcodeproj/project.pbxproj | 645 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../carthage/CTProject/AppDelegate.swift | 23 + .../Base.lproj/LaunchScreen.storyboard | 25 + .../CTProject/Base.lproj/Main.storyboard | 24 + .../carthage/CTProject/Info.plist | 64 ++ .../carthage/CTProject/SceneDelegate.swift | 30 + .../carthage/CTProject/ViewController.swift | 13 + .../CTProjectTests/CTProjectTests.swift | 13 + .../carthage/CTProjectTests/Info.plist | 22 + .../CTProjectUITests/CTProjectUITests.swift | 14 + .../carthage/CTProjectUITests/Info.plist | 22 + dependency-manager-tests/carthage/Makefile | 4 +- dependency-manager-tests/cocoapods/.gitignore | 2 + 17 files changed, 928 insertions(+), 7 deletions(-) create mode 100644 dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj create mode 100644 dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 dependency-manager-tests/carthage/CTProject/AppDelegate.swift create mode 100644 dependency-manager-tests/carthage/CTProject/Base.lproj/LaunchScreen.storyboard create mode 100644 dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard create mode 100644 dependency-manager-tests/carthage/CTProject/Info.plist create mode 100644 dependency-manager-tests/carthage/CTProject/SceneDelegate.swift create mode 100644 dependency-manager-tests/carthage/CTProject/ViewController.swift create mode 100644 dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift create mode 100644 dependency-manager-tests/carthage/CTProjectTests/Info.plist create mode 100644 dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift create mode 100644 dependency-manager-tests/carthage/CTProjectUITests/Info.plist diff --git a/bitrise.yml b/bitrise.yml index 477707af47..886162e906 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -144,13 +144,13 @@ workflows: set -e make test-spm ci=true - xcode-test: - title: Run SPMProject UITests + title: Run SPMProject tests inputs: - scheme: SPMProject - is_clean_build: 'yes' - cache_level: none - project_path: "$BITRISE_SOURCE_DIR/dependency-manager-tests/spm/SPMProject.xcodeproj" - - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/SPMProject-ui-tests.html" + - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/SPMProject-tests.html" - script@1.1.6: title: Test Carthage compatibility inputs: @@ -158,7 +158,14 @@ workflows: #!/usr/bin/env bash set -e make test-carthage ci=true - # TODO: RUMM-334 add UITests for Carthage project + - xcode-test: + title: Run CTProject tests + inputs: + - scheme: CTProject + - is_clean_build: 'yes' + - cache_level: none + - project_path: "$BITRISE_SOURCE_DIR/dependency-manager-tests/carthage/CTProject.xcodeproj" + - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/CTProject-tests.html" - script@1.1.6: title: Test Cocoapods compatibility inputs: @@ -167,13 +174,13 @@ workflows: set -e make test-cocoapods ci=true - xcode-test: - title: Run CPProject UITests + title: Run CPProject tests inputs: - scheme: CPProject - 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-ui-tests.html" + - xcpretty_test_options: --color --report html --output "${BITRISE_DEPLOY_DIR}/CPProject-tests.html" check_example_projects: description: |- diff --git a/dependency-manager-tests/carthage/.gitignore b/dependency-manager-tests/carthage/.gitignore index b66653019c..1192aba2b8 100644 --- a/dependency-manager-tests/carthage/.gitignore +++ b/dependency-manager-tests/carthage/.gitignore @@ -1,4 +1,6 @@ .DS_Store +/.build +xcuserdata/ /Carthage # Ignore `Cartfile.resolved` and `Cartfile` as they will be re-created for every test run. diff --git a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..119d106326 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj @@ -0,0 +1,645 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 61C36419243752A500C4D4E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C36418243752A500C4D4E6 /* AppDelegate.swift */; }; + 61C3641B243752A500C4D4E6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C3641A243752A500C4D4E6 /* SceneDelegate.swift */; }; + 61C3641D243752A500C4D4E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C3641C243752A500C4D4E6 /* ViewController.swift */; }; + 61C36420243752A500C4D4E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C3641E243752A500C4D4E6 /* Main.storyboard */; }; + 61C36425243752A600C4D4E6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C36423243752A600C4D4E6 /* LaunchScreen.storyboard */; }; + 61C36430243752A600C4D4E6 /* CTProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C3642F243752A600C4D4E6 /* CTProjectTests.swift */; }; + 61C3643B243752A600C4D4E6 /* CTProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C3643A243752A600C4D4E6 /* CTProjectUITests.swift */; }; + 61C3644B2437547A00C4D4E6 /* Datadog.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61C3644A2437547A00C4D4E6 /* Datadog.framework */; }; + 61C3644C2437547A00C4D4E6 /* Datadog.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 61C3644A2437547A00C4D4E6 /* Datadog.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 61C3642C243752A600C4D4E6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61C3640D243752A500C4D4E6 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61C36414243752A500C4D4E6; + remoteInfo = CTProject; + }; + 61C36437243752A600C4D4E6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61C3640D243752A500C4D4E6 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61C36414243752A500C4D4E6; + remoteInfo = CTProject; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 61C3644D2437547A00C4D4E6 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 61C3644C2437547A00C4D4E6 /* Datadog.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 61C36415243752A500C4D4E6 /* CTProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CTProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C36418243752A500C4D4E6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 61C3641A243752A500C4D4E6 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 61C3641C243752A500C4D4E6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 61C3641F243752A500C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 61C36424243752A600C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 61C36426243752A600C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C3642B243752A600C4D4E6 /* CTProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CTProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C3642F243752A600C4D4E6 /* CTProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CTProjectTests.swift; sourceTree = ""; }; + 61C36431243752A600C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C36436243752A600C4D4E6 /* CTProjectUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CTProjectUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C3643A243752A600C4D4E6 /* CTProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CTProjectUITests.swift; sourceTree = ""; }; + 61C3643C243752A600C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C3644A2437547A00C4D4E6 /* Datadog.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Datadog.framework; path = Carthage/Build/iOS/Datadog.framework; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 61C36412243752A500C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C3644B2437547A00C4D4E6 /* Datadog.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C36428243752A600C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C36433243752A600C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 61C3640C243752A500C4D4E6 = { + isa = PBXGroup; + children = ( + 61C36417243752A500C4D4E6 /* CTProject */, + 61C3642E243752A600C4D4E6 /* CTProjectTests */, + 61C36439243752A600C4D4E6 /* CTProjectUITests */, + 61C36416243752A500C4D4E6 /* Products */, + 61C364492437547A00C4D4E6 /* Frameworks */, + ); + sourceTree = ""; + }; + 61C36416243752A500C4D4E6 /* Products */ = { + isa = PBXGroup; + children = ( + 61C36415243752A500C4D4E6 /* CTProject.app */, + 61C3642B243752A600C4D4E6 /* CTProjectTests.xctest */, + 61C36436243752A600C4D4E6 /* CTProjectUITests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 61C36417243752A500C4D4E6 /* CTProject */ = { + isa = PBXGroup; + children = ( + 61C36418243752A500C4D4E6 /* AppDelegate.swift */, + 61C3641A243752A500C4D4E6 /* SceneDelegate.swift */, + 61C3641C243752A500C4D4E6 /* ViewController.swift */, + 61C3641E243752A500C4D4E6 /* Main.storyboard */, + 61C36423243752A600C4D4E6 /* LaunchScreen.storyboard */, + 61C36426243752A600C4D4E6 /* Info.plist */, + ); + path = CTProject; + sourceTree = ""; + }; + 61C3642E243752A600C4D4E6 /* CTProjectTests */ = { + isa = PBXGroup; + children = ( + 61C3642F243752A600C4D4E6 /* CTProjectTests.swift */, + 61C36431243752A600C4D4E6 /* Info.plist */, + ); + path = CTProjectTests; + sourceTree = ""; + }; + 61C36439243752A600C4D4E6 /* CTProjectUITests */ = { + isa = PBXGroup; + children = ( + 61C3643A243752A600C4D4E6 /* CTProjectUITests.swift */, + 61C3643C243752A600C4D4E6 /* Info.plist */, + ); + path = CTProjectUITests; + sourceTree = ""; + }; + 61C364492437547A00C4D4E6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 61C3644A2437547A00C4D4E6 /* Datadog.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 61C36414243752A500C4D4E6 /* CTProject */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C3643F243752A600C4D4E6 /* Build configuration list for PBXNativeTarget "CTProject" */; + buildPhases = ( + 61C36411243752A500C4D4E6 /* Sources */, + 61C36412243752A500C4D4E6 /* Frameworks */, + 61C36413243752A500C4D4E6 /* Resources */, + 61C364482437544F00C4D4E6 /* ⚙️ Carthage */, + 61C3644D2437547A00C4D4E6 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = CTProject; + productName = CTProject; + productReference = 61C36415243752A500C4D4E6 /* CTProject.app */; + productType = "com.apple.product-type.application"; + }; + 61C3642A243752A600C4D4E6 /* CTProjectTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C36442243752A600C4D4E6 /* Build configuration list for PBXNativeTarget "CTProjectTests" */; + buildPhases = ( + 61C36427243752A600C4D4E6 /* Sources */, + 61C36428243752A600C4D4E6 /* Frameworks */, + 61C36429243752A600C4D4E6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61C3642D243752A600C4D4E6 /* PBXTargetDependency */, + ); + name = CTProjectTests; + productName = CTProjectTests; + productReference = 61C3642B243752A600C4D4E6 /* CTProjectTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 61C36435243752A600C4D4E6 /* CTProjectUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C36445243752A600C4D4E6 /* Build configuration list for PBXNativeTarget "CTProjectUITests" */; + buildPhases = ( + 61C36432243752A600C4D4E6 /* Sources */, + 61C36433243752A600C4D4E6 /* Frameworks */, + 61C36434243752A600C4D4E6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61C36438243752A600C4D4E6 /* PBXTargetDependency */, + ); + name = CTProjectUITests; + productName = CTProjectUITests; + productReference = 61C36436243752A600C4D4E6 /* CTProjectUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 61C3640D243752A500C4D4E6 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1140; + LastUpgradeCheck = 1140; + ORGANIZATIONNAME = Datadog; + TargetAttributes = { + 61C36414243752A500C4D4E6 = { + CreatedOnToolsVersion = 11.4; + }; + 61C3642A243752A600C4D4E6 = { + CreatedOnToolsVersion = 11.4; + TestTargetID = 61C36414243752A500C4D4E6; + }; + 61C36435243752A600C4D4E6 = { + CreatedOnToolsVersion = 11.4; + TestTargetID = 61C36414243752A500C4D4E6; + }; + }; + }; + buildConfigurationList = 61C36410243752A500C4D4E6 /* Build configuration list for PBXProject "CTProject" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 61C3640C243752A500C4D4E6; + productRefGroup = 61C36416243752A500C4D4E6 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 61C36414243752A500C4D4E6 /* CTProject */, + 61C3642A243752A600C4D4E6 /* CTProjectTests */, + 61C36435243752A600C4D4E6 /* CTProjectUITests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 61C36413243752A500C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C36425243752A600C4D4E6 /* LaunchScreen.storyboard in Resources */, + 61C36420243752A500C4D4E6 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C36429243752A600C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C36434243752A600C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 61C364482437544F00C4D4E6 /* ⚙️ Carthage */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "$(SRCROOT)/Carthage/Build/iOS/Datadog.framework", + ); + name = "⚙️ Carthage"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/usr/local/bin/carthage copy-frameworks\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 61C36411243752A500C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C3641D243752A500C4D4E6 /* ViewController.swift in Sources */, + 61C36419243752A500C4D4E6 /* AppDelegate.swift in Sources */, + 61C3641B243752A500C4D4E6 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C36427243752A600C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C36430243752A600C4D4E6 /* CTProjectTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C36432243752A600C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C3643B243752A600C4D4E6 /* CTProjectUITests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 61C3642D243752A600C4D4E6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61C36414243752A500C4D4E6 /* CTProject */; + targetProxy = 61C3642C243752A600C4D4E6 /* PBXContainerItemProxy */; + }; + 61C36438243752A600C4D4E6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61C36414243752A500C4D4E6 /* CTProject */; + targetProxy = 61C36437243752A600C4D4E6 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 61C3641E243752A500C4D4E6 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 61C3641F243752A500C4D4E6 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 61C36423243752A600C4D4E6 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 61C36424243752A600C4D4E6 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 61C3643D243752A600C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 61C3643E243752A600C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 61C36440243752A600C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = CTProject/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProject; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 61C36441243752A600C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Carthage/Build/iOS", + ); + INFOPLIST_FILE = CTProject/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProject; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 61C36443243752A600C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CTProjectTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CTProject.app/CTProject"; + }; + name = Debug; + }; + 61C36444243752A600C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CTProjectTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 13.4; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CTProject.app/CTProject"; + }; + name = Release; + }; + 61C36446243752A600C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CTProjectUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = CTProject; + }; + name = Debug; + }; + 61C36447243752A600C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CTProjectUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = CTProject; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 61C36410243752A500C4D4E6 /* Build configuration list for PBXProject "CTProject" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C3643D243752A600C4D4E6 /* Debug */, + 61C3643E243752A600C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61C3643F243752A600C4D4E6 /* Build configuration list for PBXNativeTarget "CTProject" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C36440243752A600C4D4E6 /* Debug */, + 61C36441243752A600C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61C36442243752A600C4D4E6 /* Build configuration list for PBXNativeTarget "CTProjectTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C36443243752A600C4D4E6 /* Debug */, + 61C36444243752A600C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61C36445243752A600C4D4E6 /* Build configuration list for PBXNativeTarget "CTProjectUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C36446243752A600C4D4E6 /* Debug */, + 61C36447243752A600C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 61C3640D243752A500C4D4E6 /* Project object */; +} diff --git a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..073d63e409 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000000..18d981003d --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/dependency-manager-tests/carthage/CTProject/AppDelegate.swift b/dependency-manager-tests/carthage/CTProject/AppDelegate.swift new file mode 100644 index 0000000000..c8ded5126a --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject/AppDelegate.swift @@ -0,0 +1,23 @@ +/* +* 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 UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + return true + } + + // MARK: UISceneSession Lifecycle + + func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration { + return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role) + } + + func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set) { + } +} diff --git a/dependency-manager-tests/carthage/CTProject/Base.lproj/LaunchScreen.storyboard b/dependency-manager-tests/carthage/CTProject/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..865e9329f3 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard b/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard new file mode 100644 index 0000000000..25a763858e --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dependency-manager-tests/carthage/CTProject/Info.plist b/dependency-manager-tests/carthage/CTProject/Info.plist new file mode 100644 index 0000000000..2a3483c0d2 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject/Info.plist @@ -0,0 +1,64 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + UISceneConfigurations + + UIWindowSceneSessionRoleApplication + + + UISceneConfigurationName + Default Configuration + UISceneDelegateClassName + $(PRODUCT_MODULE_NAME).SceneDelegate + UISceneStoryboardFile + Main + + + + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift b/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift new file mode 100644 index 0000000000..36001ae61f --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift @@ -0,0 +1,30 @@ +/* +* 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 UIKit + +class SceneDelegate: UIResponder, UIWindowSceneDelegate { + var window: UIWindow? + + func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { + guard let _ = (scene as? UIWindowScene) else { return } + } + + func sceneDidDisconnect(_ scene: UIScene) { + } + + func sceneDidBecomeActive(_ scene: UIScene) { + } + + func sceneWillResignActive(_ scene: UIScene) { + } + + func sceneWillEnterForeground(_ scene: UIScene) { + } + + func sceneDidEnterBackground(_ scene: UIScene) { + } +} diff --git a/dependency-manager-tests/carthage/CTProject/ViewController.swift b/dependency-manager-tests/carthage/CTProject/ViewController.swift new file mode 100644 index 0000000000..9021495b9d --- /dev/null +++ b/dependency-manager-tests/carthage/CTProject/ViewController.swift @@ -0,0 +1,13 @@ +/* +* 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 UIKit + +class ViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + } +} diff --git a/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift b/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift new file mode 100644 index 0000000000..3cac3d6acd --- /dev/null +++ b/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift @@ -0,0 +1,13 @@ +/* +* 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 XCTest +@testable import CTProject + +class CTProjectTests: XCTestCase { + func testExample() throws { + } +} diff --git a/dependency-manager-tests/carthage/CTProjectTests/Info.plist b/dependency-manager-tests/carthage/CTProjectTests/Info.plist new file mode 100644 index 0000000000..64d65ca495 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProjectTests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift b/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift new file mode 100644 index 0000000000..8f171698a4 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift @@ -0,0 +1,14 @@ +/* +* 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 XCTest + +class CTProjectUITests: XCTestCase { + func testExample() throws { + let app = XCUIApplication() + app.launch() + } +} diff --git a/dependency-manager-tests/carthage/CTProjectUITests/Info.plist b/dependency-manager-tests/carthage/CTProjectUITests/Info.plist new file mode 100644 index 0000000000..64d65ca495 --- /dev/null +++ b/dependency-manager-tests/carthage/CTProjectUITests/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/dependency-manager-tests/carthage/Makefile b/dependency-manager-tests/carthage/Makefile index 425c514ea0..3be84654d3 100644 --- a/dependency-manager-tests/carthage/Makefile +++ b/dependency-manager-tests/carthage/Makefile @@ -5,8 +5,8 @@ else endif test: - @echo "⚙️ Testing Carthage for remote branch: '${GIT_BRANCH}'..." + @echo "⚙️ Configuring CTProject with remote branch: '${GIT_BRANCH}'..." @sed "s|REMOTE_GIT_BRANCH|${GIT_BRANCH}|g" Cartfile.src > Cartfile - rm -rf Carthage/ + @rm -rf Carthage/ carthage update @echo "OK 👌" diff --git a/dependency-manager-tests/cocoapods/.gitignore b/dependency-manager-tests/cocoapods/.gitignore index 15165cd7ec..8fa58bdf6c 100644 --- a/dependency-manager-tests/cocoapods/.gitignore +++ b/dependency-manager-tests/cocoapods/.gitignore @@ -1,4 +1,6 @@ .DS_Store +/.build +xcuserdata/ /Pods # Ignore `Podfile.lock` and `Podfile` as they will be re-created for every test run. From 2718e640b77e60ee71c0ffedb27ba71454865b02 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 13:35:50 +0200 Subject: [PATCH 03/15] RUMM-346 Add unit tests target for CPProject --- .../CPProject.xcodeproj/project.pbxproj | 122 +++++++++++++++++- .../xcshareddata/xcschemes/CPProject.xcscheme | 10 ++ .../CPProjectTests/CPProjectTests.swift | 13 ++ .../cocoapods/CPProjectTests/Info.plist | 22 ++++ .../CPProjectUITests/CPProjectUITests.swift | 6 - dependency-manager-tests/cocoapods/Makefile | 3 +- 6 files changed, 166 insertions(+), 10 deletions(-) create mode 100644 dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift create mode 100644 dependency-manager-tests/cocoapods/CPProjectTests/Info.plist diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj index dc464fe330..e9b658b8aa 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -13,6 +13,7 @@ 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 */; }; BFBE2FE9FE6CA40F0A6B154A /* Pods_CPProject.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A18949628C7A45A21789F71F /* Pods_CPProject.framework */; }; /* End PBXBuildFile section */ @@ -24,6 +25,13 @@ remoteGlobalIDString = 61C3638E2436318E00C4D4E6; remoteInfo = CPProject; }; + 61C364572437568300C4D4E6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61C363872436318E00C4D4E6 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61C3638E2436318E00C4D4E6; + remoteInfo = CPProject; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -38,6 +46,9 @@ 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 = ""; }; A18949628C7A45A21789F71F /* Pods_CPProject.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CPProject.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; /* End PBXFileReference section */ @@ -58,6 +69,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 61C3644F2437568300C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -67,7 +85,6 @@ 5AD49F84C2EA2EE5CB99586F /* Pods-CPProject.debug.xcconfig */, C7DE97263B77DC87F0FC27F0 /* Pods-CPProject.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -76,6 +93,7 @@ children = ( 61C363912436318E00C4D4E6 /* CPProject */, 61C363A82436319000C4D4E6 /* CPProjectUITests */, + 61C364532437568300C4D4E6 /* CPProjectTests */, 61C363902436318E00C4D4E6 /* Products */, 0157255130C038561709B7CF /* Pods */, A0508E6A3FA3F45E84391D24 /* Frameworks */, @@ -87,6 +105,7 @@ children = ( 61C3638F2436318E00C4D4E6 /* CPProject.app */, 61C363A52436319000C4D4E6 /* CPProjectUITests.xctest */, + 61C364522437568300C4D4E6 /* CPProjectTests.xctest */, ); name = Products; sourceTree = ""; @@ -113,6 +132,15 @@ path = CPProjectUITests; sourceTree = ""; }; + 61C364532437568300C4D4E6 /* CPProjectTests */ = { + isa = PBXGroup; + children = ( + 61C364542437568300C4D4E6 /* CPProjectTests.swift */, + 61C364562437568300C4D4E6 /* Info.plist */, + ); + path = CPProjectTests; + sourceTree = ""; + }; A0508E6A3FA3F45E84391D24 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -161,6 +189,24 @@ productReference = 61C363A52436319000C4D4E6 /* CPProjectUITests.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; + 61C364512437568300C4D4E6 /* CPProjectTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C3645B2437568300C4D4E6 /* Build configuration list for PBXNativeTarget "CPProjectTests" */; + buildPhases = ( + 61C3644E2437568300C4D4E6 /* Sources */, + 61C3644F2437568300C4D4E6 /* Frameworks */, + 61C364502437568300C4D4E6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61C364582437568300C4D4E6 /* PBXTargetDependency */, + ); + name = CPProjectTests; + productName = CPProjectTests; + productReference = 61C364522437568300C4D4E6 /* CPProjectTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -178,6 +224,10 @@ CreatedOnToolsVersion = 11.4; TestTargetID = 61C3638E2436318E00C4D4E6; }; + 61C364512437568300C4D4E6 = { + CreatedOnToolsVersion = 11.4; + TestTargetID = 61C3638E2436318E00C4D4E6; + }; }; }; buildConfigurationList = 61C3638A2436318E00C4D4E6 /* Build configuration list for PBXProject "CPProject" */; @@ -194,6 +244,7 @@ projectRoot = ""; targets = ( 61C3638E2436318E00C4D4E6 /* CPProject */, + 61C364512437568300C4D4E6 /* CPProjectTests */, 61C363A42436319000C4D4E6 /* CPProjectUITests */, ); }; @@ -216,6 +267,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 61C364502437568300C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -279,6 +337,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 61C3644E2437568300C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C364552437568300C4D4E6 /* CPProjectTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -287,6 +353,11 @@ target = 61C3638E2436318E00C4D4E6 /* CPProject */; targetProxy = 61C363A62436319000C4D4E6 /* PBXContainerItemProxy */; }; + 61C364582437568300C4D4E6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61C3638E2436318E00C4D4E6 /* CPProject */; + targetProxy = 61C364572437568300C4D4E6 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -497,6 +568,44 @@ }; name = Release; }; + 61C364592437568300C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CPProjectTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; + }; + name = Debug; + }; + 61C3645A2437568300C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + INFOPLIST_FILE = CPProjectTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -527,6 +636,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 61C3645B2437568300C4D4E6 /* Build configuration list for PBXNativeTarget "CPProjectTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C364592437568300C4D4E6 /* Debug */, + 61C3645A2437568300C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 61C363872436318E00C4D4E6 /* Project object */; diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme index 19497f03d2..4cef192bd3 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/xcshareddata/xcschemes/CPProject.xcscheme @@ -38,6 +38,16 @@ ReferencedContainer = "container:CPProject.xcodeproj"> + + + + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift b/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift index f58b912c8a..1358dd3218 100644 --- a/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift +++ b/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift @@ -7,12 +7,6 @@ import XCTest class CPProjectUITests: XCTestCase { - override func setUpWithError() throws { - } - - override func tearDownWithError() throws { - } - func testExample() throws { let app = XCUIApplication() app.launch() diff --git a/dependency-manager-tests/cocoapods/Makefile b/dependency-manager-tests/cocoapods/Makefile index 9d61624888..88b37a6a66 100644 --- a/dependency-manager-tests/cocoapods/Makefile +++ b/dependency-manager-tests/cocoapods/Makefile @@ -7,7 +7,6 @@ endif test: @echo "⚙️ Testing Cocoapods for remote branch: '${GIT_BRANCH}'..." @sed "s|REMOTE_GIT_BRANCH|${GIT_BRANCH}|g" Podfile.src > Podfile - rm -rf Pods/ - rm -rf Podfile.lock + @rm -rf Pods/ pod update @echo "OK 👌" From 669f801dadac5f94c620c6bdd2f86f5be856991c Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 14:09:53 +0200 Subject: [PATCH 04/15] RUMM-346 Test UI and logic in CTProject --- .../CTProject/Base.lproj/Main.storyboard | 43 ++++++++++++++++--- .../carthage/CTProject/ViewController.swift | 17 ++++++++ .../CTProjectTests/CTProjectTests.swift | 5 ++- .../CTProjectUITests/CTProjectUITests.swift | 3 +- 4 files changed, 61 insertions(+), 7 deletions(-) diff --git a/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard b/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard index 25a763858e..fbb30ef19f 100644 --- a/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard +++ b/dependency-manager-tests/carthage/CTProject/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + + - + @@ -9,16 +10,48 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dependency-manager-tests/carthage/CTProject/ViewController.swift b/dependency-manager-tests/carthage/CTProject/ViewController.swift index 9021495b9d..b5e0b86513 100644 --- a/dependency-manager-tests/carthage/CTProject/ViewController.swift +++ b/dependency-manager-tests/carthage/CTProject/ViewController.swift @@ -5,9 +5,26 @@ */ import UIKit +import Datadog class ViewController: UIViewController { + private var logger: Logger! + override func viewDidLoad() { super.viewDidLoad() + + Datadog.initialize( + appContext: .init(), + configuration: Datadog.Configuration + .builderUsing(clientToken: "abc") + .build() + ) + + self.logger = Logger.builder + .sendLogsToDatadog(false) + .printLogsToConsole(true) + .build() + + logger.info("It works") } } diff --git a/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift b/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift index 3cac3d6acd..58380e7e60 100644 --- a/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift +++ b/dependency-manager-tests/carthage/CTProjectTests/CTProjectTests.swift @@ -8,6 +8,9 @@ import XCTest @testable import CTProject class CTProjectTests: XCTestCase { - func testExample() throws { + func testCallingLogicThatLoadsSDK() throws { + let viewController = ViewController() + viewController.viewDidLoad() + XCTAssertNotNil(viewController.view) } } diff --git a/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift b/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift index 8f171698a4..5ba35394bf 100644 --- a/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift +++ b/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift @@ -7,8 +7,9 @@ import XCTest class CTProjectUITests: XCTestCase { - func testExample() throws { + func testDisplayingUI() throws { let app = XCUIApplication() app.launch() + XCTAssert(app.staticTexts["Testing..."].exists) } } From 35727faf8b32a55fdedfbc7333e22f6a1bb03ef2 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 14:13:30 +0200 Subject: [PATCH 05/15] RUMM-346 Test UI and logic in CPProject --- .../CTProjectUITests/CTProjectUITests.swift | 2 +- .../CPProject.xcodeproj/project.pbxproj | 2 +- .../CPProject/Base.lproj/Main.storyboard | 43 ++++++++++++++++--- .../cocoapods/CPProject/ViewController.swift | 9 +++- .../CPProjectTests/CPProjectTests.swift | 5 ++- .../CPProjectUITests/CPProjectUITests.swift | 3 +- 6 files changed, 54 insertions(+), 10 deletions(-) diff --git a/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift b/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift index 5ba35394bf..065459f1da 100644 --- a/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift +++ b/dependency-manager-tests/carthage/CTProjectUITests/CTProjectUITests.swift @@ -7,7 +7,7 @@ import XCTest class CTProjectUITests: XCTestCase { - func testDisplayingUI() throws { + func testDisplayingUI() throws { let app = XCUIApplication() app.launch() XCTAssert(app.staticTexts["Testing..."].exists) diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj index e9b658b8aa..53d0e4b1e9 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj @@ -92,8 +92,8 @@ isa = PBXGroup; children = ( 61C363912436318E00C4D4E6 /* CPProject */, - 61C363A82436319000C4D4E6 /* CPProjectUITests */, 61C364532437568300C4D4E6 /* CPProjectTests */, + 61C363A82436319000C4D4E6 /* CPProjectUITests */, 61C363902436318E00C4D4E6 /* Products */, 0157255130C038561709B7CF /* Pods */, A0508E6A3FA3F45E84391D24 /* Frameworks */, diff --git a/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard b/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard index 25a763858e..49690bb98b 100644 --- a/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard +++ b/dependency-manager-tests/cocoapods/CPProject/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + + - + @@ -9,16 +10,48 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dependency-manager-tests/cocoapods/CPProject/ViewController.swift b/dependency-manager-tests/cocoapods/CPProject/ViewController.swift index 15993bdc18..00d08acb49 100644 --- a/dependency-manager-tests/cocoapods/CPProject/ViewController.swift +++ b/dependency-manager-tests/cocoapods/CPProject/ViewController.swift @@ -8,6 +8,8 @@ import UIKit import Datadog class ViewController: UIViewController { + private var logger: Logger! + override func viewDidLoad() { super.viewDidLoad() @@ -18,7 +20,12 @@ class ViewController: UIViewController { .build() ) - let logger = Logger.builder.build() + self.logger = Logger.builder + .sendLogsToDatadog(false) + .printLogsToConsole(true) + .build() + logger.info("It works") } } + diff --git a/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift b/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift index ed98742efa..1a55f0036d 100644 --- a/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift +++ b/dependency-manager-tests/cocoapods/CPProjectTests/CPProjectTests.swift @@ -8,6 +8,9 @@ import XCTest @testable import CPProject class CPProjectTests: XCTestCase { - func testExample() throws { + func testCallingLogicThatLoadsSDK() throws { + let viewController = ViewController() + viewController.viewDidLoad() + XCTAssertNotNil(viewController.view) } } diff --git a/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift b/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift index 1358dd3218..7f9bdcc0d5 100644 --- a/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift +++ b/dependency-manager-tests/cocoapods/CPProjectUITests/CPProjectUITests.swift @@ -7,8 +7,9 @@ import XCTest class CPProjectUITests: XCTestCase { - func testExample() throws { + func testDisplayingUI() throws { let app = XCUIApplication() app.launch() + XCTAssert(app.staticTexts["Testing..."].exists) } } From 06ca74487cee3bd0f9cb259cb313a9e48c6bdb51 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 14:17:03 +0200 Subject: [PATCH 06/15] RUMM-346 Test UI and logic in SPMProject --- .../spm/SPMProject.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/swiftpm/Package.resolved | 4 +- .../spm/SPMProject/Base.lproj/Main.storyboard | 43 ++++++++++++++++--- .../spm/SPMProject/ViewController.swift | 17 ++++++++ .../spm/SPMProjectTests/SPMProjectTests.swift | 5 ++- .../SPMProjectUITests/SPMProjectUITests.swift | 3 +- 6 files changed, 64 insertions(+), 10 deletions(-) diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj index f7b8e50ddd..07b53d4983 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj @@ -594,7 +594,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DataDog/dd-sdk-ios"; requirement = { - branch = master; + branch = ncreated/RUMM-346-unify-dependency-manager-tests; kind = branch; }; }; diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d6c2e5ebea..85445fef74 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "package": "Datadog", "repositoryURL": "https://github.com/DataDog/dd-sdk-ios", "state": { - "branch": "master", - "revision": "44f013c0e2ce8c00c70afaeef309ff33a1cef205", + "branch": "ncreated/RUMM-346-unify-dependency-manager-tests", + "revision": "e534f22f2b11a369a8518fcba3e3396704574e0c", "version": null } } diff --git a/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard b/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard index 25a763858e..924c033e17 100644 --- a/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard +++ b/dependency-manager-tests/spm/SPMProject/Base.lproj/Main.storyboard @@ -1,7 +1,8 @@ - + + - + @@ -9,16 +10,48 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dependency-manager-tests/spm/SPMProject/ViewController.swift b/dependency-manager-tests/spm/SPMProject/ViewController.swift index 9021495b9d..b5e0b86513 100644 --- a/dependency-manager-tests/spm/SPMProject/ViewController.swift +++ b/dependency-manager-tests/spm/SPMProject/ViewController.swift @@ -5,9 +5,26 @@ */ import UIKit +import Datadog class ViewController: UIViewController { + private var logger: Logger! + override func viewDidLoad() { super.viewDidLoad() + + Datadog.initialize( + appContext: .init(), + configuration: Datadog.Configuration + .builderUsing(clientToken: "abc") + .build() + ) + + self.logger = Logger.builder + .sendLogsToDatadog(false) + .printLogsToConsole(true) + .build() + + logger.info("It works") } } diff --git a/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift b/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift index d45c9456e1..ef03854cfb 100644 --- a/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift +++ b/dependency-manager-tests/spm/SPMProjectTests/SPMProjectTests.swift @@ -8,6 +8,9 @@ import XCTest @testable import SPMProject class SPMProjectTests: XCTestCase { - func testExample() throws { + func testCallingLogicThatLoadsSDK() throws { + let viewController = ViewController() + viewController.viewDidLoad() + XCTAssertNotNil(viewController.view) } } diff --git a/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift b/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift index 2b496c02e3..5489222c48 100644 --- a/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift +++ b/dependency-manager-tests/spm/SPMProjectUITests/SPMProjectUITests.swift @@ -7,8 +7,9 @@ import XCTest class SPMProjectUITests: XCTestCase { - func testExample() throws { + func testDisplayingUI() throws { let app = XCUIApplication() app.launch() + XCTAssert(app.staticTexts["Testing..."].exists) } } From 34372c67240ba7f1ab877f4aefe49a5204a80bfd Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 14:20:38 +0200 Subject: [PATCH 07/15] RUMM-346 Set all Deployment Targets to iOS13 and disable automatic code signing --- .../CTProject.xcodeproj/project.pbxproj | 34 ++++++++++++------ .../CPProject.xcodeproj/project.pbxproj | 32 ++++++++++++----- .../spm/SPMProject.xcodeproj/project.pbxproj | 36 +++++++++++++------ 3 files changed, 73 insertions(+), 29 deletions(-) diff --git a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj index 119d106326..610770e0f9 100644 --- a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj @@ -414,7 +414,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -468,7 +468,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -482,7 +482,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -494,6 +495,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProject; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -503,7 +505,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -515,6 +518,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProject; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -525,9 +529,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -535,6 +539,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CTProject.app/CTProject"; @@ -546,9 +552,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -556,6 +562,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CTProject.app/CTProject"; @@ -566,7 +574,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -575,6 +584,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = CTProject; @@ -585,7 +596,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -594,6 +606,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = CTProject; diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj index 53d0e4b1e9..58ecf03ffe 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj @@ -430,7 +430,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -484,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -499,7 +499,8 @@ baseConfigurationReference = 5AD49F84C2EA2EE5CB99586F /* Pods-CPProject.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -507,6 +508,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProject; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -517,7 +519,8 @@ baseConfigurationReference = C7DE97263B77DC87F0FC27F0 /* Pods-CPProject.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -525,6 +528,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProject; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -534,7 +538,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -543,6 +548,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectUITests; 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; @@ -553,7 +560,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -562,6 +570,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectUITests; 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; @@ -572,7 +582,8 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -581,6 +592,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; @@ -591,7 +604,8 @@ isa = XCBuildConfiguration; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -600,6 +614,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj index 07b53d4983..09d88be893 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj @@ -370,7 +370,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -424,7 +424,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -438,7 +438,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -446,6 +447,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProject; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -455,7 +457,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -463,6 +466,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProject; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -473,9 +477,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -483,6 +487,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SPMProject.app/SPMProject"; @@ -494,9 +500,9 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -504,6 +510,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SPMProject.app/SPMProject"; @@ -514,7 +522,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -523,6 +532,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = SPMProject; @@ -533,7 +544,8 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -542,6 +554,8 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = SPMProject; @@ -594,7 +608,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DataDog/dd-sdk-ios"; requirement = { - branch = ncreated/RUMM-346-unify-dependency-manager-tests; + branch = "ncreated/RUMM-346-unify-dependency-manager-tests"; kind = branch; }; }; From 9100309c16df6a0184b0b88293f4443b24e8de92 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 15:02:55 +0200 Subject: [PATCH 08/15] RUMM-346 Set up linter for tests projects --- .../CTProject.xcodeproj/project.pbxproj | 20 ++++++++++++++++ .../carthage/CTProject/AppDelegate.swift | 2 +- .../carthage/CTProject/SceneDelegate.swift | 3 +-- .../carthage/CTProject/ViewController.swift | 4 ++-- .../CPProject.xcodeproj/project.pbxproj | 20 ++++++++++++++++ .../cocoapods/CPProject/AppDelegate.swift | 2 +- .../cocoapods/CPProject/SceneDelegate.swift | 3 +-- .../cocoapods/CPProject/ViewController.swift | 5 ++-- .../spm/SPMProject.xcodeproj/project.pbxproj | 23 +++++++++++++++++++ .../spm/SPMProject/AppDelegate.swift | 2 +- .../spm/SPMProject/SceneDelegate.swift | 3 +-- .../spm/SPMProject/ViewController.swift | 4 ++-- tools/lint/sources.swiftlint.yml | 2 ++ tools/lint/tests.swiftlint.yml | 6 +++-- 14 files changed, 81 insertions(+), 18 deletions(-) diff --git a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj index 610770e0f9..1e4cd3ecc6 100644 --- a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj @@ -164,6 +164,7 @@ 61C36413243752A500C4D4E6 /* Resources */, 61C364482437544F00C4D4E6 /* ⚙️ Carthage */, 61C3644D2437547A00C4D4E6 /* Embed Frameworks */, + 61C3645C243768FC00C4D4E6 /* ⚙️ Run linter */, ); buildRules = ( ); @@ -300,6 +301,25 @@ shellScript = "/usr/local/bin/carthage copy-frameworks\n"; showEnvVarsInLog = 0; }; + 61C3645C243768FC00C4D4E6 /* ⚙️ Run linter */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "⚙️ Run linter"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if which swiftlint >/dev/null; then\n cd ${SOURCE_ROOT}/../../\n ./tools/lint/run-linter.sh\nfi\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/dependency-manager-tests/carthage/CTProject/AppDelegate.swift b/dependency-manager-tests/carthage/CTProject/AppDelegate.swift index c8ded5126a..6912ad8946 100644 --- a/dependency-manager-tests/carthage/CTProject/AppDelegate.swift +++ b/dependency-manager-tests/carthage/CTProject/AppDelegate.swift @@ -7,7 +7,7 @@ import UIKit @UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { +internal class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { return true } diff --git a/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift b/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift index 36001ae61f..c812c9793c 100644 --- a/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift +++ b/dependency-manager-tests/carthage/CTProject/SceneDelegate.swift @@ -6,11 +6,10 @@ import UIKit -class SceneDelegate: UIResponder, UIWindowSceneDelegate { +internal class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow? func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_ scene: UIScene) { diff --git a/dependency-manager-tests/carthage/CTProject/ViewController.swift b/dependency-manager-tests/carthage/CTProject/ViewController.swift index b5e0b86513..b468a09a72 100644 --- a/dependency-manager-tests/carthage/CTProject/ViewController.swift +++ b/dependency-manager-tests/carthage/CTProject/ViewController.swift @@ -7,8 +7,8 @@ import UIKit import Datadog -class ViewController: UIViewController { - private var logger: Logger! +internal class ViewController: UIViewController { + private var logger: Logger! // swiftlint:disable:this implicitly_unwrapped_optional override func viewDidLoad() { super.viewDidLoad() diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj index 58ecf03ffe..4e412c08e4 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj @@ -161,6 +161,7 @@ 61C3638C2436318E00C4D4E6 /* Frameworks */, 61C3638D2436318E00C4D4E6 /* Resources */, E9D5FEEB347D68D026118CC9 /* [CP] Embed Pods Frameworks */, + 61C3645E24376AEF00C4D4E6 /* ⚙️ Run linter */, ); buildRules = ( ); @@ -277,6 +278,25 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 61C3645E24376AEF00C4D4E6 /* ⚙️ Run linter */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "⚙️ Run linter"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if which swiftlint >/dev/null; then\n cd ${SOURCE_ROOT}/../../\n ./tools/lint/run-linter.sh\nfi\n"; + showEnvVarsInLog = 0; + }; B5E3E8D262C8003866F38F23 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/dependency-manager-tests/cocoapods/CPProject/AppDelegate.swift b/dependency-manager-tests/cocoapods/CPProject/AppDelegate.swift index c8ded5126a..6912ad8946 100644 --- a/dependency-manager-tests/cocoapods/CPProject/AppDelegate.swift +++ b/dependency-manager-tests/cocoapods/CPProject/AppDelegate.swift @@ -7,7 +7,7 @@ import UIKit @UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { +internal class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { return true } diff --git a/dependency-manager-tests/cocoapods/CPProject/SceneDelegate.swift b/dependency-manager-tests/cocoapods/CPProject/SceneDelegate.swift index 36001ae61f..c812c9793c 100644 --- a/dependency-manager-tests/cocoapods/CPProject/SceneDelegate.swift +++ b/dependency-manager-tests/cocoapods/CPProject/SceneDelegate.swift @@ -6,11 +6,10 @@ import UIKit -class SceneDelegate: UIResponder, UIWindowSceneDelegate { +internal class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow? func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_ scene: UIScene) { diff --git a/dependency-manager-tests/cocoapods/CPProject/ViewController.swift b/dependency-manager-tests/cocoapods/CPProject/ViewController.swift index 00d08acb49..b468a09a72 100644 --- a/dependency-manager-tests/cocoapods/CPProject/ViewController.swift +++ b/dependency-manager-tests/cocoapods/CPProject/ViewController.swift @@ -7,8 +7,8 @@ import UIKit import Datadog -class ViewController: UIViewController { - private var logger: Logger! +internal class ViewController: UIViewController { + private var logger: Logger! // swiftlint:disable:this implicitly_unwrapped_optional override func viewDidLoad() { super.viewDidLoad() @@ -28,4 +28,3 @@ class ViewController: UIViewController { logger.info("It works") } } - diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj index 09d88be893..4666f63fca 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj @@ -137,6 +137,7 @@ 61C363D224374D5F00C4D4E6 /* Sources */, 61C363D324374D5F00C4D4E6 /* Frameworks */, 61C363D424374D5F00C4D4E6 /* Resources */, + 61C3645F24376B3400C4D4E6 /* ⚙️ Run linter */, ); buildRules = ( ); @@ -258,6 +259,28 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 61C3645F24376B3400C4D4E6 /* ⚙️ Run linter */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "⚙️ Run linter"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if which swiftlint >/dev/null; then\n cd ${SOURCE_ROOT}/../../\n ./tools/lint/run-linter.sh\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 61C363D224374D5F00C4D4E6 /* Sources */ = { isa = PBXSourcesBuildPhase; diff --git a/dependency-manager-tests/spm/SPMProject/AppDelegate.swift b/dependency-manager-tests/spm/SPMProject/AppDelegate.swift index c8ded5126a..6912ad8946 100644 --- a/dependency-manager-tests/spm/SPMProject/AppDelegate.swift +++ b/dependency-manager-tests/spm/SPMProject/AppDelegate.swift @@ -7,7 +7,7 @@ import UIKit @UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { +internal class AppDelegate: UIResponder, UIApplicationDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { return true } diff --git a/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift b/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift index 36001ae61f..c812c9793c 100644 --- a/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift +++ b/dependency-manager-tests/spm/SPMProject/SceneDelegate.swift @@ -6,11 +6,10 @@ import UIKit -class SceneDelegate: UIResponder, UIWindowSceneDelegate { +internal class SceneDelegate: UIResponder, UIWindowSceneDelegate { var window: UIWindow? func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) { - guard let _ = (scene as? UIWindowScene) else { return } } func sceneDidDisconnect(_ scene: UIScene) { diff --git a/dependency-manager-tests/spm/SPMProject/ViewController.swift b/dependency-manager-tests/spm/SPMProject/ViewController.swift index b5e0b86513..b468a09a72 100644 --- a/dependency-manager-tests/spm/SPMProject/ViewController.swift +++ b/dependency-manager-tests/spm/SPMProject/ViewController.swift @@ -7,8 +7,8 @@ import UIKit import Datadog -class ViewController: UIViewController { - private var logger: Logger! +internal class ViewController: UIViewController { + private var logger: Logger! // swiftlint:disable:this implicitly_unwrapped_optional override func viewDidLoad() { super.viewDidLoad() diff --git a/tools/lint/sources.swiftlint.yml b/tools/lint/sources.swiftlint.yml index bf654fd203..1292abc1bd 100644 --- a/tools/lint/sources.swiftlint.yml +++ b/tools/lint/sources.swiftlint.yml @@ -86,4 +86,6 @@ included: - instrumented-tests/Integration/Integration - instrumented-tests/Benchmark/Benchmark - instrumented-tests/http-server-mock/Sources + - dependency-manager-tests/carthage/CTProject + - dependency-manager-tests/cocoapods/CPProject - dependency-manager-tests/spm/SPMProject diff --git a/tools/lint/tests.swiftlint.yml b/tools/lint/tests.swiftlint.yml index 1bab66a8e9..06c3cd21f4 100644 --- a/tools/lint/tests.swiftlint.yml +++ b/tools/lint/tests.swiftlint.yml @@ -80,7 +80,9 @@ included: - instrumented-tests/Integration/IntegrationTests - instrumented-tests/Benchmark/BenchmarkTests - instrumented-tests/http-server-mock/Test + - dependency-manager-tests/carthage/CTProjectTests + - dependency-manager-tests/carthage/CTProjectUITests + - dependency-manager-tests/cocoapods/CTProjectTests + - dependency-manager-tests/cocoapods/CTProjectUITests - dependency-manager-tests/spm/SPMProjectTests - dependency-manager-tests/spm/SPMProjectUITests - - From bd9f95c51fb83c574906256f495c86b1ca9eaa50 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 16:48:31 +0200 Subject: [PATCH 09/15] RUMM-346 Set up provisioning profiles for all DM projects --- .../CTProject.xcodeproj/project.pbxproj | 36 ++++++++++--------- .../CPProject.xcodeproj/project.pbxproj | 35 +++++++++--------- .../spm/SPMProject.xcodeproj/project.pbxproj | 35 +++++++++--------- dependency-manager-tests/xcconfigs/.gitignore | 1 + .../xcconfigs/app-target.xcconfig | 6 ++++ .../xcconfigs/unit-tests-target.xcconfig | 2 ++ 6 files changed, 67 insertions(+), 48 deletions(-) create mode 100644 dependency-manager-tests/xcconfigs/.gitignore create mode 100644 dependency-manager-tests/xcconfigs/app-target.xcconfig create mode 100644 dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig diff --git a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj index 1e4cd3ecc6..e7888a005f 100644 --- a/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/carthage/CTProject.xcodeproj/project.pbxproj @@ -64,6 +64,9 @@ 61C3643A243752A600C4D4E6 /* CTProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CTProjectUITests.swift; sourceTree = ""; }; 61C3643C243752A600C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 61C3644A2437547A00C4D4E6 /* Datadog.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Datadog.framework; path = Carthage/Build/iOS/Datadog.framework; sourceTree = ""; }; + 61C3646224377D8A00C4D4E6 /* app-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "app-target.xcconfig"; sourceTree = ""; }; + 61C3646324377D8A00C4D4E6 /* unit-tests-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "unit-tests-target.xcconfig"; sourceTree = ""; }; + 61C364642437816500C4D4E6 /* datadog.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = datadog.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -95,6 +98,7 @@ 61C3640C243752A500C4D4E6 = { isa = PBXGroup; children = ( + 61C3646124377D8A00C4D4E6 /* xcconfigs */, 61C36417243752A500C4D4E6 /* CTProject */, 61C3642E243752A600C4D4E6 /* CTProjectTests */, 61C36439243752A600C4D4E6 /* CTProjectUITests */, @@ -152,6 +156,17 @@ name = Frameworks; sourceTree = ""; }; + 61C3646124377D8A00C4D4E6 /* xcconfigs */ = { + isa = PBXGroup; + children = ( + 61C364642437816500C4D4E6 /* datadog.xcconfig */, + 61C3646224377D8A00C4D4E6 /* app-target.xcconfig */, + 61C3646324377D8A00C4D4E6 /* unit-tests-target.xcconfig */, + ); + name = xcconfigs; + path = ../xcconfigs; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -386,6 +401,7 @@ /* Begin XCBuildConfiguration section */ 61C3643D243752A600C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646224377D8A00C4D4E6 /* app-target.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -446,6 +462,7 @@ }; 61C3643E243752A600C4D4E6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646224377D8A00C4D4E6 /* app-target.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -503,7 +520,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -515,7 +531,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "Wildcard Development"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -526,7 +542,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Carthage/Build/iOS", @@ -538,7 +553,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -546,11 +560,11 @@ }; 61C36443243752A600C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646324377D8A00C4D4E6 /* unit-tests-target.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -559,8 +573,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CTProject.app/CTProject"; @@ -569,11 +581,11 @@ }; 61C36444243752A600C4D4E6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646324377D8A00C4D4E6 /* unit-tests-target.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -582,8 +594,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CTProject.app/CTProject"; @@ -595,7 +605,6 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -604,8 +613,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = CTProject; @@ -617,7 +624,6 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CTProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -626,8 +632,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CTProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = CTProject; diff --git a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj index 4e412c08e4..8a23165890 100644 --- a/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/cocoapods/CPProject.xcodeproj/project.pbxproj @@ -49,6 +49,9 @@ 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 = ""; }; + 61C36466243782B000C4D4E6 /* datadog.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = datadog.xcconfig; sourceTree = ""; }; + 61C36467243782B000C4D4E6 /* app-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "app-target.xcconfig"; sourceTree = ""; }; + 61C36468243782B000C4D4E6 /* unit-tests-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "unit-tests-target.xcconfig"; sourceTree = ""; }; A18949628C7A45A21789F71F /* Pods_CPProject.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CPProject.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; /* End PBXFileReference section */ @@ -91,6 +94,7 @@ 61C363862436318E00C4D4E6 = { isa = PBXGroup; children = ( + 61C36465243782B000C4D4E6 /* xcconfigs */, 61C363912436318E00C4D4E6 /* CPProject */, 61C364532437568300C4D4E6 /* CPProjectTests */, 61C363A82436319000C4D4E6 /* CPProjectUITests */, @@ -141,6 +145,17 @@ path = CPProjectTests; sourceTree = ""; }; + 61C36465243782B000C4D4E6 /* xcconfigs */ = { + isa = PBXGroup; + children = ( + 61C36466243782B000C4D4E6 /* datadog.xcconfig */, + 61C36467243782B000C4D4E6 /* app-target.xcconfig */, + 61C36468243782B000C4D4E6 /* unit-tests-target.xcconfig */, + ); + name = xcconfigs; + path = ../xcconfigs; + sourceTree = ""; + }; A0508E6A3FA3F45E84391D24 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -402,6 +417,7 @@ /* Begin XCBuildConfiguration section */ 61C363AC2436319000C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C36467243782B000C4D4E6 /* app-target.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -462,6 +478,7 @@ }; 61C363AD2436319000C4D4E6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C36467243782B000C4D4E6 /* app-target.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -520,7 +537,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -528,7 +544,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -540,7 +555,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -548,7 +562,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -559,7 +572,6 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -568,8 +580,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectUITests; 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; @@ -581,7 +591,6 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -590,8 +599,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectUITests; 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; @@ -600,10 +607,10 @@ }; 61C364592437568300C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C36468243782B000C4D4E6 /* unit-tests-target.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -612,8 +619,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; @@ -622,10 +627,10 @@ }; 61C3645A2437568300C4D4E6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C36468243782B000C4D4E6 /* unit-tests-target.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = CPProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -634,8 +639,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.CPProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/CPProject.app/CPProject"; diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj index 4666f63fca..45b92e1464 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj @@ -48,6 +48,9 @@ 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectUITests.swift; sourceTree = ""; }; 61C363FD24374D6100C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C3646B2437839300C4D4E6 /* datadog.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = datadog.xcconfig; sourceTree = ""; }; + 61C3646C2437839300C4D4E6 /* app-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "app-target.xcconfig"; sourceTree = ""; }; + 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "unit-tests-target.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -79,6 +82,7 @@ 61C363CD24374D5F00C4D4E6 = { isa = PBXGroup; children = ( + 61C3646A2437839300C4D4E6 /* xcconfigs */, 61C363D824374D5F00C4D4E6 /* SPMProject */, 61C363EF24374D6100C4D4E6 /* SPMProjectTests */, 61C363FA24374D6100C4D4E6 /* SPMProjectUITests */, @@ -127,6 +131,17 @@ path = SPMProjectUITests; sourceTree = ""; }; + 61C3646A2437839300C4D4E6 /* xcconfigs */ = { + isa = PBXGroup; + children = ( + 61C3646B2437839300C4D4E6 /* datadog.xcconfig */, + 61C3646C2437839300C4D4E6 /* app-target.xcconfig */, + 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */, + ); + name = xcconfigs; + path = ../xcconfigs; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -345,6 +360,7 @@ /* Begin XCBuildConfiguration section */ 61C363FE24374D6100C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646C2437839300C4D4E6 /* app-target.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -405,6 +421,7 @@ }; 61C363FF24374D6100C4D4E6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646C2437839300C4D4E6 /* app-target.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -462,7 +479,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -470,7 +486,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -481,7 +496,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProject/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -489,7 +503,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProject; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -497,11 +510,11 @@ }; 61C3640424374D6100C4D4E6 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -510,8 +523,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SPMProject.app/SPMProject"; @@ -520,11 +531,11 @@ }; 61C3640524374D6100C4D4E6 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -533,8 +544,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectTests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SPMProject.app/SPMProject"; @@ -546,7 +555,6 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -555,8 +563,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = SPMProject; @@ -568,7 +574,6 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; CODE_SIGN_STYLE = Manual; - DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = SPMProjectUITests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -577,8 +582,6 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectUITests; PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = SPMProject; diff --git a/dependency-manager-tests/xcconfigs/.gitignore b/dependency-manager-tests/xcconfigs/.gitignore new file mode 100644 index 0000000000..16bde135d6 --- /dev/null +++ b/dependency-manager-tests/xcconfigs/.gitignore @@ -0,0 +1 @@ +datadog.xcconfig diff --git a/dependency-manager-tests/xcconfigs/app-target.xcconfig b/dependency-manager-tests/xcconfigs/app-target.xcconfig new file mode 100644 index 0000000000..822a9404b0 --- /dev/null +++ b/dependency-manager-tests/xcconfigs/app-target.xcconfig @@ -0,0 +1,6 @@ +DEVELOPMENT_TEAM[sdk=iphoneos*]=// use your own Development Team +CODE_SIGN_IDENTITY[sdk=iphoneos*]=// use your own Sign Identity +PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]=// use your own Provisioning Profile + +// If `datadog.xcconfig` is present, overwrite all settings +#include? "datadog.xcconfig" diff --git a/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig b/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig new file mode 100644 index 0000000000..018230658f --- /dev/null +++ b/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig @@ -0,0 +1,2 @@ +#include "app-target.xcconfig" +PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]=// overwrite to empty, so Xcode picks "Automatic" From a6e4b9b04432e7ef41363d5b72d23542cb0e16ba Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 17:13:48 +0200 Subject: [PATCH 10/15] RUMM-346 Unify logs in Makefiles --- dependency-manager-tests/cocoapods/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-manager-tests/cocoapods/Makefile b/dependency-manager-tests/cocoapods/Makefile index 88b37a6a66..007125f1e9 100644 --- a/dependency-manager-tests/cocoapods/Makefile +++ b/dependency-manager-tests/cocoapods/Makefile @@ -5,7 +5,7 @@ else endif test: - @echo "⚙️ Testing Cocoapods for remote branch: '${GIT_BRANCH}'..." + @echo "⚙️ Configuring CPProject with remote branch: '${GIT_BRANCH}'..." @sed "s|REMOTE_GIT_BRANCH|${GIT_BRANCH}|g" Podfile.src > Podfile @rm -rf Pods/ pod update From f19191f5e4cd9cf570828fbda16bd8fb8f7f4d80 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Fri, 3 Apr 2020 17:21:29 +0200 Subject: [PATCH 11/15] RUMM-346 Change default branch for `SPMProject` to `master` --- .../spm/SPMProject.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj index 45b92e1464..fe2c13f4e8 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj @@ -634,7 +634,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DataDog/dd-sdk-ios"; requirement = { - branch = "ncreated/RUMM-346-unify-dependency-manager-tests"; + branch = master; kind = branch; }; }; From 76f9db886eb4605dfee26bfd25aaa6d84c7ef7a5 Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Mon, 6 Apr 2020 10:36:42 +0200 Subject: [PATCH 12/15] RUMM-311 Reset `Package.resolved` for every tets run --- dependency-manager-tests/spm/.gitignore | 3 +++ dependency-manager-tests/spm/Makefile | 1 + .../xcshareddata/swiftpm/Package.resolved | 16 ---------------- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/dependency-manager-tests/spm/.gitignore b/dependency-manager-tests/spm/.gitignore index 55ea59c820..a0d898e9b4 100644 --- a/dependency-manager-tests/spm/.gitignore +++ b/dependency-manager-tests/spm/.gitignore @@ -1,3 +1,6 @@ .DS_Store /.build xcuserdata/ + +# Ignore `Package.resolved` as it will be re-created for every test run. +Package.resolved diff --git a/dependency-manager-tests/spm/Makefile b/dependency-manager-tests/spm/Makefile index 5666d31660..501f3e908f 100644 --- a/dependency-manager-tests/spm/Makefile +++ b/dependency-manager-tests/spm/Makefile @@ -7,4 +7,5 @@ endif test: @echo "⚙️ Configuring SPMProject with remote branch: '${GIT_BRANCH}'..." @sed -i "" "s|branch = master;|branch = ${GIT_BRANCH};|g" SPMProject.xcodeproj/project.pbxproj + @rm -rf SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm @echo "OK 👌" diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 85445fef74..0000000000 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,16 +0,0 @@ -{ - "object": { - "pins": [ - { - "package": "Datadog", - "repositoryURL": "https://github.com/DataDog/dd-sdk-ios", - "state": { - "branch": "ncreated/RUMM-346-unify-dependency-manager-tests", - "revision": "e534f22f2b11a369a8518fcba3e3396704574e0c", - "version": null - } - } - ] - }, - "version": 1 -} From c3a91728d0730bc3a3296bfb61becfc05dea00ce Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Mon, 6 Apr 2020 12:34:09 +0200 Subject: [PATCH 13/15] RUMM-346 CR fix - use single `.gitignore` and properly gitignore `project.pbxproj` for SPM test --- dependency-manager-tests/.gitignore | 23 +++++++++++++++++++ dependency-manager-tests/carthage/.gitignore | 8 ------- dependency-manager-tests/cocoapods/.gitignore | 8 ------- dependency-manager-tests/spm/.gitignore | 6 ----- dependency-manager-tests/spm/Makefile | 3 ++- dependency-manager-tests/spm/README.md | 5 ---- .../project.pbxproj => project.pbxproj.src} | 2 +- dependency-manager-tests/xcconfigs/.gitignore | 1 - 8 files changed, 26 insertions(+), 30 deletions(-) create mode 100644 dependency-manager-tests/.gitignore delete mode 100644 dependency-manager-tests/carthage/.gitignore delete mode 100644 dependency-manager-tests/cocoapods/.gitignore delete mode 100644 dependency-manager-tests/spm/.gitignore rename dependency-manager-tests/spm/{SPMProject.xcodeproj/project.pbxproj => project.pbxproj.src} (99%) delete mode 100644 dependency-manager-tests/xcconfigs/.gitignore diff --git a/dependency-manager-tests/.gitignore b/dependency-manager-tests/.gitignore new file mode 100644 index 0000000000..30e711fef9 --- /dev/null +++ b/dependency-manager-tests/.gitignore @@ -0,0 +1,23 @@ +.DS_Store +.build +xcuserdata + +# Ignore code signing setup +xcconfigs/datadog.xcconfig + +# Carthage test +# - ignore `Cartfile.resolved` and `Cartfile` as they will be re-created for every test run +/carthage/Carthage +/carthage/Cartfile.resolved +/carthage/Cartfile + +# SPM test +# - ignore `Package.resolved` and `project.pbxproj` as they will be re-created for every test run +/spm/**/project.pbxproj +/spm/**/Package.resolved + +# Cocoapods test +# - ignore `Podfile.lock` and `Podfile` as they will be re-created for every test run +/cocoapods/Pods +/cocoapods/Podfile.lock +/cocoapods/Podfile diff --git a/dependency-manager-tests/carthage/.gitignore b/dependency-manager-tests/carthage/.gitignore deleted file mode 100644 index 1192aba2b8..0000000000 --- a/dependency-manager-tests/carthage/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -/.build -xcuserdata/ -/Carthage - -# Ignore `Cartfile.resolved` and `Cartfile` as they will be re-created for every test run. -Cartfile.resolved -Cartfile diff --git a/dependency-manager-tests/cocoapods/.gitignore b/dependency-manager-tests/cocoapods/.gitignore deleted file mode 100644 index 8fa58bdf6c..0000000000 --- a/dependency-manager-tests/cocoapods/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.DS_Store -/.build -xcuserdata/ -/Pods - -# Ignore `Podfile.lock` and `Podfile` as they will be re-created for every test run. -Podfile.lock -Podfile diff --git a/dependency-manager-tests/spm/.gitignore b/dependency-manager-tests/spm/.gitignore deleted file mode 100644 index a0d898e9b4..0000000000 --- a/dependency-manager-tests/spm/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -.DS_Store -/.build -xcuserdata/ - -# Ignore `Package.resolved` as it will be re-created for every test run. -Package.resolved diff --git a/dependency-manager-tests/spm/Makefile b/dependency-manager-tests/spm/Makefile index 501f3e908f..fbb17394cf 100644 --- a/dependency-manager-tests/spm/Makefile +++ b/dependency-manager-tests/spm/Makefile @@ -6,6 +6,7 @@ endif test: @echo "⚙️ Configuring SPMProject with remote branch: '${GIT_BRANCH}'..." - @sed -i "" "s|branch = master;|branch = ${GIT_BRANCH};|g" SPMProject.xcodeproj/project.pbxproj + @rm -rf SPMProject.xcodeproj/project.pbxproj @rm -rf SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm + @sed "s|REMOTE_GIT_BRANCH|${GIT_BRANCH}|g" project.pbxproj.src > SPMProject.xcodeproj/project.pbxproj @echo "OK 👌" diff --git a/dependency-manager-tests/spm/README.md b/dependency-manager-tests/spm/README.md index e3767d9d7d..959aa7c091 100644 --- a/dependency-manager-tests/spm/README.md +++ b/dependency-manager-tests/spm/README.md @@ -7,8 +7,3 @@ After pushing current branch to remote, run: $ make ``` Then, open `SPMProject.xcodeproj` to check if SPM is able to fetch `Datadog` dependency from current branch and build the project. - -## Important Note: - -`make` auto-magically changes current branch for `Datadog` dependency. -By default, current branch is `master`; if you open `SPMProject.xcodeproj`, it will fetch `Datadog:master`. diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj b/dependency-manager-tests/spm/project.pbxproj.src similarity index 99% rename from dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj rename to dependency-manager-tests/spm/project.pbxproj.src index fe2c13f4e8..4e25d91d9b 100644 --- a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.pbxproj +++ b/dependency-manager-tests/spm/project.pbxproj.src @@ -634,7 +634,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DataDog/dd-sdk-ios"; requirement = { - branch = master; + branch = REMOTE_GIT_BRANCH; kind = branch; }; }; diff --git a/dependency-manager-tests/xcconfigs/.gitignore b/dependency-manager-tests/xcconfigs/.gitignore deleted file mode 100644 index 16bde135d6..0000000000 --- a/dependency-manager-tests/xcconfigs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -datadog.xcconfig From 36cc3a7c54cb518eeae812cf0a05d34756b10bab Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Mon, 6 Apr 2020 12:35:31 +0200 Subject: [PATCH 14/15] RUMM-346 CR fix - update `.xcconfig` comment --- dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig b/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig index 018230658f..4452f945be 100644 --- a/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig +++ b/dependency-manager-tests/xcconfigs/unit-tests-target.xcconfig @@ -1,2 +1,2 @@ #include "app-target.xcconfig" -PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]=// overwrite to empty, so Xcode picks "Automatic" +PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]=// this line overrides app-target.xcconfig and sets provisioning profile to Auto From af25c326d84d68c48452d45f4cdc6dae5cc2798e Mon Sep 17 00:00:00 2001 From: Maciek Grzybowski Date: Mon, 6 Apr 2020 13:01:27 +0200 Subject: [PATCH 15/15] RUMM-346 Source entire `SPMProject.xcodeproj` to fix Carthage compatibility for `dd-sdk-ios` --- dependency-manager-tests/.gitignore | 5 +- dependency-manager-tests/spm/Makefile | 6 +- .../SPMProject.xcodeproj.src/project.pbxproj | 652 ++++++++++++++++++ .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 5 files changed, 657 insertions(+), 6 deletions(-) create mode 100644 dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.pbxproj rename dependency-manager-tests/spm/{SPMProject.xcodeproj => SPMProject.xcodeproj.src}/project.xcworkspace/contents.xcworkspacedata (100%) rename dependency-manager-tests/spm/{SPMProject.xcodeproj => SPMProject.xcodeproj.src}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) diff --git a/dependency-manager-tests/.gitignore b/dependency-manager-tests/.gitignore index 30e711fef9..b0c852b885 100644 --- a/dependency-manager-tests/.gitignore +++ b/dependency-manager-tests/.gitignore @@ -12,9 +12,8 @@ xcconfigs/datadog.xcconfig /carthage/Cartfile # SPM test -# - ignore `Package.resolved` and `project.pbxproj` as they will be re-created for every test run -/spm/**/project.pbxproj -/spm/**/Package.resolved +# - ignore `SPMProject.xcodeproj` as it will be re-created for every test run +/spm/SPMProject.xcodeproj # Cocoapods test # - ignore `Podfile.lock` and `Podfile` as they will be re-created for every test run diff --git a/dependency-manager-tests/spm/Makefile b/dependency-manager-tests/spm/Makefile index fbb17394cf..96d26e66e6 100644 --- a/dependency-manager-tests/spm/Makefile +++ b/dependency-manager-tests/spm/Makefile @@ -6,7 +6,7 @@ endif test: @echo "⚙️ Configuring SPMProject with remote branch: '${GIT_BRANCH}'..." - @rm -rf SPMProject.xcodeproj/project.pbxproj - @rm -rf SPMProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm - @sed "s|REMOTE_GIT_BRANCH|${GIT_BRANCH}|g" project.pbxproj.src > SPMProject.xcodeproj/project.pbxproj + @rm -rf SPMProject.xcodeproj + @cp -r SPMProject.xcodeproj.src SPMProject.xcodeproj + @sed "s|REMOTE_GIT_BRANCH|${GIT_BRANCH}|g" SPMProject.xcodeproj.src/project.pbxproj > SPMProject.xcodeproj/project.pbxproj @echo "OK 👌" diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.pbxproj b/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.pbxproj new file mode 100644 index 0000000000..4e25d91d9b --- /dev/null +++ b/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.pbxproj @@ -0,0 +1,652 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 52; + objects = { + +/* Begin PBXBuildFile section */ + 61C363DA24374D5F00C4D4E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */; }; + 61C363DC24374D5F00C4D4E6 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */; }; + 61C363DE24374D5F00C4D4E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363DD24374D5F00C4D4E6 /* ViewController.swift */; }; + 61C363E124374D5F00C4D4E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C363DF24374D5F00C4D4E6 /* Main.storyboard */; }; + 61C363E624374D6000C4D4E6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 61C363E424374D6000C4D4E6 /* LaunchScreen.storyboard */; }; + 61C363F124374D6100C4D4E6 /* SPMProjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363F024374D6100C4D4E6 /* SPMProjectTests.swift */; }; + 61C363FC24374D6100C4D4E6 /* SPMProjectUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */; }; + 61C3640B24374DF200C4D4E6 /* Datadog in Frameworks */ = {isa = PBXBuildFile; productRef = 61C3640A24374DF200C4D4E6 /* Datadog */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 61C363ED24374D6100C4D4E6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61C363CE24374D5F00C4D4E6 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61C363D524374D5F00C4D4E6; + remoteInfo = SPMProject; + }; + 61C363F824374D6100C4D4E6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 61C363CE24374D5F00C4D4E6 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 61C363D524374D5F00C4D4E6; + remoteInfo = SPMProject; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + 61C363D624374D5F00C4D4E6 /* SPMProject.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SPMProject.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; + 61C363DD24374D5F00C4D4E6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 61C363E024374D5F00C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 61C363E524374D6000C4D4E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 61C363E724374D6000C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C363EC24374D6100C4D4E6 /* SPMProjectTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C363F024374D6100C4D4E6 /* SPMProjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectTests.swift; sourceTree = ""; }; + 61C363F224374D6100C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SPMProjectUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SPMProjectUITests.swift; sourceTree = ""; }; + 61C363FD24374D6100C4D4E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 61C3646B2437839300C4D4E6 /* datadog.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = datadog.xcconfig; sourceTree = ""; }; + 61C3646C2437839300C4D4E6 /* app-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "app-target.xcconfig"; sourceTree = ""; }; + 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "unit-tests-target.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 61C363D324374D5F00C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C3640B24374DF200C4D4E6 /* Datadog in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C363E924374D6100C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C363F424374D6100C4D4E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 61C363CD24374D5F00C4D4E6 = { + isa = PBXGroup; + children = ( + 61C3646A2437839300C4D4E6 /* xcconfigs */, + 61C363D824374D5F00C4D4E6 /* SPMProject */, + 61C363EF24374D6100C4D4E6 /* SPMProjectTests */, + 61C363FA24374D6100C4D4E6 /* SPMProjectUITests */, + 61C363D724374D5F00C4D4E6 /* Products */, + ); + sourceTree = ""; + }; + 61C363D724374D5F00C4D4E6 /* Products */ = { + isa = PBXGroup; + children = ( + 61C363D624374D5F00C4D4E6 /* SPMProject.app */, + 61C363EC24374D6100C4D4E6 /* SPMProjectTests.xctest */, + 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 61C363D824374D5F00C4D4E6 /* SPMProject */ = { + isa = PBXGroup; + children = ( + 61C363D924374D5F00C4D4E6 /* AppDelegate.swift */, + 61C363DB24374D5F00C4D4E6 /* SceneDelegate.swift */, + 61C363DD24374D5F00C4D4E6 /* ViewController.swift */, + 61C363DF24374D5F00C4D4E6 /* Main.storyboard */, + 61C363E424374D6000C4D4E6 /* LaunchScreen.storyboard */, + 61C363E724374D6000C4D4E6 /* Info.plist */, + ); + path = SPMProject; + sourceTree = ""; + }; + 61C363EF24374D6100C4D4E6 /* SPMProjectTests */ = { + isa = PBXGroup; + children = ( + 61C363F024374D6100C4D4E6 /* SPMProjectTests.swift */, + 61C363F224374D6100C4D4E6 /* Info.plist */, + ); + path = SPMProjectTests; + sourceTree = ""; + }; + 61C363FA24374D6100C4D4E6 /* SPMProjectUITests */ = { + isa = PBXGroup; + children = ( + 61C363FB24374D6100C4D4E6 /* SPMProjectUITests.swift */, + 61C363FD24374D6100C4D4E6 /* Info.plist */, + ); + path = SPMProjectUITests; + sourceTree = ""; + }; + 61C3646A2437839300C4D4E6 /* xcconfigs */ = { + isa = PBXGroup; + children = ( + 61C3646B2437839300C4D4E6 /* datadog.xcconfig */, + 61C3646C2437839300C4D4E6 /* app-target.xcconfig */, + 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */, + ); + name = xcconfigs; + path = ../xcconfigs; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 61C363D524374D5F00C4D4E6 /* SPMProject */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C3640024374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProject" */; + buildPhases = ( + 61C363D224374D5F00C4D4E6 /* Sources */, + 61C363D324374D5F00C4D4E6 /* Frameworks */, + 61C363D424374D5F00C4D4E6 /* Resources */, + 61C3645F24376B3400C4D4E6 /* ⚙️ Run linter */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SPMProject; + packageProductDependencies = ( + 61C3640A24374DF200C4D4E6 /* Datadog */, + ); + productName = SPMProject; + productReference = 61C363D624374D5F00C4D4E6 /* SPMProject.app */; + productType = "com.apple.product-type.application"; + }; + 61C363EB24374D6100C4D4E6 /* SPMProjectTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C3640324374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectTests" */; + buildPhases = ( + 61C363E824374D6100C4D4E6 /* Sources */, + 61C363E924374D6100C4D4E6 /* Frameworks */, + 61C363EA24374D6100C4D4E6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61C363EE24374D6100C4D4E6 /* PBXTargetDependency */, + ); + name = SPMProjectTests; + productName = SPMProjectTests; + productReference = 61C363EC24374D6100C4D4E6 /* SPMProjectTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 61C363F624374D6100C4D4E6 /* SPMProjectUITests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 61C3640624374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectUITests" */; + buildPhases = ( + 61C363F324374D6100C4D4E6 /* Sources */, + 61C363F424374D6100C4D4E6 /* Frameworks */, + 61C363F524374D6100C4D4E6 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 61C363F924374D6100C4D4E6 /* PBXTargetDependency */, + ); + name = SPMProjectUITests; + productName = SPMProjectUITests; + productReference = 61C363F724374D6100C4D4E6 /* SPMProjectUITests.xctest */; + productType = "com.apple.product-type.bundle.ui-testing"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 61C363CE24374D5F00C4D4E6 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1140; + LastUpgradeCheck = 1140; + ORGANIZATIONNAME = Datadog; + TargetAttributes = { + 61C363D524374D5F00C4D4E6 = { + CreatedOnToolsVersion = 11.4; + }; + 61C363EB24374D6100C4D4E6 = { + CreatedOnToolsVersion = 11.4; + TestTargetID = 61C363D524374D5F00C4D4E6; + }; + 61C363F624374D6100C4D4E6 = { + CreatedOnToolsVersion = 11.4; + TestTargetID = 61C363D524374D5F00C4D4E6; + }; + }; + }; + buildConfigurationList = 61C363D124374D5F00C4D4E6 /* Build configuration list for PBXProject "SPMProject" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 61C363CD24374D5F00C4D4E6; + packageReferences = ( + 61C3640924374DF200C4D4E6 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */, + ); + productRefGroup = 61C363D724374D5F00C4D4E6 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 61C363D524374D5F00C4D4E6 /* SPMProject */, + 61C363EB24374D6100C4D4E6 /* SPMProjectTests */, + 61C363F624374D6100C4D4E6 /* SPMProjectUITests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 61C363D424374D5F00C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C363E624374D6000C4D4E6 /* LaunchScreen.storyboard in Resources */, + 61C363E124374D5F00C4D4E6 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C363EA24374D6100C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C363F524374D6100C4D4E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 61C3645F24376B3400C4D4E6 /* ⚙️ Run linter */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "⚙️ Run linter"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if which swiftlint >/dev/null; then\n cd ${SOURCE_ROOT}/../../\n ./tools/lint/run-linter.sh\nfi\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 61C363D224374D5F00C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C363DE24374D5F00C4D4E6 /* ViewController.swift in Sources */, + 61C363DA24374D5F00C4D4E6 /* AppDelegate.swift in Sources */, + 61C363DC24374D5F00C4D4E6 /* SceneDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C363E824374D6100C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C363F124374D6100C4D4E6 /* SPMProjectTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 61C363F324374D6100C4D4E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 61C363FC24374D6100C4D4E6 /* SPMProjectUITests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 61C363EE24374D6100C4D4E6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61C363D524374D5F00C4D4E6 /* SPMProject */; + targetProxy = 61C363ED24374D6100C4D4E6 /* PBXContainerItemProxy */; + }; + 61C363F924374D6100C4D4E6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 61C363D524374D5F00C4D4E6 /* SPMProject */; + targetProxy = 61C363F824374D6100C4D4E6 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 61C363DF24374D5F00C4D4E6 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 61C363E024374D5F00C4D4E6 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 61C363E424374D6000C4D4E6 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 61C363E524374D6000C4D4E6 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 61C363FE24374D6100C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646C2437839300C4D4E6 /* app-target.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 61C363FF24374D6100C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646C2437839300C4D4E6 /* app-target.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 61C3640124374D6100C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Manual; + INFOPLIST_FILE = SPMProject/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProject; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 61C3640224374D6100C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Manual; + INFOPLIST_FILE = SPMProject/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProject; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; + 61C3640424374D6100C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Manual; + INFOPLIST_FILE = SPMProjectTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SPMProject.app/SPMProject"; + }; + name = Debug; + }; + 61C3640524374D6100C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 61C3646D2437839300C4D4E6 /* unit-tests-target.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Manual; + INFOPLIST_FILE = SPMProjectTests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SPMProject.app/SPMProject"; + }; + name = Release; + }; + 61C3640724374D6100C4D4E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Manual; + INFOPLIST_FILE = SPMProjectUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = SPMProject; + }; + name = Debug; + }; + 61C3640824374D6100C4D4E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; + CODE_SIGN_STYLE = Manual; + INFOPLIST_FILE = SPMProjectUITests/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.datadogqh.SPMProjectUITests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_TARGET_NAME = SPMProject; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 61C363D124374D5F00C4D4E6 /* Build configuration list for PBXProject "SPMProject" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C363FE24374D6100C4D4E6 /* Debug */, + 61C363FF24374D6100C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61C3640024374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProject" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C3640124374D6100C4D4E6 /* Debug */, + 61C3640224374D6100C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61C3640324374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C3640424374D6100C4D4E6 /* Debug */, + 61C3640524374D6100C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 61C3640624374D6100C4D4E6 /* Build configuration list for PBXNativeTarget "SPMProjectUITests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 61C3640724374D6100C4D4E6 /* Debug */, + 61C3640824374D6100C4D4E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 61C3640924374DF200C4D4E6 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/DataDog/dd-sdk-ios"; + requirement = { + branch = REMOTE_GIT_BRANCH; + kind = branch; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 61C3640A24374DF200C4D4E6 /* Datadog */ = { + isa = XCSwiftPackageProductDependency; + package = 61C3640924374DF200C4D4E6 /* XCRemoteSwiftPackageReference "dd-sdk-ios" */; + productName = Datadog; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 61C363CE24374D5F00C4D4E6 /* Project object */; +} diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.xcworkspace/contents.xcworkspacedata diff --git a/dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from dependency-manager-tests/spm/SPMProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to dependency-manager-tests/spm/SPMProject.xcodeproj.src/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist