Merge branch 'release/1.5' into develop

atomicobject · Apr 1, 2015 · 44b9dfc · 44b9dfc
2 parents 2bc6fd8 + 9664cb5
commit 44b9dfc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/Objection-Info.plist b/Objection-Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>ATOM</string>
 	<key>CFBundleVersion</key>
-	<string>1.4</string>
+	<string>1.5</string>
 </dict>
 </plist>
diff --git a/Objection.podspec b/Objection.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Objection'
-  s.version      = '1.4'
+  s.version      = '1.5'
   s.summary      = 'A lightweight dependency injection framework for Objective-C.'
   s.author       = { 'Justin DeWind' => 'dewind@atomicobject.com' }
   s.source       = { :git => 'https://github.com/atomicobject/objection.git', :tag => "#{s.version}" }
@@ -9,6 +9,6 @@ Pod::Spec.new do |s|
   s.license      = "https://github.com/atomicobject/objection/blob/master/LICENSE"
   s.requires_arc = true
 
-  s.ios.deployment_target = '5.0'
-  s.osx.deployment_target = '10.7'
+  s.ios.deployment_target = '7.0'
+  s.osx.deployment_target = '10.8'
 end
diff --git a/Objection.xcodeproj/project.pbxproj b/Objection.xcodeproj/project.pbxproj
@@ -1016,7 +1016,10 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+				ARCHS = (
+					"$(ARCHS_STANDARD)",
+					armv7s,
+				);
 				CLANG_ENABLE_OBJC_ARC = YES;
 				COPY_PHASE_STRIP = NO;
 				DSTROOT = /tmp/Objection.dst;
@@ -1030,18 +1033,22 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_WARN_UNDECLARED_SELECTOR = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "Objection-StaticLib";
 				SDKROOT = iphoneos;
+				VALID_ARCHS = "i386 x86_64 arm64 armv7s armv7";
 			};
 			name = Debug;
 		};
 		1DEB922008733DC00010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+				ARCHS = (
+					"$(ARCHS_STANDARD)",
+					armv7s,
+				);
 				CLANG_ENABLE_OBJC_ARC = YES;
 				DSTROOT = /tmp/Objection.dst;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1052,10 +1059,11 @@
 				GCC_THUMB_SUPPORT = NO;
 				GCC_WARN_UNDECLARED_SELECTOR = NO;
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 6.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_NAME = "Objection-StaticLib";
 				SDKROOT = iphoneos;
+				VALID_ARCHS = "i386 x86_64 arm64 armv7s armv7";
 			};
 			name = Release;
 		};

diff --git a/README.md b/README.md
@@ -361,12 +361,12 @@ If you're using [Kiwi](https://github.com/allending/Kiwi) for testing, checkout
 
 ### Static Framework and Linkable Framework
 
-It can be downloaded [here](http://objection-framework.org/files/Objection-1.4.tar.gz)
+It can be downloaded [here](http://objection-framework.org/files/Objection-1.5.tar.gz)
 
 ### Building Static Framework
 
     git clone git://github.com/atomicobject/objection.git
-    git checkout 1.4
+    git checkout 1.5
 
 #### iOS
 
@@ -393,7 +393,7 @@ It can be downloaded [here](http://objection-framework.org/files/Objection-1.4.t
 Edit your Pofile
 
     edit Podfile
-    pod 'Objection', '1.4'
+    pod 'Objection', '1.5'
 
 Now you can install Objection
 
@@ -414,8 +414,8 @@ gem install motion-objection
 
 ## Requirements
 
-* MacOS X 10.7 +
-* iOS 5.0 +
+* MacOS X 10.8 +
+* iOS 7.0 +
 
 ## Authors