Updates for Xcode 11/ Swift 5.1 (+ rename to Then)

freshOS · Sep 27, 2019 · a66a51f · a66a51f
1 parent b17c854
commit a66a51f
Show file tree

Hide file tree

Showing 37 changed files with 118 additions and 122 deletions.
diff --git a/Package.swift b/Package.swift
@@ -4,27 +4,28 @@
 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.
         // .package(url: /* package url */, from: "1.0.0"),
     ],
     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
@@ -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
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/then.xcodeproj/project.pbxproj → Then.xcodeproj/project.pbxproj b/then.xcodeproj/project.pbxproj → Then.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...xcshareddata/WorkspaceSettings.xcsettings → ...xcshareddata/WorkspaceSettings.xcsettings b/...xcshareddata/WorkspaceSettings.xcsettings → ...xcshareddata/WorkspaceSettings.xcsettings
diff --git a/...proj/xcshareddata/xcschemes/then.xcscheme → ...proj/xcshareddata/xcschemes/then.xcscheme b/...proj/xcshareddata/xcschemes/then.xcscheme → ...proj/xcshareddata/xcschemes/then.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "99B5AC961C66831C005CDA28"
-               BuildableName = "then.framework"
-               BlueprintName = "then"
+               BuildableName = "Then.framework"
+               BlueprintName = "Then"
                ReferencedContainer = "container:then.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -27,29 +27,27 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "99B5AC961C66831C005CDA28"
+            BuildableName = "Then.framework"
+            BlueprintName = "Then"
+            ReferencedContainer = "container:then.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "99B5ACA01C66831C005CDA28"
-               BuildableName = "thenTests.xctest"
-               BlueprintName = "thenTests"
+               BuildableName = "ThenTests.xctest"
+               BlueprintName = "ThenTests"
                ReferencedContainer = "container:then.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "99B5AC961C66831C005CDA28"
-            BuildableName = "then.framework"
-            BlueprintName = "then"
-            ReferencedContainer = "container:then.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -65,13 +63,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "99B5AC961C66831C005CDA28"
-            BuildableName = "then.framework"
-            BlueprintName = "then"
+            BuildableName = "Then.framework"
+            BlueprintName = "Then"
             ReferencedContainer = "container:then.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -83,8 +79,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "99B5AC961C66831C005CDA28"
-            BuildableName = "then.framework"
-            BlueprintName = "then"
+            BuildableName = "Then.framework"
+            BlueprintName = "Then"
             ReferencedContainer = "container:then.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...xcshareddata/xcschemes/thenMacOS.xcscheme → ...xcshareddata/xcschemes/thenMacOS.xcscheme b/...xcshareddata/xcschemes/thenMacOS.xcscheme → ...xcshareddata/xcschemes/thenMacOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "99FA7FB11D93C153002274B0"
                BuildableName = "then.framework"
-               BlueprintName = "thenMacOS"
+               BlueprintName = "ThenMacOS"
                ReferencedContainer = "container:then.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -47,12 +45,10 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "99FA7FB11D93C153002274B0"
             BuildableName = "then.framework"
-            BlueprintName = "thenMacOS"
+            BlueprintName = "ThenMacOS"
             ReferencedContainer = "container:then.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -65,7 +61,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "99FA7FB11D93C153002274B0"
             BuildableName = "then.framework"
-            BlueprintName = "thenMacOS"
+            BlueprintName = "ThenMacOS"
             ReferencedContainer = "container:then.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/.../xcshareddata/xcschemes/thenTvOS.xcscheme → .../xcshareddata/xcschemes/thenTvOS.xcscheme b/.../xcshareddata/xcschemes/thenTvOS.xcscheme → .../xcshareddata/xcschemes/thenTvOS.xcscheme
@@ -16,7 +16,7 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "17D4C41B1F4703B1002EF805"
                BuildableName = "then.framework"
-               BlueprintName = "thenTvOS"
+               BlueprintName = "ThenTvOS"
                ReferencedContainer = "container:then.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -29,8 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -47,12 +45,10 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "17D4C41B1F4703B1002EF805"
             BuildableName = "then.framework"
-            BlueprintName = "thenTvOS"
+            BlueprintName = "ThenTvOS"
             ReferencedContainer = "container:then.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -65,7 +61,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "17D4C41B1F4703B1002EF805"
             BuildableName = "then.framework"
