From 0278d11c48c7f9b6fecab2942f4e5175cddcb6ed Mon Sep 17 00:00:00 2001 From: Delisa Mason Date: Tue, 8 Oct 2019 17:55:33 +0100 Subject: [PATCH] build: Remove now unneeded workspaces Also reduces confusion where Carthage may pick "OSX.xcworkspace" to build for an iOS project --- Makefile | 2 +- OSX.xcworkspace/contents.xcworkspacedata | 7 ---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ---- .../xcshareddata/OSX.xcscmblueprint | 37 ------------------- iOS.xcworkspace/contents.xcworkspacedata | 7 ---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ---- .../xcshareddata/iOS.xcscmblueprint | 37 ------------------- tvOS.xcworkspace/contents.xcworkspacedata | 7 ---- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ---- .../xcshareddata/tvOS.xcscmblueprint | 30 --------------- 10 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 OSX.xcworkspace/contents.xcworkspacedata delete mode 100644 OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint delete mode 100644 iOS.xcworkspace/contents.xcworkspacedata delete mode 100644 iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint delete mode 100644 tvOS.xcworkspace/contents.xcworkspacedata delete mode 100644 tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint diff --git a/Makefile b/Makefile index ac5f961a9..a204db4b2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ PLATFORM?=iOS OS?=latest TEST_CONFIGURATION?=Debug -BUILD_FLAGS=-workspace $(PLATFORM).xcworkspace -scheme Bugsnag -derivedDataPath build +BUILD_FLAGS=-project $(PLATFORM)/Bugsnag.xcodeproj -scheme Bugsnag -derivedDataPath build ifeq ($(PLATFORM),OSX) SDK?=macosx diff --git a/OSX.xcworkspace/contents.xcworkspacedata b/OSX.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 2ecb76f07..000000000 --- a/OSX.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/OSX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint b/OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint deleted file mode 100644 index 02e84b142..000000000 --- a/OSX.xcworkspace/xcshareddata/OSX.xcscmblueprint +++ /dev/null @@ -1,37 +0,0 @@ -{ - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90", - "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { - - }, - "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : 0, - "D2885296440547CB23891301E79B480A22EAC5F6" : 0, - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : 0 - }, - "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "64F71D72-7937-47C7-9FA1-099F1EFA7F49", - "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : "bugsnag-cocoa\/development\/Kiwi\/", - "D2885296440547CB23891301E79B480A22EAC5F6" : "bugsnag-cocoa-r\/Carthage\/Checkouts\/KSCrash\/", - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : "bugsnag-cocoa-r\/" - }, - "DVTSourceControlWorkspaceBlueprintNameKey" : "OSX", - "DVTSourceControlWorkspaceBlueprintVersion" : 204, - "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "OSX.xcworkspace", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kiwi-bdd\/Kiwi", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:bugsnag\/bugsnag-cocoa", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kstenerud\/KSCrash", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D2885296440547CB23891301E79B480A22EAC5F6" - } - ] -} \ No newline at end of file diff --git a/iOS.xcworkspace/contents.xcworkspacedata b/iOS.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 42deaa1b5..000000000 --- a/iOS.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/iOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint b/iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint deleted file mode 100644 index 373a8f36e..000000000 --- a/iOS.xcworkspace/xcshareddata/iOS.xcscmblueprint +++ /dev/null @@ -1,37 +0,0 @@ -{ - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90", - "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { - - }, - "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : 0, - "D2885296440547CB23891301E79B480A22EAC5F6" : 0, - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : 0 - }, - "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "103C8171-87E2-4033-A0B3-0E14C4C49F02", - "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" : "bugsnag-cocoa\/development\/Kiwi\/", - "D2885296440547CB23891301E79B480A22EAC5F6" : "bugsnag-cocoa\/Carthage\/Checkouts\/KSCrash\/", - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : "bugsnag-cocoa\/" - }, - "DVTSourceControlWorkspaceBlueprintNameKey" : "iOS", - "DVTSourceControlWorkspaceBlueprintVersion" : 204, - "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "iOS.xcworkspace", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kiwi-bdd\/Kiwi", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "4FD7C20106F5BD91089CFF7BC197AC2E448D173B" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:bugsnag\/bugsnag-cocoa", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kstenerud\/KSCrash", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D2885296440547CB23891301E79B480A22EAC5F6" - } - ] -} \ No newline at end of file diff --git a/tvOS.xcworkspace/contents.xcworkspacedata b/tvOS.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 1d3039102..000000000 --- a/tvOS.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d981003..000000000 --- a/tvOS.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint b/tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint deleted file mode 100644 index a46599904..000000000 --- a/tvOS.xcworkspace/xcshareddata/tvOS.xcscmblueprint +++ /dev/null @@ -1,30 +0,0 @@ -{ - "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90", - "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : { - - }, - "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : { - "D2885296440547CB23891301E79B480A22EAC5F6" : 9223372036854775807, - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : 9223372036854775807 - }, - "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "CD7F443B-EF8B-403E-B13A-B0D711C0B807", - "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : { - "D2885296440547CB23891301E79B480A22EAC5F6" : "bugsnag-cocoa\/Carthage\/Checkouts\/KSCrash\/", - "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" : "bugsnag-cocoa\/" - }, - "DVTSourceControlWorkspaceBlueprintNameKey" : "tvOS", - "DVTSourceControlWorkspaceBlueprintVersion" : 204, - "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "tvOS.xcworkspace", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [ - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "github.com:bugsnag\/bugsnag-cocoa.git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C4519EFDD2C3B96E9BD67A5CED575450FFB87C90" - }, - { - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/kstenerud\/KSCrash.git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git", - "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D2885296440547CB23891301E79B480A22EAC5F6" - } - ] -} \ No newline at end of file