Merge pull request #608 from realm/nn-swift22

[WIP] Swift 2.2
realm · Apr 7, 2016 · 5ba1579 · 5ba1579
2 parents 18bc70c + b2326b8
commit 5ba1579
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode7.2
+osx_image: xcode7.3
 git:
  submodules: false
 branches:

diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "jpsim/SourceKitten" "0.11.0"
-github "scottrhoyt/SwiftyTextTable" "0.3.0"
+github "jpsim/SourceKitten" "master"
+github "scottrhoyt/SwiftyTextTable"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,7 @@
-github "antitypical/Result" "1.0.2"
-github "drmohundro/SWXMLHash" "2.1.0"
+github "antitypical/Result" "2.0.0"
+github "drmohundro/SWXMLHash" "2.2.0"
 github "scottrhoyt/SwiftyTextTable" "0.3.0"
-github "behrang/YamlSwift" "1.4.2"
+github "behrang/YamlSwift" "1.4.3"
 github "jspahrsummers/xcconfigs" "0.9"
-github "Carthage/Commandant" "0.8.3"
-github "jpsim/SourceKitten" "0.11.0"
+github "Carthage/Commandant" "0.10.0"
+github "jpsim/SourceKitten" "fc877bd19f69ea5c0fc8667f29d0a114373d4ce7"
diff --git a/Carthage/Checkouts/Commandant b/Carthage/Checkouts/Commandant
diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result
diff --git a/Carthage/Checkouts/SWXMLHash b/Carthage/Checkouts/SWXMLHash
diff --git a/Carthage/Checkouts/SourceKitten b/Carthage/Checkouts/SourceKitten
diff --git a/Carthage/Checkouts/YamlSwift b/Carthage/Checkouts/YamlSwift
diff --git a/Source/SwiftLintFramework/Protocols/Rule.swift b/Source/SwiftLintFramework/Protocols/Rule.swift
@@ -26,7 +26,7 @@ extension Rule {
 public protocol OptInRule: Rule {}
 
 public protocol ConfigurationProviderRule: Rule {
- typealias ConfigurationType: RuleConfiguration
+ associatedtype ConfigurationType: RuleConfiguration
  var configuration: ConfigurationType { get set }
 }
 

diff --git a/Source/SwiftLintFramework/Rules/VariableNameRule.swift b/Source/SwiftLintFramework/Rules/VariableNameRule.swift
@@ -52,7 +52,7 @@ public struct VariableNameRule: ASTRule, ConfigurationProviderRule {
  let firstCharacter = name.substringToIndex(secondIndex)
  if firstCharacter.isUppercase() {
  if name.characters.count > 1 {
- let range = Range(start: secondIndex, end: secondIndex.successor())
+ let range = secondIndex..<secondIndex.successor()
  let secondCharacter = name.substringWithRange(range)
  return secondCharacter.isLowercase()
  }

diff --git a/Tests/SwiftLintFramework/IntegrationTests.swift b/Tests/SwiftLintFramework/IntegrationTests.swift
@@ -12,7 +12,7 @@ import SwiftLintFramework
 import XCTest
 
 let config: Configuration = {
- let directory = (((__FILE__ as NSString)
+ let directory = (((#file as NSString)
  .stringByDeletingLastPathComponent as NSString)
  .stringByDeletingLastPathComponent as NSString)
  .stringByDeletingLastPathComponent
@@ -25,7 +25,7 @@ class IntegrationTests: XCTestCase {
  func testSwiftLintLints() {
  // This is as close as we're ever going to get to a self-hosting linter.
  let swiftFiles = config.lintableFilesForPath("")
- XCTAssert(swiftFiles.map({$0.path!}).contains(__FILE__), "current file should be included")
+ XCTAssert(swiftFiles.map({$0.path!}).contains(#file), "current file should be included")
 
  #if SWIFTLINT_XCODE_VERSION_0730 || SWIFT_PACKAGE
  XCTAssertEqual(swiftFiles.flatMap({