Merge branch 'release/1.1.0'

bbriatte · bbriatte · commit 565a596e8a51 · 2019-01-06T22:35:37.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2017, Digipolitan
+Copyright (c) 2019, Digipolitan
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 StringCase
 =================================
 
+[![Swift Version](https://img.shields.io/badge/swift-4.2-orange.svg?style=flat)](https://developer.apple.com/swift/)
 [![Swift Package Manager](https://rawgit.com/jlyonsmith/artwork/master/SwiftPackageManager/swiftpackagemanager-compatible.svg)](https://swift.org/package-manager/)
 [![Twitter](https://img.shields.io/badge/twitter-@Digipolitan-blue.svg?style=flat)](http://twitter.com/Digipolitan)
 
diff --git a/Sources/StringCase/StringCase.swift b/Sources/StringCase/StringCase.swift
@@ -85,8 +85,8 @@ public extension String {
 
     public func camelCased(_ format: StringCaseFormat.CamelCase = .default) -> String {
         var res: [String] = []
-        for (i, str) in self.caseSplit().enumerated() {
-            if i == 0 && format == .default {
+        for (idx, str) in self.caseSplit().enumerated() {
+            if idx == 0 && format == .default {
                 res.append(str.lowercased())
                 continue
             }
diff --git a/Tests/LinuxMain.swift b/Tests/LinuxMain.swift
@@ -1,6 +1,7 @@
 import XCTest
-@testable import StringCaseTests
 
-XCTMain([
-    testCase(StringCaseTests.allTests)
-])
+import StringCaseTests
+
+var tests = [XCTestCaseEntry]()
+tests += StringCaseTests.allTests()
+XCTMain(tests)
diff --git a/Tests/StringCaseTests/StringCamelCaseTests.swift b/Tests/StringCaseTests/StringCamelCaseTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import StringCase
 
-class StringCamelCaseTests: XCTestCase {
+final class StringCamelCaseTests: XCTestCase {
     func testCamelCase() {
         XCTAssertEqual("i love swift".camelCased(), "iLoveSwift")
     }
diff --git a/Tests/StringCaseTests/StringSnakeCaseTests.swift b/Tests/StringCaseTests/StringSnakeCaseTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import StringCase
 
-class StringSnakeCaseTests: XCTestCase {
+final class StringSnakeCaseTests: XCTestCase {
     func testSnakeCase() {
         XCTAssertEqual("i love swift".snakeCased(), "i_love_swift")
     }
diff --git a/Tests/StringCaseTests/XCTestManifests.swift b/Tests/StringCaseTests/XCTestManifests.swift
@@ -0,0 +1,10 @@
+import XCTest
+
+#if !os(macOS)
+public func allTests() -> [XCTestCaseEntry] {
+    return [
+        testCase(StringCamelCaseTests.allTests),
+        testCase(StringSnakeCaseTests.allTests)
+    ]
+}
+#endif

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:4.0`
	`1`	`+// swift-tools-version:4.2`
`2`	`2`	`// The swift-tools-version declares the minimum version of Swift required to build this package.`
`3`	`3`
`4`	`4`	`import PackageDescription`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import XCTest`
`2`	`2`	`@testable import StringCase`
`3`	`3`
`4`		`-class StringCamelCaseTests: XCTestCase {`
	`4`	`+final class StringCamelCaseTests: XCTestCase {`
`5`	`5`	`func testCamelCase() {`
`6`	`6`	`XCTAssertEqual("i love swift".camelCased(), "iLoveSwift")`
`7`	`7`	`}`