Skip to content

Commit b0bffc9

Browse files
committed
Update to Swift 5
1 parent 16cef05 commit b0bffc9

File tree

4 files changed

+25
-22
lines changed

4 files changed

+25
-22
lines changed

.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

33
import PackageDescription
44

@@ -22,5 +22,5 @@ let package = Package(
2222
dependencies: ["RouteKit"]
2323
),
2424
],
25-
swiftLanguageVersions: [4]
25+
swiftLanguageVersions: [.v5]
2626
)

RouteKit.podspec

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
Pod::Spec.new do |spec|
2-
spec.name = 'RouteKit'
3-
spec.version = '0.2.1'
4-
spec.license = { :type => 'MIT', :file => 'LICENSE-MIT' }
5-
spec.homepage = 'https://github.com/woxtu/RouteKit'
6-
spec.author = { 'woxtu' => '[email protected]' }
7-
spec.summary = 'Type-safe URL routing for Swift.'
8-
spec.source = { :git => 'https://github.com/woxtu/RouteKit.git', :tag => spec.version }
2+
spec.name = 'RouteKit'
3+
spec.version = '0.2.1'
4+
spec.license = { :type => 'MIT', :file => 'LICENSE-MIT' }
5+
spec.homepage = 'https://github.com/woxtu/RouteKit'
6+
spec.author = { 'woxtu' => '[email protected]' }
7+
spec.summary = 'Type-safe URL routing for Swift.'
8+
spec.source = { :git => 'https://github.com/woxtu/RouteKit.git', :tag => spec.version }
9+
spec.swift_version = '5.0'
910

1011
spec.ios.deployment_target = '9.0'
1112
spec.osx.deployment_target = '10.12'

RouteKit.xcodeproj/project.pbxproj

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -299,18 +299,22 @@
299299
TargetAttributes = {
300300
430EC1E020598F7600F84EA2 = {
301301
CreatedOnToolsVersion = 9.2;
302+
LastSwiftMigration = 1030;
302303
ProvisioningStyle = Automatic;
303304
};
304305
430EC1E820598F7600F84EA2 = {
305306
CreatedOnToolsVersion = 9.2;
307+
LastSwiftMigration = 1030;
306308
ProvisioningStyle = Automatic;
307309
};
308310
430EC2092059919F00F84EA2 = {
309311
CreatedOnToolsVersion = 9.2;
312+
LastSwiftMigration = 1030;
310313
ProvisioningStyle = Automatic;
311314
};
312315
430EC211205991A000F84EA2 = {
313316
CreatedOnToolsVersion = 9.2;
317+
LastSwiftMigration = 1030;
314318
ProvisioningStyle = Automatic;
315319
};
316320
};
@@ -321,6 +325,7 @@
321325
hasScannedForEncodings = 0;
322326
knownRegions = (
323327
en,
328+
Base,
324329
);
325330
mainGroup = 435264A4204864EF00F23D74;
326331
productRefGroup = 435264AF204864EF00F23D74 /* Products */;
@@ -411,7 +416,7 @@
411416
);
412417
runOnlyForDeploymentPostprocessing = 0;
413418
shellPath = /bin/sh;
414-
shellScript = "if which swiftformat >/dev/null; then\n swiftformat . --swiftversion 4.2 --stripunusedargs closure-only\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
419+
shellScript = "if which swiftformat >/dev/null; then\n swiftformat . --swiftversion 5.0 --stripunusedargs closure-only\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
415420
};
416421
439B58762312810600BA9D21 /* SwiftFormat */ = {
417422
isa = PBXShellScriptBuildPhase;
@@ -429,7 +434,7 @@
429434
);
430435
runOnlyForDeploymentPostprocessing = 0;
431436
shellPath = /bin/sh;
432-
shellScript = "if which swiftformat >/dev/null; then\n swiftformat . --swiftversion 4.2 --stripunusedargs closure-only\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
437+
shellScript = "if which swiftformat >/dev/null; then\n swiftformat . --swiftversion 5.0 --stripunusedargs closure-only\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
433438
};
434439
/* End PBXShellScriptBuildPhase section */
435440

