Skip to content

Commit

Permalink
Bumps to 5.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
s4cha committed Apr 24, 2019
1 parent 80567df commit 9f51efe
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Alamofire/Alamofire" "4.7.3"
github "freshOS/Arrow" "4.2.0"
github "freshOS/then" "4.2.0"
github "Alamofire/Alamofire" "4.8.2"
github "freshOS/Arrow" "5.0.0"
github "freshOS/then" "5.0.0"
6 changes: 3 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "Alamofire/Alamofire" "4.7.3"
github "freshOS/Arrow" "4.2.0"
github "freshOS/then" "4.2.0"
github "Alamofire/Alamofire" "4.8.2"
github "freshOS/Arrow" "5.0.0"
github "freshOS/then" "5.0.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Alamofire
Submodule Alamofire updated 190 files
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PackageDescription
let package = Package(
name: "ws",
dependencies: [
.Package(url: "https://github.com/s4cha/Arrow",
.Package(url: "https://github.com/s4cha/then",
.Package(url: "https://github.com/freshOS/Arrow",
.Package(url: "https://github.com/freshOS/then",
.Package(url: "https://github.com/Alamofire/Alamofire"
]
)
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ws

[![Language: Swift 2 3 and 4](https://img.shields.io/badge/language-swift2|3|4-f48041.svg?style=flat)](https://developer.apple.com/swift)
[![Language: Swift 5](https://img.shields.io/badge/language-swift5-f48041.svg?style=flat)](https://developer.apple.com/swift)
![Platform: iOS 8+](https://img.shields.io/badge/platform-iOS%208%2B-blue.svg?style=flat)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![Cocoapods compatible](https://img.shields.io/badge/Cocoapods-compatible-4BC51D.svg?style=flat)](https://cocoapods.org)
Expand Down Expand Up @@ -425,6 +425,7 @@ Swift 3 -> version [**2.0.4**](https://github.com/freshOS/ws/releases/tag/2.0.4)
Swift 4 -> version [**3.0.0**](https://github.com/freshOS/ws/releases/tag/3.0.0)
Swift 4.1 -> version [**3.1.0**](https://github.com/freshOS/ws/releases/tag/3.1.0)
Swift 4.2 -> version [**3.2.0**](https://github.com/freshOS/ws/releases/tag/3.2.0)
Swift 5.0 -> version [**5.0.0**](https://github.com/freshOS/ws/releases/tag/5.0.0)

### Backers
Like the project? Offer coffee or support us with a monthly donation and help us continue our activities :)
Expand Down
Binary file modified ws.framework.zip
Binary file not shown.
9 changes: 5 additions & 4 deletions ws.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "ws"
s.version = "3.2.0"
s.version = "5.0.0"
s.summary = "Elegant JSON WebService for Swift ☁️"
s.homepage = "https://github.com/freshOS/ws"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand All @@ -10,8 +10,9 @@ Pod::Spec.new do |s|
s.ios.deployment_target = "9.0"
s.source_files = "ws/*.{h,m,swift}"
s.frameworks = "Foundation"
s.dependency 'Arrow', '~> 4.2.0'
s.dependency 'thenPromise', '~> 4.2.0'
s.dependency 'Alamofire', '~> 4.7.3'
s.dependency 'Arrow', '~> 5.0.0'
s.dependency 'thenPromise', '~> 5.0.0'
s.dependency 'Alamofire', '~> 4.8.2'
s.description = "Elegant JSON WebService for Swift - Stop writing boilerplate JSON webservice code and focus on your awesome App instead"
s.swift_versions = ['2', '3', '4', '4.1', '4.2', '5.0']
end
23 changes: 13 additions & 10 deletions ws.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -346,26 +346,27 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = s4cha;
TargetAttributes = {
996CAB8F1BF67A7C00931EAD = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
996CAB991BF67A7C00931EAD = {
CreatedOnToolsVersion = 7.1;
DevelopmentTeam = 4TATSTJ3J3;
LastSwiftMigration = 0800;
LastSwiftMigration = 1020;
};
};
};
buildConfigurationList = 996CAB8A1BF67A7C00931EAD /* Build configuration list for PBXProject "ws" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 996CAB861BF67A7C00931EAD;
productRefGroup = 996CAB911BF67A7C00931EAD /* Products */;
Expand Down Expand Up @@ -554,6 +555,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -602,7 +604,7 @@
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
Expand All @@ -613,6 +615,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
Expand Down Expand Up @@ -653,7 +656,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VERSIONING_SYSTEM = "apple-generic";
Expand All @@ -678,7 +681,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -699,7 +702,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -711,7 +714,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.s4cha.ws.wsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -724,7 +727,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.s4cha.ws.wsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion ws.xcodeproj/xcshareddata/xcschemes/ws.xcscheme
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0930"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion ws/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>3.2.0</string>
<string>5.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion ws/WS.swift
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ open class WS {

public extension Promise {

public func resolveOnMainThread() -> Promise<T> {
func resolveOnMainThread() -> Promise<T> {
return Promise<T> { resolve, reject, progress in
self.progress { p in
DispatchQueue.main.async {
Expand Down

0 comments on commit 9f51efe

Please sign in to comment.