Skip to content

Commit 344be03

Browse files
committed
Upgrade to Xcode 10.2 and support swift 5.0
1 parent f1822dd commit 344be03

File tree

7 files changed

+28
-19
lines changed

7 files changed

+28
-19
lines changed

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "Alamofire/Alamofire" ~> 4.7
1+
github "Alamofire/Alamofire"

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![Platform](https://cocoapod-badges.herokuapp.com/p/WebServiceSwift/badge.png)](http://cocoapods.org/pods/WebServiceSwift)
77
[![License](https://cocoapod-badges.herokuapp.com/l/WebServiceSwift/badge.png)](https://github.com/ProVir/WebServiceSwift/blob/master/LICENSE)
88

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

1111
- [Features](#features)
1212
- [Requirements](#requirements)
@@ -47,8 +47,8 @@ Network layer as Service. Service as an interface for interacting with your web
4747
## Requirements
4848

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

5353

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

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

7777
```ruby
7878
source 'https://github.com/CocoaPods/Specs.git'
7979
platform :ios, '8.0'
80-
use_frameworks!
8180

8281
target '<Your Target Name>' do
8382
pod 'WebServiceSwift', '~> 3.0'

Source/General/WebServiceMockEndpoint.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public protocol WebServiceMockRequesting: WebServiceRequesting, WebServiceMockBa
3737
}
3838

3939
public extension WebServiceMockRequesting {
40-
public func mockResponseBaseHandler(helper: Any?) throws -> Any {
40+
func mockResponseBaseHandler(helper: Any?) throws -> Any {
4141
return try mockResponseHandler(helper: helper)
4242
}
4343
}

WebServiceExample.xcodeproj/project.pbxproj

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
506CAFCD2084D707008AB016 /* WebServiceTypes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServiceTypes.swift; sourceTree = "<group>"; };
9595
507529A421032E61008A167A /* WebServiceDataBaseStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServiceDataBaseStorage.swift; sourceTree = "<group>"; };
9696
507529A72103321A008A167A /* WebServiceDataBaseStorage.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = WebServiceDataBaseStorage.xcdatamodel; sourceTree = "<group>"; };
97+
50A1C664224D7365003A8554 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
9798
50A9162420B09C4C00EA2E9D /* WebServiceSwift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = WebServiceSwift.podspec; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
9899
50AB6AAF20883C2F00C1E093 /* SiteWebProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteWebProvider.swift; sourceTree = "<group>"; };
99100
50AB6AB120883F3100C1E093 /* WebService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebService.swift; sourceTree = "<group>"; };
@@ -149,8 +150,9 @@
149150
501D2AB41F4E8DD0000E3FA3 = {
150151
isa = PBXGroup;
151152
children = (
152-
50F0804F20AC843B00994710 /* README.md */,
153153
50A9162420B09C4C00EA2E9D /* WebServiceSwift.podspec */,
154+
50A1C664224D7365003A8554 /* Cartfile */,
155+
50F0804F20AC843B00994710 /* README.md */,
154156
501D2ABF1F4E8DD0000E3FA3 /* Example */,
155157
501D2AD81F4E8DF5000E3FA3 /* Source */,
156158
501D2ABE1F4E8DD0000E3FA3 /* Products */,
@@ -329,24 +331,24 @@
329331
isa = PBXProject;
330332
attributes = {
331333
LastSwiftUpdateCheck = 0830;
332-
LastUpgradeCheck = 0930;
334+
LastUpgradeCheck = 1020;
333335
ORGANIZATIONNAME = ProVir;
334336
TargetAttributes = {
335337
501D2ABC1F4E8DD0000E3FA3 = {
336338
CreatedOnToolsVersion = 8.3.3;
337-
LastSwiftMigration = 1000;
339+
LastSwiftMigration = 1020;
338340
ProvisioningStyle = Manual;
339341
};
340342
501D2AD61F4E8DF5000E3FA3 = {
341343
CreatedOnToolsVersion = 8.3.3;
342-
LastSwiftMigration = 1000;
344+
LastSwiftMigration = 1020;
343345
ProvisioningStyle = Manual;
344346
};
345347
};
346348
};
347349
buildConfigurationList = 501D2AB81F4E8DD0000E3FA3 /* Build configuration list for PBXProject "WebServiceExample" */;
348350
compatibilityVersion = "Xcode 3.2";
349-
developmentRegion = English;
351+
developmentRegion = en;
350352
hasScannedForEncodings = 0;
351353
knownRegions = (
352354
en,
@@ -638,7 +640,7 @@
638640
PRODUCT_BUNDLE_IDENTIFIER = ru.provir.WebServiceExample;
639641
PRODUCT_NAME = "$(TARGET_NAME)";
640642
PROVISIONING_PROFILE_SPECIFIER = "";
641-
SWIFT_VERSION = 4.2;
643+
SWIFT_VERSION = 5.0;
642644
};
643645
name = Debug;
644646
};
@@ -654,7 +656,7 @@
654656
PRODUCT_BUNDLE_IDENTIFIER = ru.provir.WebServiceExample;
655657
PRODUCT_NAME = "$(TARGET_NAME)";
656658
PROVISIONING_PROFILE_SPECIFIER = "";
657-
SWIFT_VERSION = 4.2;
659+
SWIFT_VERSION = 5.0;
658660
};
659661
name = Release;
660662
};
@@ -679,7 +681,7 @@
679681
PROVISIONING_PROFILE_SPECIFIER = "";
680682
SKIP_INSTALL = YES;
681683
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
682-
SWIFT_VERSION = 4.2;
684+
SWIFT_VERSION = 5.0;
683685
VERSIONING_SYSTEM = "apple-generic";
684686
VERSION_INFO_PREFIX = "";
685687
};
@@ -705,7 +707,7 @@
705707
PRODUCT_NAME = "$(TARGET_NAME)";
706708
PROVISIONING_PROFILE_SPECIFIER = "";
707709
SKIP_INSTALL = YES;
708-
SWIFT_VERSION = 4.2;
710+
SWIFT_VERSION = 5.0;
709711
VERSIONING_SYSTEM = "apple-generic";
710712
VERSION_INFO_PREFIX = "";
711713
};
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

WebServiceExample.xcodeproj/xcshareddata/xcschemes/WebService.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0930"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

WebServiceSwift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "WebServiceSwift"
3-
s.version = "3.0.1"
3+
s.version = "3.0.2"
44
s.summary = "Network layer as Service."
55
s.description = <<-DESC
66
Written in Swift.
@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
1414
s.author = { "ViR (Vitaliy Korotkiy)" => "[email protected]" }
1515
s.source = { :git => "https://github.com/ProVir/WebServiceSwift.git", :tag => "#{s.version}" }
1616

17-
s.swift_version = '4.2'
17+
s.swift_version = '5.0'
1818
s.ios.deployment_target = '8.0'
1919
s.osx.deployment_target = '10.10'
2020
s.tvos.deployment_target = '9.0'

0 commit comments

Comments
 (0)