Skip to content

Commit

Permalink
Upgrade to Xcode 10.2 and support swift 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ProVir committed Mar 30, 2019
1 parent f1822dd commit 344be03
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "Alamofire/Alamofire" ~> 4.7
github "Alamofire/Alamofire"
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![Platform](https://cocoapod-badges.herokuapp.com/p/WebServiceSwift/badge.png)](http://cocoapods.org/pods/WebServiceSwift)
[![License](https://cocoapod-badges.herokuapp.com/l/WebServiceSwift/badge.png)](https://github.com/ProVir/WebServiceSwift/blob/master/LICENSE)

Network layer as Service. Service as an interface for interacting with your web server. Support Swift 4.
Network layer as Service. Service as an interface for interacting with your web server. Support Swift 5.

- [Features](#features)
- [Requirements](#requirements)
Expand Down Expand Up @@ -47,8 +47,8 @@ Network layer as Service. Service as an interface for interacting with your web
## Requirements

- iOS 8.0+ / macOS 10.10+ / tvOS 9.0+ / watchOS 2.0+
- Xcode 9.0 and above
- Swift 4.0 and above
- Xcode 10.2 and above
- Swift 5.0 and above


## Communication
Expand All @@ -70,14 +70,13 @@ Network layer as Service. Service as an interface for interacting with your web
$ gem install cocoapods
```

> CocoaPods 1.1.0+ is required to build WebServiceSwift 3.0.0+.
> CocoaPods 1.6.0+ is required to build WebServiceSwift 3.0.0+.
To integrate WebServiceSwift into your Xcode project using CocoaPods, specify it in your `Podfile`:

```ruby
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
use_frameworks!

target '<Your Target Name>' do
pod 'WebServiceSwift', '~> 3.0'
Expand Down
2 changes: 1 addition & 1 deletion Source/General/WebServiceMockEndpoint.swift
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public protocol WebServiceMockRequesting: WebServiceRequesting, WebServiceMockBa
}

public extension WebServiceMockRequesting {
public func mockResponseBaseHandler(helper: Any?) throws -> Any {
func mockResponseBaseHandler(helper: Any?) throws -> Any {
return try mockResponseHandler(helper: helper)
}
}
Expand Down
20 changes: 11 additions & 9 deletions WebServiceExample.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@
506CAFCD2084D707008AB016 /* WebServiceTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServiceTypes.swift; sourceTree = "<group>"; };
507529A421032E61008A167A /* WebServiceDataBaseStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServiceDataBaseStorage.swift; sourceTree = "<group>"; };
507529A72103321A008A167A /* WebServiceDataBaseStorage.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WebServiceDataBaseStorage.xcdatamodel; sourceTree = "<group>"; };
50A1C664224D7365003A8554 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
50A9162420B09C4C00EA2E9D /* WebServiceSwift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = WebServiceSwift.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
50AB6AAF20883C2F00C1E093 /* SiteWebProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteWebProvider.swift; sourceTree = "<group>"; };
50AB6AB120883F3100C1E093 /* WebService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebService.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -149,8 +150,9 @@
501D2AB41F4E8DD0000E3FA3 = {
isa = PBXGroup;
children = (
50F0804F20AC843B00994710 /* README.md */,
50A9162420B09C4C00EA2E9D /* WebServiceSwift.podspec */,
50A1C664224D7365003A8554 /* Cartfile */,
50F0804F20AC843B00994710 /* README.md */,
501D2ABF1F4E8DD0000E3FA3 /* Example */,
501D2AD81F4E8DF5000E3FA3 /* Source */,
501D2ABE1F4E8DD0000E3FA3 /* Products */,
Expand Down Expand Up @@ -329,24 +331,24 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0830;
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = ProVir;
TargetAttributes = {
501D2ABC1F4E8DD0000E3FA3 = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Manual;
};
501D2AD61F4E8DF5000E3FA3 = {
CreatedOnToolsVersion = 8.3.3;
LastSwiftMigration = 1000;
LastSwiftMigration = 1020;
ProvisioningStyle = Manual;
};
};
};
buildConfigurationList = 501D2AB81F4E8DD0000E3FA3 /* Build configuration list for PBXProject "WebServiceExample" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -638,7 +640,7 @@
PRODUCT_BUNDLE_IDENTIFIER = ru.provir.WebServiceExample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -654,7 +656,7 @@
PRODUCT_BUNDLE_IDENTIFIER = ru.provir.WebServiceExample;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -679,7 +681,7 @@
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand All @@ -705,7 +707,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_VERSION = 4.2;
SWIFT_VERSION = 5.0;
VERSIONING_SYSTEM = "apple-generic";
VERSION_INFO_PREFIX = "";
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
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
4 changes: 2 additions & 2 deletions WebServiceSwift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "WebServiceSwift"
s.version = "3.0.1"
s.version = "3.0.2"
s.summary = "Network layer as Service."
s.description = <<-DESC
Written in Swift.
Expand All @@ -14,7 +14,7 @@ Pod::Spec.new do |s|
s.author = { "ViR (Vitaliy Korotkiy)" => "[email protected]" }
s.source = { :git => "https://github.com/ProVir/WebServiceSwift.git", :tag => "#{s.version}" }

s.swift_version = '4.2'
s.swift_version = '5.0'
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
Expand Down

0 comments on commit 344be03

Please sign in to comment.