Preparation for 3.8.1 release

erikdoe · Dec 30, 2020 · 2bebc53 · 2bebc53
1 parent 6064959
commit 2bebc53
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@
 
 BUILD_DIR   = $(CURDIR)/Build
 PRODUCT_DIR = $(BUILD_DIR)/Product
-XCODECI     = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockCI.xcconfig"
+XCODECI     = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockCI.xcconfig" -destination-timeout 300
 XCODEDIST   = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockDist.xcconfig"
 SHELL       = /bin/bash -e -o pipefail
 

diff --git a/OCMock.podspec b/OCMock.podspec
@@ -1,38 +1,39 @@
 Pod::Spec.new do |s|
-  s.name                  = "OCMock"
-  s.version               = "3.8"
-  
-  s.summary               = "Mock objects for Objective-C"
-  s.description           = <<-DESC
+  s.name                      = "OCMock"
+  s.version                   = "3.8.1"
+
+  s.summary                   = "Mock objects for Objective-C"
+  s.description               = <<-DESC
                         OCMock is an Objective-C implementation of mock objects. It provides
                         stubs that return pre-determined values for specific method invocations,
                         dynamic mocks that can be used to verify interaction patterns, and
                         partial mocks to overwrite selected methods of existing objects.
                         DESC
-
-  s.homepage              = "http://ocmock.org"
-  s.documentation_url     = "http://ocmock.org/reference/"
-  s.license               = { :type => "Apache 2.0", :file => "License.txt" }
 
-  s.author                = { "Erik Doernenburg" => "erik@doernenburg.com" }
-  s.social_media_url      = "http://twitter.com/erikdoe"
-
-  s.source                = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.8" }
-  s.source_files          = "Source/OCMock/*.{h,m}"
+  s.homepage                  = "http://ocmock.org"
+  s.documentation_url         = "http://ocmock.org/reference/"
+  s.license                   = { :type => "Apache 2.0", :file => "License.txt" }
+
+  s.author                    = { "Erik Doernenburg" => "erik@doernenburg.com" }
+  s.social_media_url          = "http://twitter.com/erikdoe"
 
-  s.requires_arc          = false
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.10'
-  s.tvos.deployment_target = '9.0'
+  s.source                    = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.8.1" }
+  s.source_files              = "Source/OCMock/*.{h,m}"
+
+  s.requires_arc              = false
+  s.osx.deployment_target     = '10.10'
+  s.ios.deployment_target     = '9.0'
+  s.tvos.deployment_target    = '9.0'
   s.watchos.deployment_target = '4.0'
-  s.ios.framework = 'XCTest'
-  s.osx.framework = 'XCTest'
-  s.tvos.framework = 'XCTest'   
-  s.public_header_files   = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h", 
-                              "OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h", 
-                              "OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h", 
-                              "OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h",
-							  "OCMockMacros.h" ]
-                              .map { |file| "Source/OCMock/" + file }
-
+  s.osx.framework             = 'XCTest'
+  s.ios.framework             = 'XCTest'
+  s.tvos.framework            = 'XCTest'
+
+  s.public_header_files       = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h", 
+                                 "OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h", 
+                                 "OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h", 
+                                 "OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h",
+                                 "OCMockMacros.h" 
+								]
+                                .map { |file| "Source/OCMock/" + file }
 end
diff --git a/Source/OCMock.xcodeproj/project.pbxproj b/Source/OCMock.xcodeproj/project.pbxproj
@@ -1427,7 +1427,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Resolve dependencies using Carthage\nif [ ! -d ${PROJECT_DIR}/Carthage/Build ]; then\n    carthage update --platform macOS\nfi\n";
+			shellScript = "# Resolve dependencies using Carthage\nif [ ! -d ${PROJECT_DIR}/Carthage/Build/Mac/OCHamcrest.framework ]; then\n    carthage update --platform macOS\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */