Skip to content

Commit 2bebc53

Browse files
committed
Preparation for 3.8.1 release
1 parent 6064959 commit 2bebc53

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
BUILD_DIR = $(CURDIR)/Build
1010
PRODUCT_DIR = $(BUILD_DIR)/Product
11-
XCODECI = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockCI.xcconfig"
11+
XCODECI = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockCI.xcconfig" -destination-timeout 300
1212
XCODEDIST = xcodebuild -project "$(CURDIR)/Source/OCMock.xcodeproj" -xcconfig "$(CURDIR)/Source/OCMockDist.xcconfig"
1313
SHELL = /bin/bash -e -o pipefail
1414

OCMock.podspec

+29-28
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
11
Pod::Spec.new do |s|
2-
s.name = "OCMock"
3-
s.version = "3.8"
4-
5-
s.summary = "Mock objects for Objective-C"
6-
s.description = <<-DESC
2+
s.name = "OCMock"
3+
s.version = "3.8.1"
4+
5+
s.summary = "Mock objects for Objective-C"
6+
s.description = <<-DESC
77
OCMock is an Objective-C implementation of mock objects. It provides
88
stubs that return pre-determined values for specific method invocations,
99
dynamic mocks that can be used to verify interaction patterns, and
1010
partial mocks to overwrite selected methods of existing objects.
1111
DESC
12-
13-
s.homepage = "http://ocmock.org"
14-
s.documentation_url = "http://ocmock.org/reference/"
15-
s.license = { :type => "Apache 2.0", :file => "License.txt" }
1612

17-
s.author = { "Erik Doernenburg" => "erik@doernenburg.com" }
18-
s.social_media_url = "http://twitter.com/erikdoe"
19-
20-
s.source = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.8" }
21-
s.source_files = "Source/OCMock/*.{h,m}"
13+
s.homepage = "http://ocmock.org"
14+
s.documentation_url = "http://ocmock.org/reference/"
15+
s.license = { :type => "Apache 2.0", :file => "License.txt" }
16+
17+
s.author = { "Erik Doernenburg" => "erik@doernenburg.com" }
18+
s.social_media_url = "http://twitter.com/erikdoe"
2219

23-
s.requires_arc = false
24-
s.ios.deployment_target = '9.0'
25-
s.osx.deployment_target = '10.10'
26-
s.tvos.deployment_target = '9.0'
20+
s.source = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.8.1" }
21+
s.source_files = "Source/OCMock/*.{h,m}"
22+
23+
s.requires_arc = false
24+
s.osx.deployment_target = '10.10'
25+
s.ios.deployment_target = '9.0'
26+
s.tvos.deployment_target = '9.0'
2727
s.watchos.deployment_target = '4.0'
28-
s.ios.framework = 'XCTest'
29-
s.osx.framework = 'XCTest'
30-
s.tvos.framework = 'XCTest'
31-
s.public_header_files = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h",
32-
"OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h",
33-
"OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h",
34-
"OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h",
35-
"OCMockMacros.h" ]
36-
.map { |file| "Source/OCMock/" + file }
37-
28+
s.osx.framework = 'XCTest'
29+
s.ios.framework = 'XCTest'
30+
s.tvos.framework = 'XCTest'
31+
32+
s.public_header_files = ["OCMock.h", "OCMockObject.h", "OCMArg.h", "OCMConstraint.h",
33+
"OCMLocation.h", "OCMMacroState.h", "OCMRecorder.h",
34+
"OCMStubRecorder.h", "NSNotificationCenter+OCMAdditions.h",
35+
"OCMFunctions.h", "OCMVerifier.h", "OCMQuantifier.h",
36+
"OCMockMacros.h"
37+
]
38+
.map { |file| "Source/OCMock/" + file }
3839
end

Source/OCMock.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1427,7 +1427,7 @@
14271427
);
14281428
runOnlyForDeploymentPostprocessing = 0;
14291429
shellPath = /bin/sh;
1430-
shellScript = "# Resolve dependencies using Carthage\nif [ ! -d ${PROJECT_DIR}/Carthage/Build ]; then\n carthage update --platform macOS\nfi\n";
1430+
shellScript = "# Resolve dependencies using Carthage\nif [ ! -d ${PROJECT_DIR}/Carthage/Build/Mac/OCHamcrest.framework ]; then\n carthage update --platform macOS\nfi\n";
14311431
};
14321432
/* End PBXShellScriptBuildPhase section */
14331433

0 commit comments

Comments
 (0)