Skip to content

Commit d50a465

Browse files
authored
Redo the work of consolidating xcodeproj targets (#1093)
Adds support for DriverKit
1 parent 92ef5f2 commit d50a465

File tree

6 files changed

+76
-2020
lines changed

6 files changed

+76
-2020
lines changed

Nimble.xcodeproj/project.pbxproj

Lines changed: 64 additions & 1756 deletions
Large diffs are not rendered by default.

Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme

Lines changed: 0 additions & 79 deletions
This file was deleted.

Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme

Lines changed: 0 additions & 96 deletions
This file was deleted.

Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-watchOS.xcscheme

Lines changed: 0 additions & 77 deletions
This file was deleted.

Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme renamed to Nimble.xcodeproj/xcshareddata/xcschemes/Nimble.xcscheme

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
1818
BuildableName = "Nimble.framework"
19-
BlueprintName = "Nimble-macOS"
19+
BlueprintName = "Nimble"
2020
ReferencedContainer = "container:Nimble.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
2626
buildConfiguration = "Debug"
27-
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28-
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
27+
selectedDebuggerIdentifier = ""
28+
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
<TestableReference
@@ -35,7 +35,7 @@
3535
BuildableIdentifier = "primary"
3636
BlueprintIdentifier = "1F925EB6195C0D6300ED456B"
3737
BuildableName = "NimbleTests.xctest"
38-
BlueprintName = "Nimble-macOSTests"
38+
BlueprintName = "NimbleTests"
3939
ReferencedContainer = "container:Nimble.xcodeproj">
4040
</BuildableReference>
4141
</TestableReference>
@@ -57,7 +57,7 @@
5757
BuildableIdentifier = "primary"
5858
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
5959
BuildableName = "Nimble.framework"
60-
BlueprintName = "Nimble-macOS"
60+
BlueprintName = "Nimble"
6161
ReferencedContainer = "container:Nimble.xcodeproj">
6262
</BuildableReference>
6363
</MacroExpansion>

test

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,28 +65,28 @@ function run {
6565
}
6666

6767
function test_ios {
68-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-iOS" -configuration "Debug" -destination "generic/platform=iOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
68+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -destination "generic/platform=iOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
6969

7070
run osascript -e 'tell app "Simulator" to quit'
71-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-iOS" -configuration "Debug" -sdk "iphonesimulator$BUILD_IOS_SDK_VERSION" -destination "name=iPhone SE (3rd generation),OS=$RUNTIME_IOS_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
71+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -sdk "iphonesimulator$BUILD_IOS_SDK_VERSION" -destination "name=iPhone SE (3rd generation),OS=$RUNTIME_IOS_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
7272
}
7373

7474
function test_tvos {
75-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-tvOS" -configuration "Debug" -destination "generic/platform=tvOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
75+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -destination "generic/platform=tvOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
7676

7777
run osascript -e 'tell app "Simulator" to quit'
78-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-tvOS" -configuration "Debug" -sdk "appletvsimulator$BUILD_TVOS_SDK_VERSION" -destination "name=Apple TV,OS=$RUNTIME_TVOS_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
78+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -sdk "appletvsimulator$BUILD_TVOS_SDK_VERSION" -destination "name=Apple TV,OS=$RUNTIME_TVOS_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
7979
}
8080

8181
function test_watchos {
82-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-watchOS" -configuration "Debug" -destination "generic/platform=watchOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
82+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -destination "generic/platform=watchOS" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build | xcpretty
8383

8484
run osascript -e 'tell app "Simulator" to quit'
85-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-watchOS" -configuration "Debug" -sdk "watchsimulator$BUILD_WATCHOS_SDK_VERSION" -destination "name=Apple Watch Series 6 (40mm),OS=$RUNTIME_WATCHOS_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
85+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -sdk "watchsimulator$BUILD_WATCHOS_SDK_VERSION" -destination "name=Apple Watch Series 6 (40mm),OS=$RUNTIME_WATCHOS_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
8686
}
8787

8888
function test_macos {
89-
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble-macOS" -configuration "Debug" -sdk "macosx$BUILD_MACOS_SDK_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
89+
run set -o pipefail && xcodebuild -project Nimble.xcodeproj -scheme "Nimble" -configuration "Debug" -sdk "macosx$BUILD_MACOS_SDK_VERSION" OTHER_SWIFT_FLAGS='$(inherited) -suppress-warnings' build-for-testing test-without-building | xcpretty
9090
}
9191

9292
function test_xcode_spm_macos {

0 commit comments

Comments
 (0)