Skip to content

Commit cb4acde

Browse files
committed
Fix up podspec from throwAssertion matcher
- Discard MiG file and use pre-generated ones instead for macOS - Cocoapods doesn't support MiG files to generate server code - Match file excludes to ones in xcodeproj - Add explicit `PRODUCT_NAME` preprocessor to match xcodeproj config - Add newlines in podspec file
1 parent d439bba commit cb4acde

File tree

3 files changed

+33
-126
lines changed

3 files changed

+33
-126
lines changed

Nimble.podspec

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,38 @@ Pod::Spec.new do |s|
1111
s.ios.deployment_target = "8.0"
1212
s.osx.deployment_target = "10.10"
1313
s.tvos.deployment_target = "9.0"
14-
s.source = { :git => "https://github.com/Quick/Nimble.git", :tag => "v#{s.version}" }
14+
s.source = { :git => "https://github.com/Quick/Nimble.git",
15+
:tag => "v#{s.version}" }
16+
17+
s.source_files = "Sources/**/*.{swift,h,m,c}"
18+
19+
s.osx.exclude_files = [
20+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift",
21+
]
22+
s.ios.exclude_files = [
23+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift",
24+
]
25+
s.tvos.exclude_files = [
26+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift",
27+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m",
28+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift",
29+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift",
30+
"Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.{h,c}",
31+
"Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift",
32+
"Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.m",
33+
]
1534

16-
s.source_files = "Sources/**/**/*.{swift,h,m}"
1735
s.private_header_files = "Sources/NimbleObjectiveC/CurrentTestCaseTracker.h"
36+
s.osx.private_header_files = "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h"
37+
s.tvos.private_header_files = "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h"
38+
1839
s.exclude_files = "Sources/Nimble/Adapters/NonObjectiveC/*.swift"
1940
s.weak_framework = "XCTest"
2041
s.requires_arc = true
21-
s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'OTHER_LDFLAGS' => '-weak-lswiftXCTest', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' }
42+
s.compiler_flags = '-DPRODUCT_NAME=Nimble/Nimble'
43+
s.pod_target_xcconfig = {
44+
'ENABLE_BITCODE' => 'NO',
45+
'OTHER_LDFLAGS' => '-weak-lswiftXCTest',
46+
'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"',
47+
}
2248
end

Nimble.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@
4848
1F1B5AD51963E13900CA8BF9 /* BeAKindOfTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1B5AD31963E13900CA8BF9 /* BeAKindOfTest.swift */; };
4949
1F299EAB19627B2D002641AF /* BeEmptyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F299EAA19627B2D002641AF /* BeEmptyTest.swift */; };
5050
1F299EAC19627B2D002641AF /* BeEmptyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F299EAA19627B2D002641AF /* BeEmptyTest.swift */; };
51+
1F2D175B1DB618ED00EE9C7A /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9630C0261C6D0BB0000693EE /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; };
52+
1F2D175C1DB618F000EE9C7A /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9630C0221C6D0B82000693EE /* mach_excServer.c */; };
5153
1F43728A1A1B343800EB80F8 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD251968AB07008ED995 /* Functional.swift */; };
5254
1F43728B1A1B343900EB80F8 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD251968AB07008ED995 /* Functional.swift */; };
5355
1F43728C1A1B343C00EB80F8 /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD271968AB07008ED995 /* SourceLocation.swift */; };
@@ -97,7 +99,6 @@
9799
1F4BB8A41DAC9DC90048464B /* CwlCatchBadInstructionPOSIX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB89D1DAC9D930048464B /* CwlCatchBadInstructionPOSIX.swift */; };
98100
1F4BB8AB1DAC9DE50048464B /* CwlCatchBadInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 9630C00A1C6D0B18000693EE /* CwlCatchBadInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; };
99101
1F4BB8AE1DAC9DED0048464B /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = 9630C0161C6D0B2F000693EE /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; };
100-
1F4BB8B21DACA0030048464B /* mach_exc.defs in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B11DACA0030048464B /* mach_exc.defs */; settings = {ATTRIBUTES = (Server, ); }; };
101102
1F4BB8B61DACA0E30048464B /* ThrowAssertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */; };
102103
1F4BB8B71DACA0E40048464B /* ThrowAssertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */; };
103104
1F4BB8B81DACAACF0048464B /* ThrowAssertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */; };
@@ -479,7 +480,6 @@
479480
1F4A569C1A3B3565009E1637 /* ObjCMatchTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCMatchTest.m; sourceTree = "<group>"; };
480481
1F4A569F1A3B359E009E1637 /* ObjCRaiseExceptionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCRaiseExceptionTest.m; sourceTree = "<group>"; };
481482
1F4BB89D1DAC9D930048464B /* CwlCatchBadInstructionPOSIX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstructionPOSIX.swift; path = CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift; sourceTree = "<group>"; };
482-
1F4BB8B11DACA0030048464B /* mach_exc.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = mach_exc.defs; sourceTree = "<group>"; };
483483
1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThrowAssertionTest.swift; sourceTree = "<group>"; };
484484
1F5DF1551BDCA0CE00C3A531 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
485485
1F5DF15E1BDCA0CE00C3A531 /* NimbleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NimbleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -869,7 +869,6 @@
869869
9630C0091C6D0ABA000693EE /* CwlPreconditionTesting */ = {
870870
isa = PBXGroup;
871871
children = (
872-
1F4BB8B11DACA0030048464B /* mach_exc.defs */,
873872
1F4BB89D1DAC9D930048464B /* CwlCatchBadInstructionPOSIX.swift */,
874873
9630C02B1C6D125F000693EE /* CwlBadInstructionException.swift */,
875874
9630C00C1C6D0B18000693EE /* CwlCatchBadInstruction.swift */,
@@ -921,6 +920,7 @@
921920
files = (
922921
9630C00E1C6D0B18000693EE /* CwlCatchBadInstruction.h in Headers */,
923922
9630C01A1C6D0B2F000693EE /* CwlCatchException.h in Headers */,
923+
1F2D175B1DB618ED00EE9C7A /* mach_excServer.h in Headers */,
924924
1F1871DF1CA89EF500A34BF2 /* NMBStringify.h in Headers */,
925925
1F1871DD1CA89EF500A34BF2 /* DSL.h in Headers */,
926926
1F1871DE1CA89EF500A34BF2 /* NMBExceptionCapture.h in Headers */,
@@ -1434,9 +1434,9 @@
14341434
F8A1BE301CB3710900031679 /* XCTestObservationCenter+Register.m in Sources */,
14351435
1F1871DA1CA89EF100A34BF2 /* NMBObjCMatcher.swift in Sources */,
14361436
1FD8CD311968AB07008ED995 /* AdapterProtocols.swift in Sources */,
1437+
1F2D175C1DB618F000EE9C7A /* mach_excServer.c in Sources */,
14371438
1F1871D21CA89EEE00A34BF2 /* DSL.m in Sources */,
14381439
1F4BB8BB1DACBFD00048464B /* CwlCatchBadInstruction.m in Sources */,
1439-
1F4BB8B21DACA0030048464B /* mach_exc.defs in Sources */,
14401440
AE7ADE461C80BF8000B94CD3 /* MatchError.swift in Sources */,
14411441
1FC494AB1C29CBA40010975C /* NimbleEnvironment.swift in Sources */,
14421442
1FD8CD5F1968AB07008ED995 /* RaisesException.swift in Sources */,

Sources/Lib/CwlPreconditionTesting/mach_exc.defs

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

0 commit comments

Comments
 (0)