Merge branch 'release/1.2.1'

Alecrim · Sep 6, 2015 · c78c362 · c78c362
2 parents f520d75 + b8179c6
commit c78c362
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/AlecrimAsyncKit.podspec b/AlecrimAsyncKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "AlecrimAsyncKit"
-  s.version      = "1.2"
+  s.version      = "1.2.1"
   s.summary      = "Bringing async and await to Swift world with some flavouring."
   s.homepage     = "https://github.com/Alecrim/AlecrimAsyncKit"
 

diff --git a/Source/AlecrimAsyncKit.xcodeproj/project.pbxproj b/Source/AlecrimAsyncKit.xcodeproj/project.pbxproj
@@ -363,7 +363,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 99;
+				CURRENT_PROJECT_VERSION = 101;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -385,7 +385,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 99;
+				CURRENT_PROJECT_VERSION = 101;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

diff --git a/Source/AlecrimAsyncKit/Convenience Observers/ApplicationBackgroundTaskObserver.swift b/Source/AlecrimAsyncKit/Convenience Observers/ApplicationBackgroundTaskObserver.swift
@@ -6,6 +6,8 @@
 //  Copyright © 2015 Alecrim. All rights reserved.
 //
 
+#if os(iOS)
+
 import Foundation
 
 /// A task observer that will automatically begin and end a *background task* if the application transitions to the background.
@@ -83,3 +85,5 @@ public final class ApplicationBackgroundTaskObserver: TaskObserver {
     }
 
 }
+
+#endif
diff --git a/Source/AlecrimAsyncKit/Info.plist b/Source/AlecrimAsyncKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>