fixed failing tests caused by corrupted Carthage files (#299)

contentful · Apr 28, 2020 · deefc3f · deefc3f
1 parent ce412c5
commit deefc3f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/.env b/.env
@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=5.0.10
+CONTENTFUL_SDK_VERSION=5.0.11
diff --git a/.gitignore b/.gitignore
@@ -17,5 +17,5 @@ Packages
 *.xcscmblueprint
 
 # Carthage
-Carthage/Build/
+Carthage
 *.framework.zip
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,6 +1,2 @@
 github "venmo/DVR" ~> 1.3.2
-<<<<<<< HEAD
-github "AliSoftware/OHHTTPStubs" ~> 7.0.0
-=======
 github "AliSoftware/OHHTTPStubs" ~> 8.0.0
->>>>>>> master
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,6 +1,2 @@
-<<<<<<< HEAD
-github "AliSoftware/OHHTTPStubs" "7.0.0"
-=======
 github "AliSoftware/OHHTTPStubs" "8.0.0"
->>>>>>> master
 github "venmo/DVR" "v1.3.2"
diff --git a/Carthage/Checkouts/OHHTTPStubs b/Carthage/Checkouts/OHHTTPStubs
diff --git a/Config.xcconfig b/Config.xcconfig
@@ -1 +1 @@
-CONTENTFUL_SDK_VERSION=5.0.10
+CONTENTFUL_SDK_VERSION=5.0.11
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		CONTENTFUL_SDK_VERSION=5.0.10
		CONTENTFUL_SDK_VERSION=5.0.11
+16 −8		.travis.yml
+8 −0		CHANGELOG.md
+5 −2		Examples/ObjC/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+1 −1		Examples/ObjC/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+9 −9		Examples/ObjC/Podfile.lock
+2 −2		Examples/ObjC/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+9 −9		Examples/ObjC/Pods/Manifest.lock
+12 −10		Examples/ObjC/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/MainViewController.swift
+8 −5		Examples/Swift/OHHTTPStubsDemo.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/OHHTTPStubsDemo.xcodeproj/xcshareddata/xcschemes/OHHTTPStubsDemo.xcscheme
+10 −10		Examples/Swift/Podfile.lock
+2 −2		Examples/Swift/Pods/Local Podspecs/OHHTTPStubs.podspec.json
+10 −10		Examples/Swift/Pods/Manifest.lock
+47 −45		Examples/Swift/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs-Info.plist
+1 −0		Examples/Swift/Pods/Target Support Files/OHHTTPStubs/OHHTTPStubs.xcconfig
+1 −2		OHHTTPStubs.podspec
+13 −14		OHHTTPStubs/OHHTTPStubs.xcodeproj/project.pbxproj
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs Mac Framework.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS Framework.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs iOS StaticLib.xcscheme
+1 −1		OHHTTPStubs/OHHTTPStubs.xcodeproj/xcshareddata/xcschemes/OHHTTPStubs tvOS Framework.xcscheme
+5 −2		OHHTTPStubs/Pods/Pods.xcodeproj/project.pbxproj
+1 −1		OHHTTPStubs/UnitTests/Test Suites/NSURLSessionTests.m
+6 −5		README.md