Skip to content

Commit 8ead7ca

Browse files
minixTminixT
authored
Updated project to swift 5 (#329)
* Updated project to swift 5 * Updated travis configuration
1 parent cedd785 commit 8ead7ca

27 files changed

+79
-54
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: objective-c
2-
osx_image: xcode10.1
2+
osx_image: xcode10.2
33
xcode_project: RxBluetoothKit.xcodeproj
4-
xcode_sdk: iphonesimulator12.1
4+
xcode_sdk: iphonesimulator12.2
55

66
env:
77
matrix:

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 4.0
1+
github "ReactiveX/RxSwift" ~> 4.5

‎Cartfile.resolved‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "4.4.0"
1+
github "ReactiveX/RxSwift" "4.5.0"

‎Package.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:4.0
1+
// swift-tools-version:5.0
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33

44
import PackageDescription
@@ -9,7 +9,7 @@ let package = Package(
99
.library(name: "RxBluetoothKit", targets: ["RxBluetoothKit"])
1010
],
1111
dependencies: [
12-
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.0.0"))
12+
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "4.5.0"))
1313
],
1414
targets: [
1515
.target(

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,4 @@ Remember to follow [Polidea's Blog](https://www.polidea.com/blog/RxBluetoothKit_
102102
* 3.0 version supports Swift 3.0 and 3.1
103103
* 5.0 version supports Swift 3.2 and 4.0
104104
* 5.1.2 version supports Swift 4.1
105+
* 5.2 version supports Swift 5.0 and 4.2

‎RxBluetoothKit.podspec‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ Pod::Spec.new do |s|
1717
s.osx.deployment_target = '10.10'
1818
s.watchos.deployment_target = '4.0'
1919
s.tvos.deployment_target = '11.0'
20+
s.swift_version = '5.0'
2021

2122
s.requires_arc = true
2223

2324
s.source_files = 'Source/*.swift'
2425
s.osx.exclude_files = 'Source/RestoredState.swift', 'Source/CentralManager+RestoredState.swift', 'Source/CentralManagerRestoredState.swift'
2526
s.frameworks = 'CoreBluetooth'
26-
s.dependency 'RxSwift', '~> 4.0'
27+
s.dependency 'RxSwift', '~> 4.5'
2728
end

‎RxBluetoothKit.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@
10051005
isa = PBXProject;
10061006
attributes = {
10071007
LastSwiftUpdateCheck = 0900;
1008-
LastUpgradeCheck = 0930;
1008+
LastUpgradeCheck = 1020;
10091009
ORGANIZATIONNAME = Polidea;
10101010
TargetAttributes = {
10111011
0A7B27C61F9F1682003F950E = {
@@ -1022,11 +1022,11 @@
10221022
};
10231023
2666FD831CCE457C005E81CE = {
10241024
CreatedOnToolsVersion = 7.3;
1025-
LastSwiftMigration = 0900;
1025+
LastSwiftMigration = 1020;
10261026
};
10271027
2666FD8C1CCE457C005E81CE = {
10281028
CreatedOnToolsVersion = 7.3;
1029-
LastSwiftMigration = 0900;
1029+
LastSwiftMigration = 1020;
10301030
};
10311031
2666FDA21CCE4626005E81CE = {
10321032
CreatedOnToolsVersion = 7.3;
@@ -1040,10 +1040,11 @@
10401040
};
10411041
buildConfigurationList = A1299BB71CBE3D52005DEA5B /* Build configuration list for PBXProject "RxBluetoothKit" */;
10421042
compatibilityVersion = "Xcode 3.2";
1043-
developmentRegion = English;
1043+
developmentRegion = en;
10441044
hasScannedForEncodings = 0;
10451045
knownRegions = (
10461046
en,
1047+
Base,
10471048
);
10481049
mainGroup = A1299BB31CBE3D52005DEA5B;
10491050
productRefGroup = A1299BBE1CBE3D52005DEA5B /* Products */;
@@ -1126,7 +1127,7 @@
11261127
);
11271128
runOnlyForDeploymentPostprocessing = 0;
11281129
shellPath = /bin/sh;
1129-
shellScript = "if which gsed >/dev/null; then\n./scripts/generate-testable.sh\nelse\necho \"warning: Cannot generate testable files, gsed required.\"\nfi";
1130+
shellScript = "if which gsed >/dev/null; then\n./scripts/generate-testable.sh\nelse\necho \"warning: Cannot generate testable files, gsed required.\"\nfi\n";
11301131
};
11311132
1D1BC87D2003A31E004C5F36 /* Generate testable files script */ = {
11321133
isa = PBXShellScriptBuildPhase;
@@ -1529,7 +1530,7 @@
15291530
SDKROOT = watchos;
15301531
SKIP_INSTALL = YES;
15311532
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1532-
SWIFT_VERSION = 4.2;
1533+
SWIFT_VERSION = 5.0;
15331534
TARGETED_DEVICE_FAMILY = 4;
15341535
WATCHOS_DEPLOYMENT_TARGET = 4.0;
15351536
};
@@ -1561,7 +1562,7 @@
15611562
PRODUCT_NAME = RxBluetoothKit;
15621563
SDKROOT = watchos;
15631564
SKIP_INSTALL = YES;
1564-
SWIFT_VERSION = 4.2;
1565+
SWIFT_VERSION = 5.0;
15651566
TARGETED_DEVICE_FAMILY = 4;
15661567
WATCHOS_DEPLOYMENT_TARGET = 4.0;
15671568
};
@@ -1594,7 +1595,7 @@
15941595
SDKROOT = appletvos;
15951596
SKIP_INSTALL = YES;
15961597
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1597-
SWIFT_VERSION = 4.2;
1598+
SWIFT_VERSION = 5.0;
15981599
TARGETED_DEVICE_FAMILY = 3;
15991600
TVOS_DEPLOYMENT_TARGET = 11.0;
16001601
};
@@ -1626,7 +1627,7 @@
16261627
PRODUCT_NAME = RxBluetoothKit;
16271628
SDKROOT = appletvos;
16281629
SKIP_INSTALL = YES;
1629-
SWIFT_VERSION = 4.2;
1630+
SWIFT_VERSION = 5.0;
16301631
TARGETED_DEVICE_FAMILY = 3;
16311632
TVOS_DEPLOYMENT_TARGET = 11.0;
16321633
};
@@ -1653,7 +1654,7 @@
16531654
PRODUCT_NAME = "$(TARGET_NAME)";
16541655
SDKROOT = appletvos;
16551656
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1656-
SWIFT_VERSION = 4.2;
1657+
SWIFT_VERSION = 5.0;
16571658
TARGETED_DEVICE_FAMILY = 3;
16581659
TVOS_DEPLOYMENT_TARGET = 11.0;
16591660
};
@@ -1679,7 +1680,7 @@
16791680
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-tvOS.RxBluetoothKitTests";
16801681
PRODUCT_NAME = "$(TARGET_NAME)";
16811682
SDKROOT = appletvos;
1682-
SWIFT_VERSION = 4.2;
1683+
SWIFT_VERSION = 5.0;
16831684
TARGETED_DEVICE_FAMILY = 3;
16841685
TVOS_DEPLOYMENT_TARGET = 11.0;
16851686
};
@@ -1707,7 +1708,7 @@
17071708
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-iOS";
17081709
PRODUCT_NAME = RxBluetoothKit;
17091710
SKIP_INSTALL = YES;
1710-
SWIFT_VERSION = 4.2;
1711+
SWIFT_VERSION = 5.0;
17111712
};
17121713
name = Debug;
17131714
};
@@ -1733,7 +1734,7 @@
17331734
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-iOS";
17341735
PRODUCT_NAME = RxBluetoothKit;
17351736
SKIP_INSTALL = YES;
1736-
SWIFT_VERSION = 4.2;
1737+
SWIFT_VERSION = 5.0;
17371738
};
17381739
name = Release;
17391740
};
@@ -1749,7 +1750,7 @@
17491750
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
17501751
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-iOSTests";
17511752
PRODUCT_NAME = "$(TARGET_NAME)";
1752-
SWIFT_VERSION = 4.2;
1753+
SWIFT_VERSION = 5.0;
17531754
};
17541755
name = Debug;
17551756
};
@@ -1765,7 +1766,7 @@
17651766
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks $(FRAMEWORK_SEARCH_PATHS)";
17661767
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-iOSTests";
17671768
PRODUCT_NAME = "$(TARGET_NAME)";
1768-
SWIFT_VERSION = 4.2;
1769+
SWIFT_VERSION = 5.0;
17691770
};
17701771
name = Release;
17711772
};
@@ -1792,7 +1793,7 @@
17921793
PRODUCT_NAME = RxBluetoothKit;
17931794
SDKROOT = macosx;
17941795
SKIP_INSTALL = YES;
1795-
SWIFT_VERSION = 4.2;
1796+
SWIFT_VERSION = 5.0;
17961797
};
17971798
name = Debug;
17981799
};
@@ -1819,7 +1820,7 @@
18191820
PRODUCT_NAME = RxBluetoothKit;
18201821
SDKROOT = macosx;
18211822
SKIP_INSTALL = YES;
1822-
SWIFT_VERSION = 4.2;
1823+
SWIFT_VERSION = 5.0;
18231824
};
18241825
name = Release;
18251826
};
@@ -1839,7 +1840,7 @@
18391840
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-OSXTests";
18401841
PRODUCT_NAME = "$(TARGET_NAME)";
18411842
SDKROOT = macosx;
1842-
SWIFT_VERSION = 4.2;
1843+
SWIFT_VERSION = 5.0;
18431844
};
18441845
name = Debug;
18451846
};
@@ -1859,14 +1860,15 @@
18591860
PRODUCT_BUNDLE_IDENTIFIER = "com.polidea.RxBluetoothKit-OSXTests";
18601861
PRODUCT_NAME = "$(TARGET_NAME)";
18611862
SDKROOT = macosx;
1862-
SWIFT_VERSION = 4.2;
1863+
SWIFT_VERSION = 5.0;
18631864
};
18641865
name = Release;
18651866
};
18661867
A1299BCF1CBE3D52005DEA5B /* Debug */ = {
18671868
isa = XCBuildConfiguration;
18681869
buildSettings = {
18691870
ALWAYS_SEARCH_USER_PATHS = NO;
1871+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
18701872
CLANG_ANALYZER_NONNULL = YES;
18711873
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
18721874
CLANG_CXX_LIBRARY = "libc++";
@@ -1917,7 +1919,7 @@
19171919
ONLY_ACTIVE_ARCH = YES;
19181920
SDKROOT = iphoneos;
19191921
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1920-
SWIFT_VERSION = 4.2;
1922+
SWIFT_VERSION = 5.0;
19211923
TARGETED_DEVICE_FAMILY = "1,2";
19221924
VERSIONING_SYSTEM = "apple-generic";
19231925
VERSION_INFO_PREFIX = "";
@@ -1928,6 +1930,7 @@
19281930
isa = XCBuildConfiguration;
19291931
buildSettings = {
19301932
ALWAYS_SEARCH_USER_PATHS = NO;
1933+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
19311934
CLANG_ANALYZER_NONNULL = YES;
19321935
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
19331936
CLANG_CXX_LIBRARY = "libc++";
@@ -1971,7 +1974,7 @@
19711974
MTL_ENABLE_DEBUG_INFO = NO;
19721975
SDKROOT = iphoneos;
19731976
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1974-
SWIFT_VERSION = 4.2;
1977+
SWIFT_VERSION = 5.0;
19751978
TARGETED_DEVICE_FAMILY = "1,2";
19761979
VALIDATE_PRODUCT = YES;
19771980
VERSIONING_SYSTEM = "apple-generic";

‎RxBluetoothKit.xcodeproj/xcshareddata/xcschemes/RxBluetoothKit iOS.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"

‎RxBluetoothKit.xcodeproj/xcshareddata/xcschemes/RxBluetoothKit macOS.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"

‎RxBluetoothKit.xcodeproj/xcshareddata/xcschemes/RxBluetoothKit tvOS.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"

0 commit comments

Comments
 (0)