Skip to content

Commit 976a7ac

Browse files
Bump to Swift 5
1 parent 061257a commit 976a7ac

File tree

4 files changed

+6
-16
lines changed

4 files changed

+6
-16
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.0
1+
5.0

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: swift
2-
osx_image: xcode10.1
2+
osx_image: xcode10.2
33
script:
44
- set -o pipefail
55
- swift --version

PrettyLogger.podspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Pod::Spec.new do |s|
77
DESC
88
s.homepage = "https://github.com/sebastianvarela/PrettyLogger"
99
s.license = { :type => "MIT", :file => "LICENSE" }
10+
s.swift_version = '5.0'
1011

1112
s.author = { "Sebastián Varela" => "sebastian.varela@s3ba.net" }
1213
s.social_media_url = "http://twitter.com/skirmish84"

PrettyLogger.xcodeproj/project.pbxproj

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@
394394
hasScannedForEncodings = 0;
395395
knownRegions = (
396396
en,
397+
Base,
397398
);
398399
mainGroup = F2B655E221E61459001B14A2;
399400
productRefGroup = F2B655ED21E61459001B14A2 /* Products */;
@@ -690,6 +691,7 @@
690691
SDKROOT = iphoneos;
691692
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
692693
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
694+
SWIFT_VERSION = 5.0;
693695
VERSIONING_SYSTEM = "apple-generic";
694696
VERSION_INFO_PREFIX = "";
695697
};
@@ -747,6 +749,7 @@
747749
SDKROOT = iphoneos;
748750
SWIFT_COMPILATION_MODE = wholemodule;
749751
SWIFT_OPTIMIZATION_LEVEL = "-O";
752+
SWIFT_VERSION = 5.0;
750753
VALIDATE_PRODUCT = YES;
751754
VERSIONING_SYSTEM = "apple-generic";
752755
VERSION_INFO_PREFIX = "";
@@ -774,7 +777,6 @@
774777
PRODUCT_NAME = PrettyLogger;
775778
SKIP_INSTALL = YES;
776779
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
777-
SWIFT_VERSION = 4.2;
778780
TARGETED_DEVICE_FAMILY = "1,2";
779781
};
780782
name = Debug;
@@ -799,7 +801,6 @@
799801
PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.PrettyLogger;
800802
PRODUCT_NAME = PrettyLogger;
801803
SKIP_INSTALL = YES;
802-
SWIFT_VERSION = 4.2;
803804
TARGETED_DEVICE_FAMILY = "1,2";
804805
};
805806
name = Release;
@@ -817,7 +818,6 @@
817818
);
818819
PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.PrettyLoggerTests;
819820
PRODUCT_NAME = "$(TARGET_NAME)";
820-
SWIFT_VERSION = 4.2;
821821
TARGETED_DEVICE_FAMILY = "1,2";
822822
};
823823
name = Debug;
@@ -835,7 +835,6 @@
835835
);
836836
PRODUCT_BUNDLE_IDENTIFIER = net.s3ba.PrettyLoggerTests;
837837
PRODUCT_NAME = "$(TARGET_NAME)";
838-
SWIFT_VERSION = 4.2;
839838
TARGETED_DEVICE_FAMILY = "1,2";
840839
};
841840
name = Release;
@@ -863,7 +862,6 @@
863862
SDKROOT = watchos;
864863
SKIP_INSTALL = YES;
865864
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
866-
SWIFT_VERSION = 4.2;
867865
TARGETED_DEVICE_FAMILY = 4;
868866
WATCHOS_DEPLOYMENT_TARGET = 5.1;
869867
};
@@ -891,7 +889,6 @@
891889
PRODUCT_NAME = PrettyLogger;
892890
SDKROOT = watchos;
893891
SKIP_INSTALL = YES;
894-
SWIFT_VERSION = 4.2;
895892
TARGETED_DEVICE_FAMILY = 4;
896893
WATCHOS_DEPLOYMENT_TARGET = 5.1;
897894
};
@@ -919,7 +916,6 @@
919916
SDKROOT = appletvos;
920917
SKIP_INSTALL = YES;
921918
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
922-
SWIFT_VERSION = 4.2;
923919
TARGETED_DEVICE_FAMILY = 3;
924920
TVOS_DEPLOYMENT_TARGET = 10.1;
925921
};
@@ -946,7 +942,6 @@
946942
PRODUCT_NAME = PrettyLogger;
947943
SDKROOT = appletvos;
948944
SKIP_INSTALL = YES;
949-
SWIFT_VERSION = 4.2;
950945
TARGETED_DEVICE_FAMILY = 3;
951946
TVOS_DEPLOYMENT_TARGET = 10.1;
952947
};
@@ -966,7 +961,6 @@
966961
PRODUCT_BUNDLE_IDENTIFIER = "net.s3ba.PrettyLogger-tvOSTests";
967962
PRODUCT_NAME = "$(TARGET_NAME)";
968963
SDKROOT = appletvos;
969-
SWIFT_VERSION = 4.2;
970964
TARGETED_DEVICE_FAMILY = 3;
971965
TVOS_DEPLOYMENT_TARGET = 12.1;
972966
};
@@ -986,7 +980,6 @@
986980
PRODUCT_BUNDLE_IDENTIFIER = "net.s3ba.PrettyLogger-tvOSTests";
987981
PRODUCT_NAME = "$(TARGET_NAME)";
988982
SDKROOT = appletvos;
989-
SWIFT_VERSION = 4.2;
990983
TARGETED_DEVICE_FAMILY = 3;
991984
TVOS_DEPLOYMENT_TARGET = 12.1;
992985
};
@@ -1017,7 +1010,6 @@
10171010
SDKROOT = macosx;
10181011
SKIP_INSTALL = YES;
10191012
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1020-
SWIFT_VERSION = 4.2;
10211013
};
10221014
name = Debug;
10231015
};
@@ -1045,7 +1037,6 @@
10451037
PRODUCT_NAME = PrettyLogger;
10461038
SDKROOT = macosx;
10471039
SKIP_INSTALL = YES;
1048-
SWIFT_VERSION = 4.2;
10491040
};
10501041
name = Release;
10511042
};
@@ -1066,7 +1057,6 @@
10661057
PRODUCT_BUNDLE_IDENTIFIER = "net.s3ba.PrettyLogger-macOSTests";
10671058
PRODUCT_NAME = "$(TARGET_NAME)";
10681059
SDKROOT = macosx;
1069-
SWIFT_VERSION = 4.2;
10701060
};
10711061
name = Debug;
10721062
};
@@ -1087,7 +1077,6 @@
10871077
PRODUCT_BUNDLE_IDENTIFIER = "net.s3ba.PrettyLogger-macOSTests";
10881078
PRODUCT_NAME = "$(TARGET_NAME)";
10891079
SDKROOT = macosx;
1090-
SWIFT_VERSION = 4.2;
10911080
};
10921081
name = Release;
10931082
};

0 commit comments

Comments
 (0)