Skip to content

Commit

Permalink
Updates for Xcode 11/ Swift 5.1 (+ rename to Then)
Browse files Browse the repository at this point in the history
  • Loading branch information
s4cha committed Sep 27, 2019
1 parent b17c854 commit a66a51f
Show file tree
Hide file tree
Showing 37 changed files with 118 additions and 122 deletions.
15 changes: 8 additions & 7 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")
]
)
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 :)")
}
```
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
112 changes: 59 additions & 53 deletions then.xcodeproj/project.pbxproj → Then.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "99FA7FB11D93C153002274B0"
BuildableName = "then.framework"
BlueprintName = "thenMacOS"
BlueprintName = "ThenMacOS"
ReferencedContainer = "container:then.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -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"
Expand All @@ -65,7 +61,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "99FA7FB11D93C153002274B0"
BuildableName = "then.framework"
BlueprintName = "thenMacOS"
BlueprintName = "ThenMacOS"
ReferencedContainer = "container:then.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "17D4C41B1F4703B1002EF805"
BuildableName = "then.framework"
BlueprintName = "thenTvOS"
BlueprintName = "ThenTvOS"
ReferencedContainer = "container:then.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -29,8 +29,6 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
Expand All @@ -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"
Expand All @@ -65,7 +61,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "17D4C41B1F4703B1002EF805"
BuildableName = "then.framework"
BlueprintName = "thenTvOS"
BlueprintName = "ThenTvOS"
ReferencedContainer = "container:then.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
2 changes: 1 addition & 1 deletion thenMacOS/Info.plist → ThenMacOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class AsyncAwaitTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
@testable import then
@testable import Then

class BridgeErrorTests: XCTestCase {

Expand Down
2 changes: 1 addition & 1 deletion thenTests/ChainTests.swift → ThenTests/ChainTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class ChainTests: XCTestCase {

Expand Down
2 changes: 1 addition & 1 deletion thenTests/DelayTests.swift → ThenTests/DelayTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class DelayTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class FinallyTests: XCTestCase {

Expand Down
2 changes: 1 addition & 1 deletion thenTests/Helpers.swift → ThenTests/Helpers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
@testable import then
@testable import Then
import Dispatch

var globalCount = 0
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
@testable import then
@testable import Then

class MemoryTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class NoMatterWhatTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class OnErrorTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class ProgressTests: XCTestCase {

Expand Down
2 changes: 1 addition & 1 deletion thenTests/RaceTests.swift → ThenTests/RaceTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class RaceTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class RecoverTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class RegisterThenTests: XCTestCase {

Expand Down
2 changes: 1 addition & 1 deletion thenTests/RetryTests.swift → ThenTests/RetryTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class RetryTests: XCTestCase {

Expand Down
2 changes: 1 addition & 1 deletion thenTests/ThenTests.swift → ThenTests/ThenTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
@testable import then
@testable import Then

class ThenTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class TimeoutTests: XCTestCase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
//

import XCTest
import then
import Then

class UnwrapTests: XCTestCase {

Expand Down
Loading

0 comments on commit a66a51f

Please sign in to comment.