Update to Swift 3.0

bhishaksanyal · Oct 17, 2016 · dc2b5ba · dc2b5ba
1 parent bad00fe
commit dc2b5ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Shell Sort/Tests/Tests.xcodeproj/project.pbxproj b/Shell Sort/Tests/Tests.xcodeproj/project.pbxproj
@@ -91,6 +91,7 @@
 				TargetAttributes = {
 					7B2BBC7F1C779D720067B71D = {
 						CreatedOnToolsVersion = 7.2;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@@ -224,6 +225,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -235,6 +237,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = swift.algorithm.club.Tests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};

diff --git a/Shell Sort/shellsort.swift b/Shell Sort/shellsort.swift
@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-public func insertionSort(inout list: [Int], start: Int, gap: Int) {
-  for i in (start + gap).stride(to: list.count, by: gap) {
+public func insertionSort(_ list: inout [Int], start: Int, gap: Int) {
+  for i in stride(from: (start + gap), to: list.count, by: gap) {
     let currentValue = list[i]
     var pos = i
     while pos >= gap && list[pos - gap] > currentValue {
@@ -32,7 +32,7 @@ public func insertionSort(inout list: [Int], start: Int, gap: Int) {
   }
 }
 
-public func shellSort(inout list: [Int]) {
+public func shellSort(_ list: inout [Int]) {
   var sublistCount = list.count / 2
   while sublistCount > 0 {
     for pos in 0..<sublistCount {