Merge pull request #353 from jeffh/fix-podspec

Fix podspec from throwAssertion merge

Author: jeffh

.travis.yml

@@ -2,9 +2,9 @@ osx_image: xcode8
 language: generic
 matrix:
   include:
-    # - os: osx
-    #   sudo: required
-    #   env: TYPE=podspec
+    - os: osx
+      sudo: required
+      env: TYPE=podspec
     - os: osx
       env: TYPE=ios NIMBLE_RUNTIME_IOS_SDK_VERSION=10.0
     - os: osx

Gemfile

@@ -1,4 +1,4 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem 'cocoapods'
+gem 'cocoapods', '1.1.0.rc.3'

Gemfile.lock

@@ -1,67 +1,69 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.6)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    claide (1.0.0)
-    cocoapods (1.0.1)
-      activesupport (>= 4.0.2)
-      claide (>= 1.0.0, < 2.0)
-      cocoapods-core (= 1.0.1)
-      cocoapods-deintegrate (>= 1.0.0, < 2.0)
-      cocoapods-downloader (>= 1.0.0, < 2.0)
+    claide (1.0.1)
+    cocoapods (1.1.0.rc.3)
+      activesupport (>= 4.0.2, < 5)
+      claide (>= 1.0.1, < 2.0)
+      cocoapods-core (= 1.1.0.rc.3)
+      cocoapods-deintegrate (>= 1.0.1, < 2.0)
+      cocoapods-downloader (>= 1.1.1, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.0.0, < 2.0)
-      cocoapods-try (>= 1.0.0, < 2.0)
+      cocoapods-trunk (= 1.1.0.beta.1)
+      cocoapods-try (>= 1.1.0, < 2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
-      fourflusher (~> 0.3.0)
-      molinillo (~> 0.4.5)
+      fourflusher (~> 2.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.5.1)
       nap (~> 1.0)
-      xcodeproj (>= 1.1.0, < 2.0)
-    cocoapods-core (1.0.1)
-      activesupport (>= 4.0.2)
+      xcodeproj (>= 1.3.2, < 2.0)
+    cocoapods-core (1.1.0.rc.3)
+      activesupport (>= 4.0.2, < 5)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.0)
-    cocoapods-downloader (1.0.1)
+    cocoapods-deintegrate (1.0.1)
+    cocoapods-downloader (1.1.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.0.0)
+    cocoapods-trunk (1.1.0.beta.1)
       nap (>= 0.8, < 2.0)
       netrc (= 0.7.8)
-    cocoapods-try (1.0.0)
+    cocoapods-try (1.1.0)
     colored (1.2)
     escape (0.0.4)
-    fourflusher (0.3.2)
+    fourflusher (2.0.1)
     fuzzy_match (2.0.4)
+    gh_inspector (1.0.2)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.9.0)
-    molinillo (0.4.5)
+    minitest (5.9.1)
+    molinillo (0.5.1)
     nap (1.1.0)
     netrc (0.7.8)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xcodeproj (1.1.0)
+    xcodeproj (1.3.2)
       activesupport (>= 3)
-      claide (>= 1.0.0, < 2.0)
+      claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods
+  cocoapods (= 1.1.0.rc.3)
 
 BUNDLED WITH
-   1.12.3
+   1.13.1

Nimble.podspec

@@ -11,12 +11,38 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.10"
   s.tvos.deployment_target = "9.0"
-  s.source       = { :git => "https://github.com/Quick/Nimble.git", :tag => "v#{s.version}" }
+  s.source       = { :git => "https://github.com/Quick/Nimble.git",
+                     :tag => "v#{s.version}" }
+
+  s.source_files = "Sources/**/*.{swift,h,m,c}"
+
+  s.osx.exclude_files = [
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift",
+  ]
+  s.ios.exclude_files = [
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift",
+  ]
+  s.tvos.exclude_files = [
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.m",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.{h,c}",
+    "Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.swift",
+    "Sources/Lib/CwlPreconditionTesting/CwlCatchException/CwlCatchException.m",
+  ]
 
-  s.source_files = "Sources/**/**/*.{swift,h,m}"
   s.private_header_files = "Sources/NimbleObjectiveC/CurrentTestCaseTracker.h"
+  s.osx.private_header_files = "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h"
+  s.tvos.private_header_files = "Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/mach_excServer.h"
+
   s.exclude_files = "Sources/Nimble/Adapters/NonObjectiveC/*.swift"
   s.weak_framework = "XCTest"
   s.requires_arc = true
-  s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO', 'OTHER_LDFLAGS' => '-weak-lswiftXCTest', 'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"' }
+  s.compiler_flags = '-DPRODUCT_NAME=Nimble/Nimble'
+  s.pod_target_xcconfig = {
+    'ENABLE_BITCODE' => 'NO',
+    'OTHER_LDFLAGS' => '-weak-lswiftXCTest',
+    'FRAMEWORK_SEARCH_PATHS' => '$(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks"',
+  }
 end

Nimble.xcodeproj/project.pbxproj