-            BlueprintName = "thenTvOS"
+            BlueprintName = "ThenTvOS"
             ReferencedContainer = "container:then.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/thenMacOS/Info.plist → ThenMacOS/Info.plist b/thenMacOS/Info.plist → ThenMacOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>5.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/thenMacOS/thenMacOS.h → ThenMacOS/thenMacOS.h b/thenMacOS/thenMacOS.h → ThenMacOS/thenMacOS.h
diff --git a/thenTests/AsyncAwaitTests.swift → ThenTests/AsyncAwaitTests.swift b/thenTests/AsyncAwaitTests.swift → ThenTests/AsyncAwaitTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class AsyncAwaitTests: XCTestCase {
 

diff --git a/thenTests/BridgeErrorTests.swift → ThenTests/BridgeErrorTests.swift b/thenTests/BridgeErrorTests.swift → ThenTests/BridgeErrorTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import then
+@testable import Then
 
 class BridgeErrorTests: XCTestCase {
 

diff --git a/thenTests/ChainTests.swift → ThenTests/ChainTests.swift b/thenTests/ChainTests.swift → ThenTests/ChainTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class ChainTests: XCTestCase {
 

diff --git a/thenTests/DelayTests.swift → ThenTests/DelayTests.swift b/thenTests/DelayTests.swift → ThenTests/DelayTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class DelayTests: XCTestCase {
 

diff --git a/thenTests/FinallyTests.swift → ThenTests/FinallyTests.swift b/thenTests/FinallyTests.swift → ThenTests/FinallyTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class FinallyTests: XCTestCase {
 

diff --git a/thenTests/Helpers.swift → ThenTests/Helpers.swift b/thenTests/Helpers.swift → 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 → ThenTests/Info.plist b/thenTests/Info.plist → ThenTests/Info.plist
diff --git a/thenTests/MemoryTests.swift → ThenTests/MemoryTests.swift b/thenTests/MemoryTests.swift → ThenTests/MemoryTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import then
+@testable import Then
 
 class MemoryTests: XCTestCase {
 

diff --git a/thenTests/NoMatterWhatTests.swift → ThenTests/NoMatterWhatTests.swift b/thenTests/NoMatterWhatTests.swift → ThenTests/NoMatterWhatTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class NoMatterWhatTests: XCTestCase {
 

diff --git a/thenTests/OnErrorTests.swift → ThenTests/OnErrorTests.swift b/thenTests/OnErrorTests.swift → ThenTests/OnErrorTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class OnErrorTests: XCTestCase {
 

diff --git a/thenTests/ProgressTests.swift → ThenTests/ProgressTests.swift b/thenTests/ProgressTests.swift → ThenTests/ProgressTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class ProgressTests: XCTestCase {
 

diff --git a/thenTests/RaceTests.swift → ThenTests/RaceTests.swift b/thenTests/RaceTests.swift → ThenTests/RaceTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class RaceTests: XCTestCase {
 

diff --git a/thenTests/RecoverTests.swift → ThenTests/RecoverTests.swift b/thenTests/RecoverTests.swift → ThenTests/RecoverTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class RecoverTests: XCTestCase {
 

diff --git a/thenTests/RegisterThenTests.swift → ThenTests/RegisterThenTests.swift b/thenTests/RegisterThenTests.swift → ThenTests/RegisterThenTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class RegisterThenTests: XCTestCase {
 

diff --git a/thenTests/RetryTests.swift → ThenTests/RetryTests.swift b/thenTests/RetryTests.swift → ThenTests/RetryTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class RetryTests: XCTestCase {
 

diff --git a/thenTests/ThenTests.swift → ThenTests/ThenTests.swift b/thenTests/ThenTests.swift → ThenTests/ThenTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-@testable import then
+@testable import Then
 
 class ThenTests: XCTestCase {
 

diff --git a/thenTests/TimeoutTests.swift → ThenTests/TimeoutTests.swift b/thenTests/TimeoutTests.swift → ThenTests/TimeoutTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class TimeoutTests: XCTestCase {
 

diff --git a/thenTests/UnwrapTests.swift → ThenTests/UnwrapTests.swift b/thenTests/UnwrapTests.swift → ThenTests/UnwrapTests.swift
@@ -7,7 +7,7 @@
 //
 
 import XCTest
-import then
+import Then
 
 class UnwrapTests: XCTestCase {