Skip to content

Commit 3fe7151

Browse files
iwb-kevin-hirschiwb-kevin-hirsch
committed
Update code to Swift 5.0
1 parent 91aa1f1 commit 3fe7151

6 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎.swift-version‎

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

‎DropDown.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "DropDown"
4-
s.version = "2.3.12"
4+
s.version = "2.3.13"
55
s.summary = "A Material Design drop down"
66

77
s.description = <<-DESC
@@ -26,5 +26,5 @@ Pod::Spec.new do |s|
2626
s.resources = "DropDown/resources/*.{png,xib}"
2727
s.requires_arc = true
2828

29-
s.swift_version = '4.2'
29+
s.swift_version = '5.0'
3030
end

‎DropDown.xcodeproj/project.pbxproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -285,27 +285,27 @@
285285
isa = PBXProject;
286286
attributes = {
287287
LastSwiftUpdateCheck = 0730;
288-
LastUpgradeCheck = 1000;
288+
LastUpgradeCheck = 1020;
289289
ORGANIZATIONNAME = "Kevin Hirsch";
290290
TargetAttributes = {
291291
0A76440E1B676C2300BF1A2D = {
292292
CreatedOnToolsVersion = 6.4;
293-
LastSwiftMigration = 0910;
293+
LastSwiftMigration = 1020;
294294
};
295295
0A7644231B676C2300BF1A2D = {
296296
CreatedOnToolsVersion = 6.4;
297-
LastSwiftMigration = 0910;
297+
LastSwiftMigration = 1020;
298298
TestTargetID = 0A76440E1B676C2300BF1A2D;
299299
};
300300
0AB5D8701D0EEECD002D3A17 = {
301301
CreatedOnToolsVersion = 7.3.1;
302-
LastSwiftMigration = 0900;
302+
LastSwiftMigration = 1020;
303303
};
304304
};
305305
};
306306
buildConfigurationList = 0A76440A1B676C2300BF1A2D /* Build configuration list for PBXProject "DropDown" */;
307307
compatibilityVersion = "Xcode 3.2";
308-
developmentRegion = English;
308+
developmentRegion = en;
309309
hasScannedForEncodings = 0;
310310
knownRegions = (
311311
en,
@@ -528,7 +528,7 @@
528528
PRODUCT_BUNDLE_IDENTIFIER = com.assistoLab.Demo;
529529
PRODUCT_NAME = "$(TARGET_NAME)";
530530
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
531-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
531+
SWIFT_VERSION = 5.0;
532532
TARGETED_DEVICE_FAMILY = "1,2";
533533
};
534534
name = Debug;
@@ -544,7 +544,7 @@
544544
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
545545
PRODUCT_BUNDLE_IDENTIFIER = com.assistoLab.Demo;
546546
PRODUCT_NAME = "$(TARGET_NAME)";
547-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
547+
SWIFT_VERSION = 5.0;
548548
TARGETED_DEVICE_FAMILY = "1,2";
549549
};
550550
name = Release;
@@ -561,7 +561,7 @@
561561
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
562562
PRODUCT_BUNDLE_IDENTIFIER = "com.kevin.hirsch.$(PRODUCT_NAME:rfc1034identifier)";
563563
PRODUCT_NAME = "$(TARGET_NAME)";
564-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
564+
SWIFT_VERSION = 5.0;
565565
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
566566
};
567567
name = Debug;
@@ -574,7 +574,7 @@
574574
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
575575
PRODUCT_BUNDLE_IDENTIFIER = "com.kevin.hirsch.$(PRODUCT_NAME:rfc1034identifier)";
576576
PRODUCT_NAME = "$(TARGET_NAME)";
577-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
577+
SWIFT_VERSION = 5.0;
578578
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Demo.app/Demo";
579579
};
580580
name = Release;
@@ -598,7 +598,7 @@
598598
PRODUCT_BUNDLE_IDENTIFIER = com.assistoLab.DropDown;
599599
PRODUCT_NAME = "$(TARGET_NAME)";
600600
SKIP_INSTALL = YES;
601-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
601+
SWIFT_VERSION = 5.0;
602602
TARGETED_DEVICE_FAMILY = "1,2";
603603
VERSIONING_SYSTEM = "apple-generic";
604604
VERSION_INFO_PREFIX = "";
@@ -622,7 +622,7 @@
622622
PRODUCT_BUNDLE_IDENTIFIER = com.assistoLab.DropDown;
623623
PRODUCT_NAME = "$(TARGET_NAME)";
624624
SKIP_INSTALL = YES;
625-
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
625+
SWIFT_VERSION = 5.0;
626626
TARGETED_DEVICE_FAMILY = "1,2";
627627
VERSIONING_SYSTEM = "apple-generic";
628628
VERSION_INFO_PREFIX = "";

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

‎DropDown/src/DropDown.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ extension DropDown {
991991
else { return }
992992

993993
// remove from indices
994-
if let selectedRowIndex = selectedRowIndices.index(where: { $0 == index }) {
994+
if let selectedRowIndex = selectedRowIndices.firstIndex(where: { $0 == index }) {
995995
selectedRowIndices.remove(at: selectedRowIndex)
996996
}
997997

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Twitter: @kevinh6113](http://img.shields.io/badge/contact-%40kevinh6113-70a1fb.svg?style=flat)](https://twitter.com/kevinh6113)
44
[![License: MIT](http://img.shields.io/badge/license-MIT-70a1fb.svg?style=flat)](https://github.com/AssistoLab/DropDown/blob/master/README.md)
5-
[![Version](http://img.shields.io/badge/version-2.3.12-green.svg?style=flat)](https://github.com/AssistoLab/DropDown)
5+
[![Version](http://img.shields.io/badge/version-2.3.13-green.svg?style=flat)](https://github.com/AssistoLab/DropDown)
66
[![Cocoapods](http://img.shields.io/badge/Cocoapods-available-green.svg?style=flat)](http://cocoadocs.org/docsets/DropDown/)
77
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
88

@@ -21,6 +21,7 @@ To install [CocoaPods](http://www.cocoapods.org), run `sudo gem install cocoapod
2121

2222
## Installation 📱
2323

24+
`DropDown` supports Swift 5.0 since version `2.3.13`.
2425
`DropDown` supports Swift 4.2 since version `2.3.4`.
2526

2627
If you need Swift 4.0, use version 2.3.2:

0 commit comments

Comments
 (0)