@@ -48,6 +48,8 @@
 		1F1B5AD51963E13900CA8BF9 /* BeAKindOfTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1B5AD31963E13900CA8BF9 /* BeAKindOfTest.swift */; };
 		1F299EAB19627B2D002641AF /* BeEmptyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F299EAA19627B2D002641AF /* BeEmptyTest.swift */; };
 		1F299EAC19627B2D002641AF /* BeEmptyTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F299EAA19627B2D002641AF /* BeEmptyTest.swift */; };
+		1F2D175B1DB618ED00EE9C7A /* mach_excServer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9630C0261C6D0BB0000693EE /* mach_excServer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		1F2D175C1DB618F000EE9C7A /* mach_excServer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9630C0221C6D0B82000693EE /* mach_excServer.c */; };
 		1F43728A1A1B343800EB80F8 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD251968AB07008ED995 /* Functional.swift */; };
 		1F43728B1A1B343900EB80F8 /* Functional.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD251968AB07008ED995 /* Functional.swift */; };
 		1F43728C1A1B343C00EB80F8 /* SourceLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FD8CD271968AB07008ED995 /* SourceLocation.swift */; };
@@ -97,7 +99,6 @@
 		1F4BB8A41DAC9DC90048464B /* CwlCatchBadInstructionPOSIX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB89D1DAC9D930048464B /* CwlCatchBadInstructionPOSIX.swift */; };
 		1F4BB8AB1DAC9DE50048464B /* CwlCatchBadInstruction.h in Headers */ = {isa = PBXBuildFile; fileRef = 9630C00A1C6D0B18000693EE /* CwlCatchBadInstruction.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		1F4BB8AE1DAC9DED0048464B /* CwlCatchException.h in Headers */ = {isa = PBXBuildFile; fileRef = 9630C0161C6D0B2F000693EE /* CwlCatchException.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		1F4BB8B21DACA0030048464B /* mach_exc.defs in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B11DACA0030048464B /* mach_exc.defs */; settings = {ATTRIBUTES = (Server, ); }; };
 		1F4BB8B61DACA0E30048464B /* ThrowAssertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */; };
 		1F4BB8B71DACA0E40048464B /* ThrowAssertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */; };
 		1F4BB8B81DACAACF0048464B /* ThrowAssertionTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */; };
@@ -479,7 +480,6 @@
 		1F4A569C1A3B3565009E1637 /* ObjCMatchTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCMatchTest.m; sourceTree = "<group>"; };
 		1F4A569F1A3B359E009E1637 /* ObjCRaiseExceptionTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ObjCRaiseExceptionTest.m; sourceTree = "<group>"; };
 		1F4BB89D1DAC9D930048464B /* CwlCatchBadInstructionPOSIX.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CwlCatchBadInstructionPOSIX.swift; path = CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift; sourceTree = "<group>"; };
-		1F4BB8B11DACA0030048464B /* mach_exc.defs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.mig; path = mach_exc.defs; sourceTree = "<group>"; };
 		1F4BB8B31DACA0D00048464B /* ThrowAssertionTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThrowAssertionTest.swift; sourceTree = "<group>"; };
 		1F5DF1551BDCA0CE00C3A531 /* Nimble.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nimble.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		1F5DF15E1BDCA0CE00C3A531 /* NimbleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NimbleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -869,7 +869,6 @@
 		9630C0091C6D0ABA000693EE /* CwlPreconditionTesting */ = {
 			isa = PBXGroup;
 			children = (
-				1F4BB8B11DACA0030048464B /* mach_exc.defs */,
 				1F4BB89D1DAC9D930048464B /* CwlCatchBadInstructionPOSIX.swift */,
 				9630C02B1C6D125F000693EE /* CwlBadInstructionException.swift */,
 				9630C00C1C6D0B18000693EE /* CwlCatchBadInstruction.swift */,
@@ -921,6 +920,7 @@
 			files = (
 				9630C00E1C6D0B18000693EE /* CwlCatchBadInstruction.h in Headers */,
 				9630C01A1C6D0B2F000693EE /* CwlCatchException.h in Headers */,
+				1F2D175B1DB618ED00EE9C7A /* mach_excServer.h in Headers */,
 				1F1871DF1CA89EF500A34BF2 /* NMBStringify.h in Headers */,
 				1F1871DD1CA89EF500A34BF2 /* DSL.h in Headers */,
 				1F1871DE1CA89EF500A34BF2 /* NMBExceptionCapture.h in Headers */,
@@ -1434,9 +1434,9 @@
 				F8A1BE301CB3710900031679 /* XCTestObservationCenter+Register.m in Sources */,
 				1F1871DA1CA89EF100A34BF2 /* NMBObjCMatcher.swift in Sources */,
 				1FD8CD311968AB07008ED995 /* AdapterProtocols.swift in Sources */,
+				1F2D175C1DB618F000EE9C7A /* mach_excServer.c in Sources */,
 				1F1871D21CA89EEE00A34BF2 /* DSL.m in Sources */,
 				1F4BB8BB1DACBFD00048464B /* CwlCatchBadInstruction.m in Sources */,
-				1F4BB8B21DACA0030048464B /* mach_exc.defs in Sources */,
 				AE7ADE461C80BF8000B94CD3 /* MatchError.swift in Sources */,
 				1FC494AB1C29CBA40010975C /* NimbleEnvironment.swift in Sources */,
 				1FD8CD5F1968AB07008ED995 /* RaisesException.swift in Sources */,