diff --git a/Package.swift b/Package.swift index 73d880c56eb..9fbb92b498c 100644 --- a/Package.swift +++ b/Package.swift @@ -4,12 +4,12 @@ import PackageDescription let package = Package( - name: "then", + name: "Then", products: [ // Products define the executables and libraries produced by a package, and make them visible to other packages. .library( - name: "then", - targets: ["then"]), + name: "Then", + targets: ["Then"]) ], dependencies: [ // Dependencies declare other packages that this package depends on. @@ -17,14 +17,15 @@ let package = Package( ], targets: [ // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages which this package depends on. + // Targets can depend on other targets in this package, and on products + // in packages which this package depends on. .target( - name: "then", + name: "Then", dependencies: [], path: "Source"), .testTarget( name: "thenTests", - dependencies: ["then"], - path: "thenTests"), + dependencies: ["Then"], + path: "thenTests") ] ) diff --git a/README.md b/README.md index 444fba8a2c8..13bde2ee8ac 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ fetchUserId().then { id in print("UserID : \(id)") }.onError { e in print("An error occured : \(e)") -}.finally { +}.finally {M print("Everything is Done :)") } ``` @@ -424,6 +424,7 @@ Grab this repository and build the Framework target on the example project. Then - Swift 4.2 -> version [**4.2.0**](https://github.com/freshOS/then/releases/tag/4.2.0) - Swift 4.2.1 -> version [**4.2.0**](https://github.com/freshOS/then/releases/tag/4.2.1) - Swift 5.0 -> version [**5.0.0**](https://github.com/freshOS/then/releases/tag/5.0.0) +- Swift 5.1 -> version [**5.1.0**](https://github.com/freshOS/then/releases/tag/5.1.0) ### Backers diff --git a/Source/Info.plist b/Source/Info.plist index e6771905595..ca23c84f4c4 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.0.0 + $(MARKETING_VERSION) CFBundleSignature ???? CFBundleVersion diff --git a/then.xcodeproj/project.pbxproj b/Then.xcodeproj/project.pbxproj similarity index 95% rename from then.xcodeproj/project.pbxproj rename to Then.xcodeproj/project.pbxproj index 0092c9feafd..96cfc8ac317 100644 --- a/then.xcodeproj/project.pbxproj +++ b/Then.xcodeproj/project.pbxproj @@ -110,7 +110,7 @@ 99B29F7B1E5D5F4900CF8E98 /* ValidateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99B29F7A1E5D5F4900CF8E98 /* ValidateTests.swift */; }; 99B29F7F1E5D688900CF8E98 /* RaceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99B29F7E1E5D688900CF8E98 /* RaceTests.swift */; }; 99B29F831E5D6F5500CF8E98 /* RetryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99B29F821E5D6F5500CF8E98 /* RetryTests.swift */; }; - 99B5ACA21C66831C005CDA28 /* then.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99B5AC971C66831C005CDA28 /* then.framework */; }; + 99B5ACA21C66831C005CDA28 /* Then.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99B5AC971C66831C005CDA28 /* Then.framework */; }; 99B5ACA71C66831C005CDA28 /* ThenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99B5ACA61C66831C005CDA28 /* ThenTests.swift */; }; 99B9FA8F1E5F107400D522C8 /* FinallyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99B9FA8E1E5F107400D522C8 /* FinallyTests.swift */; }; 99FA7FB61D93C153002274B0 /* thenMacOS.h in Headers */ = {isa = PBXBuildFile; fileRef = 99FA7FB41D93C153002274B0 /* thenMacOS.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -128,7 +128,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 17D4C41C1F4703B1002EF805 /* then.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = then.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 17D4C41C1F4703B1002EF805 /* Then.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Then.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 17D4C41E1F4703B1002EF805 /* thenTvOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = thenTvOS.h; sourceTree = ""; }; 17D4C41F1F4703B1002EF805 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9907A5DE1E76EBAE00826BBE /* Promise+Chain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Chain.swift"; sourceTree = ""; }; @@ -168,8 +168,8 @@ 99B29F7E1E5D688900CF8E98 /* RaceTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RaceTests.swift; sourceTree = ""; }; 99B29F801E5D6E0F00CF8E98 /* Promise+Retry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Retry.swift"; sourceTree = ""; }; 99B29F821E5D6F5500CF8E98 /* RetryTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RetryTests.swift; sourceTree = ""; }; - 99B5AC971C66831C005CDA28 /* then.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = then.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 99B5ACA11C66831C005CDA28 /* thenTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = thenTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 99B5AC971C66831C005CDA28 /* Then.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Then.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 99B5ACA11C66831C005CDA28 /* ThenTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ThenTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 99B5ACA61C66831C005CDA28 /* ThenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThenTests.swift; sourceTree = ""; }; 99B5ACA81C66831C005CDA28 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 99B9FA8E1E5F107400D522C8 /* FinallyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FinallyTests.swift; sourceTree = ""; }; @@ -181,7 +181,7 @@ 99FA2C6B1E5B20BB00CA3959 /* Promise+Aliases.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Aliases.swift"; sourceTree = ""; }; 99FA2C6D1E5B20EA00CA3959 /* Promise+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Helpers.swift"; sourceTree = ""; }; 99FA2C6F1E5B212900CA3959 /* Promise+Then.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Promise+Then.swift"; sourceTree = ""; }; - 99FA7FB21D93C153002274B0 /* then.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = then.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 99FA7FB21D93C153002274B0 /* Then.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Then.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 99FA7FB41D93C153002274B0 /* thenMacOS.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = thenMacOS.h; sourceTree = ""; }; 99FA7FB51D93C153002274B0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 99FA7FC81D93C1AB002274B0 /* Promise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Promise.swift; sourceTree = ""; }; @@ -211,7 +211,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 99B5ACA21C66831C005CDA28 /* then.framework in Frameworks */, + 99B5ACA21C66831C005CDA28 /* Then.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -225,22 +225,22 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 17D4C41D1F4703B1002EF805 /* thenTvOS */ = { + 17D4C41D1F4703B1002EF805 /* ThenTvOS */ = { isa = PBXGroup; children = ( 17D4C41E1F4703B1002EF805 /* thenTvOS.h */, 17D4C41F1F4703B1002EF805 /* Info.plist */, ); - path = thenTvOS; + path = ThenTvOS; sourceTree = ""; }; 99B5AC8D1C66831C005CDA28 = { isa = PBXGroup; children = ( - 99B5AC991C66831C005CDA28 /* then */, - 99B5ACA51C66831C005CDA28 /* thenTests */, - 99FA7FB31D93C153002274B0 /* thenMacOS */, - 17D4C41D1F4703B1002EF805 /* thenTvOS */, + 99B5AC991C66831C005CDA28 /* Then */, + 99B5ACA51C66831C005CDA28 /* ThenTests */, + 99FA7FB31D93C153002274B0 /* ThenMacOS */, + 17D4C41D1F4703B1002EF805 /* ThenTvOS */, 99B5AC981C66831C005CDA28 /* Products */, ); sourceTree = ""; @@ -248,23 +248,23 @@ 99B5AC981C66831C005CDA28 /* Products */ = { isa = PBXGroup; children = ( - 99B5AC971C66831C005CDA28 /* then.framework */, - 99B5ACA11C66831C005CDA28 /* thenTests.xctest */, - 99FA7FB21D93C153002274B0 /* then.framework */, - 17D4C41C1F4703B1002EF805 /* then.framework */, + 99B5AC971C66831C005CDA28 /* Then.framework */, + 99B5ACA11C66831C005CDA28 /* ThenTests.xctest */, + 99FA7FB21D93C153002274B0 /* Then.framework */, + 17D4C41C1F4703B1002EF805 /* Then.framework */, ); name = Products; sourceTree = ""; }; - 99B5AC991C66831C005CDA28 /* then */ = { + 99B5AC991C66831C005CDA28 /* Then */ = { isa = PBXGroup; children = ( 99FC637B1C86085C008C1155 /* Source */, ); - path = then; + path = Then; sourceTree = ""; }; - 99B5ACA51C66831C005CDA28 /* thenTests */ = { + 99B5ACA51C66831C005CDA28 /* ThenTests */ = { isa = PBXGroup; children = ( 99B5ACA61C66831C005CDA28 /* ThenTests.swift */, @@ -289,17 +289,17 @@ 9962ADC51D585A06005769CD /* Helpers.swift */, 99B5ACA81C66831C005CDA28 /* Info.plist */, ); - path = thenTests; + path = ThenTests; sourceTree = ""; }; - 99FA7FB31D93C153002274B0 /* thenMacOS */ = { + 99FA7FB31D93C153002274B0 /* ThenMacOS */ = { isa = PBXGroup; children = ( 99FA7FB41D93C153002274B0 /* thenMacOS.h */, 99FA7FB51D93C153002274B0 /* Info.plist */, 99FA7FC61D93C1AB002274B0 /* Source */, ); - path = thenMacOS; + path = ThenMacOS; sourceTree = ""; }; 99FA7FC61D93C1AB002274B0 /* Source */ = { @@ -379,9 +379,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 17D4C41B1F4703B1002EF805 /* thenTvOS */ = { + 17D4C41B1F4703B1002EF805 /* ThenTvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 17D4C4211F4703B1002EF805 /* Build configuration list for PBXNativeTarget "thenTvOS" */; + buildConfigurationList = 17D4C4211F4703B1002EF805 /* Build configuration list for PBXNativeTarget "ThenTvOS" */; buildPhases = ( 17D4C4171F4703B1002EF805 /* Sources */, 17D4C4181F4703B1002EF805 /* Frameworks */, @@ -392,14 +392,14 @@ ); dependencies = ( ); - name = thenTvOS; + name = ThenTvOS; productName = thenTvOS; - productReference = 17D4C41C1F4703B1002EF805 /* then.framework */; + productReference = 17D4C41C1F4703B1002EF805 /* Then.framework */; productType = "com.apple.product-type.framework"; }; - 99B5AC961C66831C005CDA28 /* then */ = { + 99B5AC961C66831C005CDA28 /* Then */ = { isa = PBXNativeTarget; - buildConfigurationList = 99B5ACAB1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "then" */; + buildConfigurationList = 99B5ACAB1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "Then" */; buildPhases = ( 99B5AC921C66831C005CDA28 /* Sources */, 99B5AC931C66831C005CDA28 /* Frameworks */, @@ -411,14 +411,14 @@ ); dependencies = ( ); - name = then; + name = Then; productName = then; - productReference = 99B5AC971C66831C005CDA28 /* then.framework */; + productReference = 99B5AC971C66831C005CDA28 /* Then.framework */; productType = "com.apple.product-type.framework"; }; - 99B5ACA01C66831C005CDA28 /* thenTests */ = { + 99B5ACA01C66831C005CDA28 /* ThenTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 99B5ACAE1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "thenTests" */; + buildConfigurationList = 99B5ACAE1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "ThenTests" */; buildPhases = ( 99B5AC9D1C66831C005CDA28 /* Sources */, 99B5AC9E1C66831C005CDA28 /* Frameworks */, @@ -429,14 +429,14 @@ dependencies = ( 99B5ACA41C66831C005CDA28 /* PBXTargetDependency */, ); - name = thenTests; + name = ThenTests; productName = thenTests; - productReference = 99B5ACA11C66831C005CDA28 /* thenTests.xctest */; + productReference = 99B5ACA11C66831C005CDA28 /* ThenTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 99FA7FB11D93C153002274B0 /* thenMacOS */ = { + 99FA7FB11D93C153002274B0 /* ThenMacOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 99FA7FB91D93C153002274B0 /* Build configuration list for PBXNativeTarget "thenMacOS" */; + buildConfigurationList = 99FA7FB91D93C153002274B0 /* Build configuration list for PBXNativeTarget "ThenMacOS" */; buildPhases = ( 99FA7FAD1D93C153002274B0 /* Sources */, 99FA7FAE1D93C153002274B0 /* Frameworks */, @@ -447,9 +447,9 @@ ); dependencies = ( ); - name = thenMacOS; + name = ThenMacOS; productName = thenMacOS; - productReference = 99FA7FB21D93C153002274B0 /* then.framework */; + productReference = 99FA7FB21D93C153002274B0 /* Then.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -480,7 +480,7 @@ }; }; }; - buildConfigurationList = 99B5AC911C66831C005CDA28 /* Build configuration list for PBXProject "then" */; + buildConfigurationList = 99B5AC911C66831C005CDA28 /* Build configuration list for PBXProject "Then" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = en; hasScannedForEncodings = 0; @@ -493,10 +493,10 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 99B5AC961C66831C005CDA28 /* then */, - 99B5ACA01C66831C005CDA28 /* thenTests */, - 99FA7FB11D93C153002274B0 /* thenMacOS */, - 17D4C41B1F4703B1002EF805 /* thenTvOS */, + 99B5AC961C66831C005CDA28 /* Then */, + 99B5ACA01C66831C005CDA28 /* ThenTests */, + 99FA7FB11D93C153002274B0 /* ThenMacOS */, + 17D4C41B1F4703B1002EF805 /* ThenTvOS */, ); }; /* End PBXProject section */ @@ -686,7 +686,7 @@ /* Begin PBXTargetDependency section */ 99B5ACA41C66831C005CDA28 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 99B5AC961C66831C005CDA28 /* then */; + target = 99B5AC961C66831C005CDA28 /* Then */; targetProxy = 99B5ACA31C66831C005CDA28 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -706,8 +706,9 @@ INFOPLIST_FILE = thenTvOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 5.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.fresh.thenTvOS; - PRODUCT_NAME = then; + PRODUCT_NAME = Then; SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -731,8 +732,9 @@ INFOPLIST_FILE = thenTvOS/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 5.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.fresh.thenTvOS; - PRODUCT_NAME = then; + PRODUCT_NAME = Then; SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -868,6 +870,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 5.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.fresh.then; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -890,6 +893,7 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MARKETING_VERSION = 5.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.fresh.then; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -941,8 +945,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + MARKETING_VERSION = 5.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.then.thenMacOS; - PRODUCT_NAME = then; + PRODUCT_NAME = Then; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; @@ -967,8 +972,9 @@ INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.10; + MARKETING_VERSION = 5.1.0; PRODUCT_BUNDLE_IDENTIFIER = com.freshOS.then.thenMacOS; - PRODUCT_NAME = then; + PRODUCT_NAME = Then; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -979,7 +985,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 17D4C4211F4703B1002EF805 /* Build configuration list for PBXNativeTarget "thenTvOS" */ = { + 17D4C4211F4703B1002EF805 /* Build configuration list for PBXNativeTarget "ThenTvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 17D4C4221F4703B1002EF805 /* Debug */, @@ -988,7 +994,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 99B5AC911C66831C005CDA28 /* Build configuration list for PBXProject "then" */ = { + 99B5AC911C66831C005CDA28 /* Build configuration list for PBXProject "Then" */ = { isa = XCConfigurationList; buildConfigurations = ( 99B5ACA91C66831C005CDA28 /* Debug */, @@ -997,7 +1003,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 99B5ACAB1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "then" */ = { + 99B5ACAB1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "Then" */ = { isa = XCConfigurationList; buildConfigurations = ( 99B5ACAC1C66831C005CDA28 /* Debug */, @@ -1006,7 +1012,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 99B5ACAE1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "thenTests" */ = { + 99B5ACAE1C66831C005CDA28 /* Build configuration list for PBXNativeTarget "ThenTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 99B5ACAF1C66831C005CDA28 /* Debug */, @@ -1015,7 +1021,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 99FA7FB91D93C153002274B0 /* Build configuration list for PBXNativeTarget "thenMacOS" */ = { + 99FA7FB91D93C153002274B0 /* Build configuration list for PBXNativeTarget "ThenMacOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 99FA7FB71D93C153002274B0 /* Debug */, diff --git a/then.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Then.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 61% rename from then.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to Then.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 5d01485380b..55c428e3e66 100644 --- a/then.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/Then.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:/Users/sacha/Projects/then/Then.xcodeproj"> diff --git a/then.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Then.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from then.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to Then.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/then.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Then.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from then.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to Then.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/then.xcodeproj/xcshareddata/xcschemes/then.xcscheme b/Then.xcodeproj/xcshareddata/xcschemes/then.xcscheme similarity index 85% rename from then.xcodeproj/xcshareddata/xcschemes/then.xcscheme rename to Then.xcodeproj/xcshareddata/xcschemes/then.xcscheme index 8e279b8d914..e080b84c68e 100644 --- a/then.xcodeproj/xcshareddata/xcschemes/then.xcscheme +++ b/Then.xcodeproj/xcshareddata/xcschemes/then.xcscheme @@ -15,8 +15,8 @@ @@ -27,29 +27,27 @@ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" shouldUseLaunchSchemeArgsEnv = "YES"> + + + + - - - - - - - - diff --git a/then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme b/Then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme similarity index 91% rename from then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme rename to Then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme index 0ef3f0456ca..a307a3bab59 100644 --- a/then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme +++ b/Then.xcodeproj/xcshareddata/xcschemes/thenMacOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "99FA7FB11D93C153002274B0" BuildableName = "then.framework" - BlueprintName = "thenMacOS" + BlueprintName = "ThenMacOS" ReferencedContainer = "container:then.xcodeproj"> @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - diff --git a/then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme b/Then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme similarity index 92% rename from then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme rename to Then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme index 8ef45730c9a..4d81a8e7a33 100644 --- a/then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme +++ b/Then.xcodeproj/xcshareddata/xcschemes/thenTvOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "17D4C41B1F4703B1002EF805" BuildableName = "then.framework" - BlueprintName = "thenTvOS" + BlueprintName = "ThenTvOS" ReferencedContainer = "container:then.xcodeproj"> @@ -29,8 +29,6 @@ shouldUseLaunchSchemeArgsEnv = "YES"> - - - - diff --git a/thenMacOS/Info.plist b/ThenMacOS/Info.plist similarity index 95% rename from thenMacOS/Info.plist rename to ThenMacOS/Info.plist index fcc8e5eaf59..addf93eb148 100644 --- a/thenMacOS/Info.plist +++ b/ThenMacOS/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.0.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) NSHumanReadableCopyright diff --git a/thenMacOS/thenMacOS.h b/ThenMacOS/thenMacOS.h similarity index 100% rename from thenMacOS/thenMacOS.h rename to ThenMacOS/thenMacOS.h diff --git a/thenTests/AsyncAwaitTests.swift b/ThenTests/AsyncAwaitTests.swift similarity index 99% rename from thenTests/AsyncAwaitTests.swift rename to ThenTests/AsyncAwaitTests.swift index 38b10d643be..87115cea89f 100644 --- a/thenTests/AsyncAwaitTests.swift +++ b/ThenTests/AsyncAwaitTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class AsyncAwaitTests: XCTestCase { diff --git a/thenTests/BridgeErrorTests.swift b/ThenTests/BridgeErrorTests.swift similarity index 99% rename from thenTests/BridgeErrorTests.swift rename to ThenTests/BridgeErrorTests.swift index daf7e87173f..722694f6800 100644 --- a/thenTests/BridgeErrorTests.swift +++ b/ThenTests/BridgeErrorTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import then +@testable import Then class BridgeErrorTests: XCTestCase { diff --git a/thenTests/ChainTests.swift b/ThenTests/ChainTests.swift similarity index 99% rename from thenTests/ChainTests.swift rename to ThenTests/ChainTests.swift index 8f2b1e50435..4f5e72293c9 100644 --- a/thenTests/ChainTests.swift +++ b/ThenTests/ChainTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class ChainTests: XCTestCase { diff --git a/thenTests/DelayTests.swift b/ThenTests/DelayTests.swift similarity index 99% rename from thenTests/DelayTests.swift rename to ThenTests/DelayTests.swift index 88c2f406afe..d57da848368 100644 --- a/thenTests/DelayTests.swift +++ b/ThenTests/DelayTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class DelayTests: XCTestCase { diff --git a/thenTests/FinallyTests.swift b/ThenTests/FinallyTests.swift similarity index 99% rename from thenTests/FinallyTests.swift rename to ThenTests/FinallyTests.swift index 23ab8a6d9d8..5aa347449f3 100644 --- a/thenTests/FinallyTests.swift +++ b/ThenTests/FinallyTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class FinallyTests: XCTestCase { diff --git a/thenTests/Helpers.swift b/ThenTests/Helpers.swift similarity index 99% rename from thenTests/Helpers.swift rename to ThenTests/Helpers.swift index 739c05577a6..c82f2bd6403 100644 --- a/thenTests/Helpers.swift +++ b/ThenTests/Helpers.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import then +@testable import Then import Dispatch var globalCount = 0 diff --git a/thenTests/Info.plist b/ThenTests/Info.plist similarity index 100% rename from thenTests/Info.plist rename to ThenTests/Info.plist diff --git a/thenTests/MemoryTests.swift b/ThenTests/MemoryTests.swift similarity index 99% rename from thenTests/MemoryTests.swift rename to ThenTests/MemoryTests.swift index e2d7c553a77..75e400a62f0 100644 --- a/thenTests/MemoryTests.swift +++ b/ThenTests/MemoryTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import then +@testable import Then class MemoryTests: XCTestCase { diff --git a/thenTests/NoMatterWhatTests.swift b/ThenTests/NoMatterWhatTests.swift similarity index 98% rename from thenTests/NoMatterWhatTests.swift rename to ThenTests/NoMatterWhatTests.swift index 189bfc659c3..a4f0af55a05 100644 --- a/thenTests/NoMatterWhatTests.swift +++ b/ThenTests/NoMatterWhatTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class NoMatterWhatTests: XCTestCase { diff --git a/thenTests/OnErrorTests.swift b/ThenTests/OnErrorTests.swift similarity index 99% rename from thenTests/OnErrorTests.swift rename to ThenTests/OnErrorTests.swift index 466547b6270..b35f2742983 100644 --- a/thenTests/OnErrorTests.swift +++ b/ThenTests/OnErrorTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class OnErrorTests: XCTestCase { diff --git a/thenTests/ProgressTests.swift b/ThenTests/ProgressTests.swift similarity index 99% rename from thenTests/ProgressTests.swift rename to ThenTests/ProgressTests.swift index 42c9328328b..5cd714e4722 100644 --- a/thenTests/ProgressTests.swift +++ b/ThenTests/ProgressTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class ProgressTests: XCTestCase { diff --git a/thenTests/RaceTests.swift b/ThenTests/RaceTests.swift similarity index 99% rename from thenTests/RaceTests.swift rename to ThenTests/RaceTests.swift index a49909aca3a..b53305298f7 100644 --- a/thenTests/RaceTests.swift +++ b/ThenTests/RaceTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class RaceTests: XCTestCase { diff --git a/thenTests/RecoverTests.swift b/ThenTests/RecoverTests.swift similarity index 99% rename from thenTests/RecoverTests.swift rename to ThenTests/RecoverTests.swift index 98bbe628b0f..35647932c4a 100644 --- a/thenTests/RecoverTests.swift +++ b/ThenTests/RecoverTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class RecoverTests: XCTestCase { diff --git a/thenTests/RegisterThenTests.swift b/ThenTests/RegisterThenTests.swift similarity index 99% rename from thenTests/RegisterThenTests.swift rename to ThenTests/RegisterThenTests.swift index 5fd8fc4ee59..88cae6ecfc7 100644 --- a/thenTests/RegisterThenTests.swift +++ b/ThenTests/RegisterThenTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class RegisterThenTests: XCTestCase { diff --git a/thenTests/RetryTests.swift b/ThenTests/RetryTests.swift similarity index 99% rename from thenTests/RetryTests.swift rename to ThenTests/RetryTests.swift index bc0ebf1d714..ebe1d22d30a 100644 --- a/thenTests/RetryTests.swift +++ b/ThenTests/RetryTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class RetryTests: XCTestCase { diff --git a/thenTests/ThenTests.swift b/ThenTests/ThenTests.swift similarity index 99% rename from thenTests/ThenTests.swift rename to ThenTests/ThenTests.swift index ab2584c4f02..4f61bc786c7 100644 --- a/thenTests/ThenTests.swift +++ b/ThenTests/ThenTests.swift @@ -7,7 +7,7 @@ // import XCTest -@testable import then +@testable import Then class ThenTests: XCTestCase { diff --git a/thenTests/TimeoutTests.swift b/ThenTests/TimeoutTests.swift similarity index 99% rename from thenTests/TimeoutTests.swift rename to ThenTests/TimeoutTests.swift index 731dd69038f..253b83838b6 100644 --- a/thenTests/TimeoutTests.swift +++ b/ThenTests/TimeoutTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class TimeoutTests: XCTestCase { diff --git a/thenTests/UnwrapTests.swift b/ThenTests/UnwrapTests.swift similarity index 98% rename from thenTests/UnwrapTests.swift rename to ThenTests/UnwrapTests.swift index 9e415bae943..a80604e4bc2 100644 --- a/thenTests/UnwrapTests.swift +++ b/ThenTests/UnwrapTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class UnwrapTests: XCTestCase { diff --git a/thenTests/ValidateTests.swift b/ThenTests/ValidateTests.swift similarity index 99% rename from thenTests/ValidateTests.swift rename to ThenTests/ValidateTests.swift index 1f7476a944a..8d9857c00a4 100644 --- a/thenTests/ValidateTests.swift +++ b/ThenTests/ValidateTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class ValidateTests: XCTestCase { diff --git a/thenTests/WhenAllTests.swift b/ThenTests/WhenAllTests.swift similarity index 99% rename from thenTests/WhenAllTests.swift rename to ThenTests/WhenAllTests.swift index cdeb75f4ddb..e2d17328855 100644 --- a/thenTests/WhenAllTests.swift +++ b/ThenTests/WhenAllTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class WhenAllTests: XCTestCase { diff --git a/thenTests/ZipTests.swift b/ThenTests/ZipTests.swift similarity index 99% rename from thenTests/ZipTests.swift rename to ThenTests/ZipTests.swift index f924ca856ad..24396b1f658 100644 --- a/thenTests/ZipTests.swift +++ b/ThenTests/ZipTests.swift @@ -7,7 +7,7 @@ // import XCTest -import then +import Then class ZipTests: XCTestCase { diff --git a/thenTvOS/Info.plist b/ThenTvOS/Info.plist similarity index 95% rename from thenTvOS/Info.plist rename to ThenTvOS/Info.plist index 2f16c6e9a02..a8a1c9dc1e6 100644 --- a/thenTvOS/Info.plist +++ b/ThenTvOS/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 5.0.0 + $(MARKETING_VERSION) CFBundleVersion $(CURRENT_PROJECT_VERSION) NSPrincipalClass diff --git a/thenTvOS/thenTvOS.h b/ThenTvOS/thenTvOS.h similarity index 100% rename from thenTvOS/thenTvOS.h rename to ThenTvOS/thenTvOS.h diff --git a/then.framework.zip b/then.framework.zip index bc6f14a6d26..ad480915032 100644 Binary files a/then.framework.zip and b/then.framework.zip differ diff --git a/thenPromise.podspec b/thenPromise.podspec index c9a71605dec..0d0809adb6f 100644 --- a/thenPromise.podspec +++ b/thenPromise.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'thenPromise' - s.version = "5.0.0" + s.version = "5.1.0" s.summary = "Elegant Promises for Swift" s.homepage = "https://github.com/freshOS/then" s.license = { :type => "MIT", :file => "LICENSE" } @@ -14,6 +14,6 @@ Pod::Spec.new do |s| s.source_files = "Source/*.swift" s.requires_arc = true s.description = "Elegant Async code for Swift 🎬- Async code finally readable by a human being" - s.module_name = 'then' + s.module_name = 'Then' s.swift_versions = ['2', '3', '4', '4.1', '4.2', '5.0'] end