@@ -522,7 +527,7 @@
522527
PRODUCT_BUNDLE_IDENTIFIER = woxtu.RouteKit;
523528
PRODUCT_NAME = "${PROJECT}";
524529
SKIP_INSTALL = YES;
525-
SWIFT_VERSION = 4.0;
530+
SWIFT_VERSION = 5.0;
526531
TARGETED_DEVICE_FAMILY = "1,2";
527532
};
528533
name = Debug;
@@ -543,7 +548,7 @@
543548
PRODUCT_BUNDLE_IDENTIFIER = woxtu.RouteKit;
544549
PRODUCT_NAME = "${PROJECT}";
545550
SKIP_INSTALL = YES;
546-
SWIFT_VERSION = 4.0;
551+
SWIFT_VERSION = 5.0;
547552
TARGETED_DEVICE_FAMILY = "1,2";
548553
};
549554
name = Release;
@@ -557,7 +562,7 @@
557562
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
558563
PRODUCT_BUNDLE_IDENTIFIER = "woxtu.RouteKit-iOSTests";
559564
PRODUCT_NAME = "$(TARGET_NAME)";
560-
SWIFT_VERSION = 4.0;
565+
SWIFT_VERSION = 5.0;
561566
TARGETED_DEVICE_FAMILY = "1,2";
562567
};
563568
name = Debug;
@@ -571,7 +576,7 @@
571576
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
572577
PRODUCT_BUNDLE_IDENTIFIER = "woxtu.RouteKit-iOSTests";
573578
PRODUCT_NAME = "$(TARGET_NAME)";
574-
SWIFT_VERSION = 4.0;
579+
SWIFT_VERSION = 5.0;
575580
TARGETED_DEVICE_FAMILY = "1,2";
576581
};
577582
name = Release;
@@ -595,7 +600,7 @@
595600
PRODUCT_NAME = "${PROJECT}";
596601
SDKROOT = macosx;
597602
SKIP_INSTALL = YES;
598-
SWIFT_VERSION = 4.0;
603+
SWIFT_VERSION = 5.0;
599604
};
600605
name = Debug;
601606
};
@@ -618,7 +623,7 @@
618623
PRODUCT_NAME = "${PROJECT}";
619624
SDKROOT = macosx;
620625
SKIP_INSTALL = YES;
621-
SWIFT_VERSION = 4.0;
626+
SWIFT_VERSION = 5.0;
622627
};
623628
name = Release;
624629
};
@@ -635,7 +640,7 @@
635640
PRODUCT_BUNDLE_IDENTIFIER = "woxtu.RouteKit-macOSTests";
636641
PRODUCT_NAME = "$(TARGET_NAME)";
637642
SDKROOT = macosx;
638-
SWIFT_VERSION = 4.0;
643+
SWIFT_VERSION = 5.0;
639644
};
640645
name = Debug;
641646
};
@@ -652,7 +657,7 @@
652657
PRODUCT_BUNDLE_IDENTIFIER = "woxtu.RouteKit-macOSTests";
653658
PRODUCT_NAME = "$(TARGET_NAME)";
654659
SDKROOT = macosx;
655-
SWIFT_VERSION = 4.0;
660+
SWIFT_VERSION = 5.0;
656661
};
657662
name = Release;
658663
};
@@ -707,7 +712,6 @@
707712
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
708713
GCC_WARN_UNUSED_FUNCTION = YES;
709714
GCC_WARN_UNUSED_VARIABLE = YES;
710-
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
711715
MTL_ENABLE_DEBUG_INFO = YES;
712716
ONLY_ACTIVE_ARCH = YES;
713717
SDKROOT = iphoneos;
@@ -763,7 +767,6 @@
763767
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
764768
GCC_WARN_UNUSED_FUNCTION = YES;
765769
GCC_WARN_UNUSED_VARIABLE = YES;
766-
IPHONEOS_DEPLOYMENT_TARGET = 11.2;
767770
MTL_ENABLE_DEBUG_INFO = NO;
768771
SDKROOT = iphoneos;
769772
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

0 commit comments

Comments
 (0)