Skip to content

Commit

Permalink
Preparation for 3.4 release.
Browse files Browse the repository at this point in the history
  • Loading branch information
erikdoe committed Dec 22, 2016
1 parent 9bca62d commit 69142b9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions OCMock.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "OCMock"
s.version = "3.3.1"
s.version = "3.4"

s.summary = "Mock objects for Objective-C"
s.description = <<-DESC
Expand All @@ -17,11 +17,11 @@ Pod::Spec.new do |s|
s.author = { "Erik Doernenburg" => "[email protected]" }
s.social_media_url = "http://twitter.com/erikdoe"

s.source = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.3.1" }
s.source = { :git => "https://github.com/erikdoe/ocmock.git", :tag => "v3.4" }
s.source_files = "Source/OCMock/*.{h,m}"

s.requires_arc = false
s.ios.deployment_target = '5.0'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.6'
s.tvos.deployment_target = '9.0'

Expand Down
6 changes: 3 additions & 3 deletions Source/Changes.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Listing of notable changes by release. More detail is usually found in the Git
commit messages and/or the pull requests.

(unreleased)
OCMock 3.4 (2016-12-22)

* OCMock now requires iOS 8 as minimum deployment target
* Managed objects can now be mocked (Alan Fineberg, Kyle Van Essen)
* Notifications with a user info dictionary can be observed and verified
with the macro syntax.
* Now considering structs with unknown names to be the same type as a named
struct, as long as either the actual definition matches or one of them is
opaque.
* Now notifications with a user info dictionary can be observed and verified
with the macro syntax.
* Fixed bug causing verifyWithDelay to be held up by rejects (Nikolay Kasyanov)
* Fixed bug where a mock would not claim conformance to protocols declared in
a superclass (Werner Altewischer)
Expand Down
18 changes: 9 additions & 9 deletions Tools/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def makeRelease
copySource
buildModules
signFrameworks "[email protected]"
createPackage "ocmock-3.3.1.dmg", "OCMock 3.3.1"
createPackage "ocmock-3.4.dmg", "OCMock 3.4"
sanityCheck
openPackageDir
end
Expand Down Expand Up @@ -47,22 +47,22 @@ def buildModules
@worker.run("mkdir -p #{osxproductdir}")
@worker.run("cp -R #{@env.symroot}/Release/OCMock.framework #{osxproductdir}")

@worker.run("xcodebuild -project OCMock.xcodeproj -target OCMockLib -sdk iphoneos9.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target OCMockLib -sdk iphonesimulator9.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target OCMockLib -sdk iphoneos10.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target OCMockLib -sdk iphonesimulator10.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
ioslibproductdir = "#{@env.productdir}/iOS\\ library"
@worker.run("mkdir -p #{ioslibproductdir}")
@worker.run("cp -R #{@env.symroot}/Release-iphoneos/OCMock #{ioslibproductdir}")
@worker.run("lipo -create -output #{ioslibproductdir}/libOCMock.a #{@env.symroot}/Release-iphoneos/libOCMock.a #{@env.symroot}/Release-iphonesimulator/libOCMock.a")

@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock iOS' -sdk iphoneos9.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock iOS' -sdk iphonesimulator9.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock iOS' -sdk iphoneos10.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock iOS' -sdk iphonesimulator10.2 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
iosproductdir = "#{@env.productdir}/iOS\\ framework"
@worker.run("mkdir -p #{iosproductdir}")
@worker.run("cp -R #{@env.symroot}/Release-iphoneos/OCMock.framework #{iosproductdir}")
@worker.run("lipo -create -output #{iosproductdir}/OCMock.framework/OCMock #{@env.symroot}/Release-iphoneos/OCMock.framework/OCMock #{@env.symroot}/Release-iphonesimulator/OCMock.framework/OCMock")

@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock tvOS' -sdk appletvos9.1 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock tvOS' -sdk appletvsimulator9.1 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock tvOS' -sdk appletvos10.1 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
@worker.run("xcodebuild -project OCMock.xcodeproj -target 'OCMock tvOS' -sdk appletvsimulator10.1 OBJROOT=#{@env.objroot} SYMROOT=#{@env.symroot}")
tvosproductdir = "#{@env.productdir}/tvOS"
@worker.run("mkdir -p #{tvosproductdir}")
@worker.run("cp -R #{@env.symroot}/Release-appletvos/OCMock.framework #{tvosproductdir}")
Expand All @@ -75,8 +75,8 @@ def signFrameworks(identity)
tvosproductdir = "#{@env.productdir}/tvOS"

@worker.run("codesign -s 'Mac Developer: #{identity}' #{osxproductdir}/OCMock.framework")
@worker.run("codesign -s 'iPhone Developer: #{identity}' #{iosproductdir}/OCMock.framework")
@worker.run("codesign -s 'iPhone Developer: #{identity}' #{tvosproductdir}/OCMock.framework")
@worker.run("codesign -f -s 'iPhone Developer: #{identity}' #{iosproductdir}/OCMock.framework")
@worker.run("codesign -f -s 'iPhone Developer: #{identity}' #{tvosproductdir}/OCMock.framework")
end

def createPackage(packagename, volumename)
Expand Down

0 comments on commit 69142b9

Please sign in to comment.