Merge branch 'release/1.3.1'

Async.podspec

@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name        = "Async"
-  s.version     = "1.3.0"
+  s.version     = "1.3.1"
   s.summary     = "Syntactic sugar in Swift for asynchronous dispatches in Grand Central Dispatch"
   s.homepage    = "https://github.com/duemunk/Async"
   s.license     = { :type => "MIT" }
   s.authors     = { "Tobias Due Munk" => "[email protected]" }
 
   s.osx.deployment_target = "10.10"
   s.ios.deployment_target = "8.0"
-  s.source   = { :git => "https://github.com/duemunk/Async.git", :tag => "1.3.0"}
-  s.source_files = "Async.{h,swift}"
+  s.source   = { :git => "https://github.com/duemunk/Async.git", :tag => "1.3.1"}
+  s.source_files = "Source/*.swift"
   s.requires_arc = true
 end

Async.xcodeproj/project.pbxproj

@@ -15,10 +15,9 @@
 
 /* Begin PBXFileReference section */
 		BF41E41E1AC5FB2400A1DDB2 /* Async.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Async.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BF41E41F1AC5FB2400A1DDB2 /* Async copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Async copy-Info.plist"; path = "/Users/lvillani/Development/Async/Async copy-Info.plist"; sourceTree = "<absolute>"; };
 		BF70E4E91ABF124A00B4FDD4 /* Async.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Async.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		BF70E5051ABF12BC00B4FDD4 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = SOURCE_ROOT; };
-		BF70E5071ABF131400B4FDD4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
+		BF70E5051ABF12BC00B4FDD4 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Async.swift; path = Source/Async.swift; sourceTree = SOURCE_ROOT; };
+		BF70E5071ABF131400B4FDD4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; sourceTree = SOURCE_ROOT; };
 		BF70E5141ABF135D00B4FDD4 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -48,7 +47,6 @@
 				BF70E5141ABF135D00B4FDD4 /* Foundation.framework */,
 				BF70E4EB1ABF124A00B4FDD4 /* Async */,
 				BF70E4EA1ABF124A00B4FDD4 /* Products */,
-				BF41E41F1AC5FB2400A1DDB2 /* Async copy-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -209,7 +207,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Async copy-Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -226,7 +224,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "Async copy-Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
@@ -328,7 +326,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = Async;
@@ -343,7 +341,7 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				INFOPLIST_FILE = "$(SRCROOT)/Info.plist";
+				INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = Async;

Async.xcodeproj/xcshareddata/xcschemes/Async iOS.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "BF70E4E81ABF124A00B4FDD4"
-               BuildableName = "Async iOS.framework"
+               BuildableName = "Async.framework"
                BlueprintName = "Async iOS"
                ReferencedContainer = "container:Async.xcodeproj">
             </BuildableReference>
@@ -43,7 +43,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF70E4E81ABF124A00B4FDD4"
-            BuildableName = "Async iOS.framework"
+            BuildableName = "Async.framework"
             BlueprintName = "Async iOS"
             ReferencedContainer = "container:Async.xcodeproj">
          </BuildableReference>
@@ -61,7 +61,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BF70E4E81ABF124A00B4FDD4"
-            BuildableName = "Async iOS.framework"
+            BuildableName = "Async.framework"
             BlueprintName = "Async iOS"
             ReferencedContainer = "container:Async.xcodeproj">
          </BuildableReference>