From bb2a3e3dca4d28fbb7ab5dc23f95c6e81a172f1a Mon Sep 17 00:00:00 2001 From: Tobias Due Munk Date: Sat, 18 Jul 2015 11:20:52 +0200 Subject: [PATCH 1/3] Re-structure project --- Async copy-Info.plist | 26 -------------------------- Async.podspec | 2 +- Async.xcodeproj/project.pbxproj | 14 ++++++-------- Async.swift => Source/Async.swift | 0 Info.plist => Source/Info.plist | 0 5 files changed, 7 insertions(+), 35 deletions(-) delete mode 100644 Async copy-Info.plist rename Async.swift => Source/Async.swift (100%) rename Info.plist => Source/Info.plist (100%) diff --git a/Async copy-Info.plist b/Async copy-Info.plist deleted file mode 100644 index 79074b9..0000000 --- a/Async copy-Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - dk.developmunk.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.1.1 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/Async.podspec b/Async.podspec index a1bc2ac..c127550 100644 --- a/Async.podspec +++ b/Async.podspec @@ -9,6 +9,6 @@ Pod::Spec.new do |s| 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_files = "Source/*.swift" s.requires_arc = true end \ No newline at end of file diff --git a/Async.xcodeproj/project.pbxproj b/Async.xcodeproj/project.pbxproj index 8e9001b..bdac7d6 100644 --- a/Async.xcodeproj/project.pbxproj +++ b/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 = ""; }; 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 = ""; }; @@ -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; diff --git a/Async.swift b/Source/Async.swift similarity index 100% rename from Async.swift rename to Source/Async.swift diff --git a/Info.plist b/Source/Info.plist similarity index 100% rename from Info.plist rename to Source/Info.plist From e8aa792ba1115c96d873619e71497a4eac8e9370 Mon Sep 17 00:00:00 2001 From: Tobias Due Munk Date: Sat, 18 Jul 2015 11:21:25 +0200 Subject: [PATCH 2/3] Update BuildableName for iOS framework --- Async.xcodeproj/xcshareddata/xcschemes/Async iOS.xcscheme | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Async.xcodeproj/xcshareddata/xcschemes/Async iOS.xcscheme b/Async.xcodeproj/xcshareddata/xcschemes/Async iOS.xcscheme index ec5d300..5c1f262 100644 --- a/Async.xcodeproj/xcshareddata/xcschemes/Async iOS.xcscheme +++ b/Async.xcodeproj/xcshareddata/xcschemes/Async iOS.xcscheme @@ -15,7 +15,7 @@ @@ -43,7 +43,7 @@ @@ -61,7 +61,7 @@ From 710ada0152d9179d9058181c0dd1fb61fa67b67c Mon Sep 17 00:00:00 2001 From: Tobias Due Munk Date: Sat, 18 Jul 2015 11:23:02 +0200 Subject: [PATCH 3/3] Bump .podspec to 1.3.1 --- Async.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Async.podspec b/Async.podspec index c127550..3b0da9c 100644 --- a/Async.podspec +++ b/Async.podspec @@ -1,6 +1,6 @@ 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" } @@ -8,7 +8,7 @@ Pod::Spec.new do |s| 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 = { :git => "https://github.com/duemunk/Async.git", :tag => "1.3.1"} s.source_files = "Source/*.swift" s.requires_arc = true end \ No newline at end of file