Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Jump to bottom

Update project file and shared schemes to allow both a Carthage build and Xcode workspace build. #4

Merged
merged 3 commits into from May 9, 2019
Merged

Update project file and shared schemes to allow both a Carthage build and Xcode workspace build. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c931d87
Do not automatically create schemes
darinkrauss Apr 11, 2019
d75f3d1
Create one shared scheme to improve Carthage build times; remove Cart…
darinkrauss Apr 11, 2019
b707eda
Use consistent iOS and watchOS scheme and target name convention
darinkrauss May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
113 changes: 26 additions & 87 deletions G4ShareSpy.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -6,20 +6,6 @@
objectVersion = 51;
objects = {

/* Begin PBXAggregateTarget section */
43BC2C9121157BD700F9628F /* Cartfile */ = {
isa = PBXAggregateTarget;
buildConfigurationList = 43BC2C9221157BD700F9628F /* Build configuration list for PBXAggregateTarget "Cartfile" */;
buildPhases = (
43BC2C9521157BE300F9628F /* Build Carthage Dependencies */,
);
dependencies = (
);
name = Cartfile;
productName = Cartfile;
};
/* End PBXAggregateTarget section */

/* Begin PBXBuildFile section */
43AB513921331BA700B3D58D /* LocalizedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43AB513821331BA700B3D58D /* LocalizedString.swift */; };
43AB513C21331BBF00B3D58D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 43AB513A21331BBF00B3D58D /* Localizable.strings */; };
Expand Down Expand Up @@ -51,23 +37,14 @@
4DCEF2811D41A2E800724BCD /* MessageHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DCEF2751D41A2E800724BCD /* MessageHeader.swift */; };
4DCEF2821D41A2E800724BCD /* SystemTimeMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DCEF2761D41A2E800724BCD /* SystemTimeMessage.swift */; };
4DCEF2831D41A2E800724BCD /* Receiver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4DCEF2771D41A2E800724BCD /* Receiver.swift */; };
A9B6C1DB225ED950002DFCD6 /* ShareClientUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BC2CA221157E4300F9628F /* ShareClientUI.framework */; };
A9B6C1DC225ED950002DFCD6 /* ShareClient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BC2CA121157E4300F9628F /* ShareClient.framework */; };
C17D3CC92184CFEB003458C8 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BC2C9721157D2900F9628F /* LoopKit.framework */; };
C17D3CCB2184D00D003458C8 /* ShareClient.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BC2CA121157E4300F9628F /* ShareClient.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C17D3CCC2184D012003458C8 /* LoopKit.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BC2C9721157D2900F9628F /* LoopKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C1CE2E8921FBD4A4005C2A3B /* LoopKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BC2C9921157D9300F9628F /* LoopKitUI.framework */; };
C1CE2E8A21FBD4ED005C2A3B /* LoopKitUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43BC2C9921157D9300F9628F /* LoopKitUI.framework */; };
C1CE2E8B21FBD540005C2A3B /* LoopKitUI.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BC2C9921157D9300F9628F /* LoopKitUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C1CE2E8C21FBD560005C2A3B /* ShareClientUI.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 43BC2CA221157E4300F9628F /* ShareClientUI.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
43BC2C9B21157DBC00F9628F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4DCEF2471D41A2A200724BCD /* Project object */;
proxyType = 1;
remoteGlobalIDString = 43BC2C9121157BD700F9628F;
remoteInfo = Cartfile;
};
4DCEF25C1D41A2A200724BCD /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 4DCEF2471D41A2A200724BCD /* Project object */;
Expand All @@ -77,22 +54,6 @@
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
C17D3CCA2184CFFF003458C8 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
C1CE2E8C21FBD560005C2A3B /* ShareClientUI.framework in CopyFiles */,
C1CE2E8B21FBD540005C2A3B /* LoopKitUI.framework in CopyFiles */,
C17D3CCC2184D012003458C8 /* LoopKit.framework in CopyFiles */,
C17D3CCB2184D00D003458C8 /* ShareClient.framework in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
43AB513821331BA700B3D58D /* LocalizedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalizedString.swift; sourceTree = "<group>"; };
43AB513B21331BBF00B3D58D /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = "<group>"; };
Expand All @@ -105,12 +66,12 @@
43AB514321331BFF00B3D58D /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
43AB514421331C0400B3D58D /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
43AB514521331C0700B3D58D /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
43BC2C9721157D2900F9628F /* LoopKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKit.framework; path = Carthage/Build/iOS/LoopKit.framework; sourceTree = "<group>"; };
43BC2C9921157D9300F9628F /* LoopKitUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKitUI.framework; path = Carthage/Build/iOS/LoopKitUI.framework; sourceTree = "<group>"; };
43BC2C9721157D2900F9628F /* LoopKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43BC2C9921157D9300F9628F /* LoopKitUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = LoopKitUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43BC2C9D21157DF200F9628F /* G4CGMManager+UI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "G4CGMManager+UI.swift"; sourceTree = "<group>"; };
43BC2C9E21157DF200F9628F /* G4CGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = G4CGMManager.swift; sourceTree = "<group>"; };
43BC2CA121157E4300F9628F /* ShareClient.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShareClient.framework; path = Carthage/Build/iOS/ShareClient.framework; sourceTree = "<group>"; };
43BC2CA221157E4300F9628F /* ShareClientUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ShareClientUI.framework; path = Carthage/Build/iOS/ShareClientUI.framework; sourceTree = "<group>"; };
43BC2CA121157E4300F9628F /* ShareClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ShareClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43BC2CA221157E4300F9628F /* ShareClientUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = ShareClientUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
43BC2CA521157E6900F9628F /* HealthKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = HealthKit.framework; path = System/Library/Frameworks/HealthKit.framework; sourceTree = SDKROOT; };
43BC2CA721157EA600F9628F /* TimeInterval.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeInterval.swift; sourceTree = "<group>"; };
43BC2CA921157F1900F9628F /* GlucoseG4+CGMManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GlucoseG4+CGMManager.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -156,9 +117,11 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4DCEF25B1D41A2A200724BCD /* G4ShareSpy.framework in Frameworks */,
C1CE2E8A21FBD4ED005C2A3B /* LoopKitUI.framework in Frameworks */,
C17D3CC92184CFEB003458C8 /* LoopKit.framework in Frameworks */,
C1CE2E8A21FBD4ED005C2A3B /* LoopKitUI.framework in Frameworks */,
A9B6C1DC225ED950002DFCD6 /* ShareClient.framework in Frameworks */,
A9B6C1DB225ED950002DFCD6 /* ShareClientUI.framework in Frameworks */,
4DCEF25B1D41A2A200724BCD /* G4ShareSpy.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -279,7 +242,6 @@
buildRules = (
);
dependencies = (
43BC2C9C21157DBC00F9628F /* PBXTargetDependency */,
);
name = G4ShareSpy;
productName = G4ShareSpy;
Expand All @@ -293,7 +255,7 @@
4DCEF2561D41A2A200724BCD /* Sources */,
4DCEF2571D41A2A200724BCD /* Frameworks */,
4DCEF2581D41A2A200724BCD /* Resources */,
C17D3CCA2184CFFF003458C8 /* CopyFiles */,
A9B6C1DA225ED8ED002DFCD6 /* Copy Frameworks with Carthage */,
);
buildRules = (
);
Expand All @@ -315,10 +277,6 @@
LastUpgradeCheck = 0940;
ORGANIZATIONNAME = "Mark Wilson";
TargetAttributes = {
43BC2C9121157BD700F9628F = {
CreatedOnToolsVersion = 9.4.1;
ProvisioningStyle = Automatic;
};
4DCEF24F1D41A2A200724BCD = {
CreatedOnToolsVersion = 7.3.1;
LastSwiftMigration = 0900;
Expand Down Expand Up @@ -353,7 +311,6 @@
targets = (
4DCEF24F1D41A2A200724BCD /* G4ShareSpy */,
4DCEF2591D41A2A200724BCD /* G4ShareSpyTests */,
43BC2C9121157BD700F9628F /* Cartfile */,
);
};
/* End PBXProject section */
Expand All @@ -377,19 +334,31 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
43BC2C9521157BE300F9628F /* Build Carthage Dependencies */ = {
A9B6C1DA225ED8ED002DFCD6 /* Copy Frameworks with Carthage */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"$(BUILT_PRODUCTS_DIR)/LoopKit.framework",
"$(BUILT_PRODUCTS_DIR)/LoopKitUI.framework",
"$(BUILT_PRODUCTS_DIR)/ShareClient.framework",
"$(BUILT_PRODUCTS_DIR)/ShareClientUI.framework",
);
name = "Copy Frameworks with Carthage";
outputFileListPaths = (
);
name = "Build Carthage Dependencies";
outputPaths = (
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKit.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/LoopKitUI.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ShareClient.framework",
"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/ShareClientUI.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"$CARTHAGE\" = \"YES\" ]; then\n echo \"Skipping carthage build because we're already in one\"\nelif [ -d $PROJECT_DIR/../../../Loop.xcworkspace ]; then \n echo \"Skipping carthage build because we're in a workspace\"\nelif [ -f $PROJECT_DIR/.gitmodules ]; then\n echo \"Skipping checkout due to presence of .gitmodules file\"\n if [ $ACTION = \"install\" ]; then\n echo \"You're installing: Make sure to keep all submodules up-to-date and run carthage build after changes.\"\n fi\nelse\n unset LLVM_TARGET_TRIPLE_SUFFIX\n echo \"Bootstrapping carthage dependencies\"\n /usr/local/bin/carthage bootstrap --project-directory \"$SRCROOT\" --cache-builds\nfi\n";
shellScript = "CARTHAGE_BUILD_DIR=\"${SRCROOT}/Carthage/Build\"\nif [ -n \"${IPHONEOS_DEPLOYMENT_TARGET}\" ]; then\n CARTHAGE_BUILD_DIR=\"${CARTHAGE_BUILD_DIR}/iOS\"\nelif [ -n \"${WATCHOS_DEPLOYMENT_TARGET}\" ]; then\n CARTHAGE_BUILD_DIR=\"${CARTHAGE_BUILD_DIR}/watchOS\"\nelse\n echo \"ERROR: Unexpected deployment target type\"\n exit 1\nfi\n\nfor SCRIPT_INPUT_FILE in ${!SCRIPT_INPUT_FILE_*}; do\n CARTHAGE_BUILD_FILE=\"${!SCRIPT_INPUT_FILE/${BUILT_PRODUCTS_DIR}/${CARTHAGE_BUILD_DIR}}\"\n if [ -e \"${CARTHAGE_BUILD_FILE}\" ]; then\n if [ -e \"${SCRIPT_INPUT_FILE}\" ]; then\n echo \"ERROR: Duplicate frameworks found at:\"\n echo \" ${SCRIPT_INPUT_FILE}\"\n echo \" ${CARTHAGE_BUILD_FILE}\"\n exit 1\n fi\n echo \"Substituting \\\"${CARTHAGE_BUILD_FILE}\\\" for \\\"${!SCRIPT_INPUT_FILE}\\\"\"\n export ${SCRIPT_INPUT_FILE}=\"${CARTHAGE_BUILD_FILE}\"\n fi\ndone\n\necho \"Copy Frameworks with Carthage\"\ncarthage copy-frameworks\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down Expand Up @@ -434,11 +403,6 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
43BC2C9C21157DBC00F9628F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 43BC2C9121157BD700F9628F /* Cartfile */;
targetProxy = 43BC2C9B21157DBC00F9628F /* PBXContainerItemProxy */;
};
4DCEF25D1D41A2A200724BCD /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 4DCEF24F1D41A2A200724BCD /* G4ShareSpy */;
Expand Down Expand Up @@ -467,22 +431,6 @@
/* End PBXVariantGroup section */

/* Begin XCBuildConfiguration section */
43BC2C9321157BD700F9628F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
};
43BC2C9421157BD700F9628F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
};
4DCEF2621D41A2A200724BCD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -698,15 +646,6 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
43BC2C9221157BD700F9628F /* Build configuration list for PBXAggregateTarget "Cartfile" */ = {
isa = XCConfigurationList;
buildConfigurations = (
43BC2C9321157BD700F9628F /* Debug */,
43BC2C9421157BD700F9628F /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
4DCEF24A1D41A2A200724BCD /* Build configuration list for PBXProject "G4ShareSpy" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
8 changes: 8 additions & 0 deletions G4ShareSpy.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
</plist>
23 changes: 2 additions & 21 deletions ...cshareddata/xcschemes/G4ShareSpy.xcscheme → ...oj/xcshareddata/xcschemes/Shared.xcscheme
View file
Open in desktop
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
buildImplicitDependencies = "NO">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand All @@ -28,26 +28,7 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4DCEF2591D41A2A200724BCD"
BuildableName = "G4ShareSpyTests.xctest"
BlueprintName = "G4ShareSpyTests"
ReferencedContainer = "container:G4ShareSpy.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "4DCEF24F1D41A2A200724BCD"
BuildableName = "G4ShareSpy.framework"
BlueprintName = "G4ShareSpy"
ReferencedContainer = "container:G4ShareSpy.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand Down