Skip to content

Commit 7a94271

Browse files
nathantannar4nathantannar4
committed
Convert to Swift 5 / Fix Linting
1 parent 8c93ee2 commit 7a94271

25 files changed

Lines changed: 72 additions & 91 deletions

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
# Specify the Xcode version to use.
1414
macos:
15-
xcode: "10.0.0"
15+
xcode: "10.2.0"
1616

1717
# Define the steps required to build the project.
1818
steps:

‎.swift-version‎

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

‎.swiftlint.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ custom_rules:
1212
message: "Use like open override or public override instead" # violation message. optional.
1313
severity: warning # violation severity. optional.
1414
opt_in_rules:
15-
- explicit_acl
1615
- explicit_top_level_acl
1716
explicit_acl: error
1817
explicit_top_level_acl: error

‎Cartfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "nathantannar4/InputBarAccessoryView" "4.2.1"
1+
github "nathantannar4/InputBarAccessoryView" "4.3.0"

‎Cartfile.private‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "Quick/Quick" ~> 1.2.0
2-
github "Quick/Nimble" ~> 7.0.3
1+
github "Quick/Quick" ~> 2.0.0
2+
github "Quick/Nimble" ~> 8.0.0

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v7.3.4"
2-
github "Quick/Quick" "v1.3.4"
3-
github "nathantannar4/InputBarAccessoryView" "4.2.1"
1+
github "Quick/Nimble" "v8.0.1"
2+
github "Quick/Quick" "v2.0.0"
3+
github "nathantannar4/InputBarAccessoryView" "4.3.0"

‎MessageKit.podspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'MessageKit'
3-
s.version = '3.0.0-beta-swift4-2'
3+
s.version = '3.0.0-beta-swift5'
44
s.license = { :type => "MIT", :file => "LICENSE.md" }
55

66
s.summary = 'An elegant messages UI library for iOS.'
@@ -12,16 +12,16 @@ Pod::Spec.new do |s|
1212
s.source_files = 'Sources/**/*.swift'
1313

1414
s.pod_target_xcconfig = {
15-
"SWIFT_VERSION" => "4.2",
15+
"SWIFT_VERSION" => "5.0",
1616
}
1717

18-
s.swift_version = '4.2'
18+
s.swift_version = '5.0'
1919

2020
s.ios.deployment_target = '9.0'
2121
s.ios.resource_bundle = { 'MessageKitAssets' => 'Assets/MessageKitAssets.bundle/Images' }
2222

2323
s.requires_arc = true
2424

25-
s.dependency 'InputBarAccessoryView'
25+
s.dependency 'InputBarAccessoryView', '~> 4.3.0'
2626

2727
end

‎MessageKit.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@
563563
isa = PBXProject;
564564
attributes = {
565565
LastSwiftUpdateCheck = 0730;
566-
LastUpgradeCheck = 0940;
566+
LastUpgradeCheck = 1020;
567567
ORGANIZATIONNAME = MessageKit;
568568
TargetAttributes = {
569569
88916B211CF0DF2F00469F91 = {
@@ -580,6 +580,7 @@
580580
developmentRegion = English;
581581
hasScannedForEncodings = 0;
582582
knownRegions = (
583+
English,
583584
en,
584585
);
585586
mainGroup = 88916B181CF0DF2F00469F91;
@@ -737,6 +738,7 @@
737738
isa = XCBuildConfiguration;
738739
buildSettings = {
739740
ALWAYS_SEARCH_USER_PATHS = NO;
741+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
740742
CLANG_ANALYZER_NONNULL = YES;
741743
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
742744
CLANG_CXX_LIBRARY = "libc++";
@@ -786,7 +788,7 @@
786788
ONLY_ACTIVE_ARCH = YES;
787789
SDKROOT = iphoneos;
788790
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
789-
SWIFT_VERSION = 4.2;
791+
SWIFT_VERSION = 5.0;
790792
TARGETED_DEVICE_FAMILY = "1,2";
791793
VERSIONING_SYSTEM = "apple-generic";
792794
VERSION_INFO_PREFIX = "";
@@ -797,6 +799,7 @@
797799
isa = XCBuildConfiguration;
798800
buildSettings = {
799801
ALWAYS_SEARCH_USER_PATHS = NO;
802+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
800803
CLANG_ANALYZER_NONNULL = YES;
801804
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
802805
CLANG_CXX_LIBRARY = "libc++";
@@ -838,7 +841,7 @@
838841
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
839842
MTL_ENABLE_DEBUG_INFO = NO;
840843
SDKROOT = iphoneos;
841-
SWIFT_VERSION = 4.2;
844+
SWIFT_VERSION = 5.0;
842845
TARGETED_DEVICE_FAMILY = "1,2";
843846
VALIDATE_PRODUCT = YES;
844847
VERSIONING_SYSTEM = "apple-generic";
@@ -868,7 +871,7 @@
868871
PRODUCT_NAME = "$(TARGET_NAME)";
869872
SKIP_INSTALL = YES;
870873
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
871-
SWIFT_VERSION = 4.2;
874+
SWIFT_VERSION = 5.0;
872875
};
873876
name = Debug;
874877
};
@@ -894,7 +897,7 @@
894897
PRODUCT_NAME = "$(TARGET_NAME)";
895898
SKIP_INSTALL = YES;
896899
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
897-
SWIFT_VERSION = 4.2;
900+
SWIFT_VERSION = 5.0;
898901
};
899902
name = Release;
900903
};

‎MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKit.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 = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎MessageKit.xcodeproj/xcshareddata/xcschemes/MessageKitTests.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 = "0940"
3+
LastUpgradeVersion = "1020"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)