Merge pull request #2894 from realm/mf-update-sourcekitten

Update SourceKitten to 0.26.0
realm · Oct 8, 2019 · 2dcaf3e · 2dcaf3e
2 parents df28cbb + 956ea6f
commit 2dcaf3e
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 21 deletions.
diff --git a/Cartfile b/Cartfile
@@ -1,2 +1,2 @@
-github "jpsim/SourceKitten" ~> 0.24.0
+github "jpsim/SourceKitten" ~> 0.26.0
 github "scottrhoyt/SwiftyTextTable" ~> 0.9.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,7 +1,7 @@
 github "Carthage/Commandant" "0.16.0"
 github "antitypical/Result" "4.1.0"
-github "drmohundro/SWXMLHash" "4.8.0"
-github "jpsim/SourceKitten" "0.24.0"
+github "drmohundro/SWXMLHash" "5.0.1"
+github "jpsim/SourceKitten" "0.26.0"
 github "jpsim/Yams" "2.0.0"
 github "jspahrsummers/xcconfigs" "0.12"
 github "scottrhoyt/SwiftyTextTable" "0.9.0"
diff --git a/Carthage/Checkouts/SWXMLHash b/Carthage/Checkouts/SWXMLHash
diff --git a/Carthage/Checkouts/SourceKitten b/Carthage/Checkouts/SourceKitten
diff --git a/Package.resolved b/Package.resolved
@@ -10,22 +10,40 @@
           "version": "0.16.0"
         }
       },
+      {
+        "package": "CwlCatchException",
+        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
+        "state": {
+          "branch": null,
+          "revision": "7cd2f8cacc4d22f21bc0b2309c3b18acf7957b66",
+          "version": "1.2.0"
+        }
+      },
+      {
+        "package": "CwlPreconditionTesting",
+        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+        "state": {
+          "branch": null,
+          "revision": "c228db5d2ad1b01ebc84435e823e6cca4e3db98b",
+          "version": "1.2.0"
+        }
+      },
       {
         "package": "Nimble",
         "repositoryURL": "https://github.com/Quick/Nimble.git",
         "state": {
           "branch": null,
-          "revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
-          "version": "8.0.2"
+          "revision": "6abeb3f5c03beba2b9e4dbe20886e773b5b629b6",
+          "version": "8.0.4"
         }
       },
       {
         "package": "Quick",
         "repositoryURL": "https://github.com/Quick/Quick.git",
         "state": {
           "branch": null,
-          "revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
-          "version": "2.1.0"
+          "revision": "33682c2f6230c60614861dfc61df267e11a1602f",
+          "version": "2.2.0"
         }
       },
       {
@@ -42,8 +60,8 @@
         "repositoryURL": "https://github.com/jpsim/SourceKitten.git",
         "state": {
           "branch": null,
-          "revision": "35c9e0e437592661a51b160d80a4feaa5d4630d1",
-          "version": "0.24.0"
+          "revision": "cc1f16acc70630d27498e81078789f5fa55d7463",
+          "version": "0.26.0"
         }
       },
       {
@@ -60,8 +78,8 @@
         "repositoryURL": "https://github.com/drmohundro/SWXMLHash.git",
         "state": {
           "branch": null,
-          "revision": "f43166a8e18fdd0857f29e303b1bb79a5428bca0",
-          "version": "4.9.0"
+          "revision": "a4931e5c3bafbedeb1601d3bb76bbe835c6d475a",
+          "version": "5.0.1"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -15,7 +15,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/Carthage/Commandant.git", .upToNextMinor(from: "0.16.0")),
-        .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.24.0"),
+        .package(url: "https://github.com/jpsim/SourceKitten.git", from: "0.26.0"),
         .package(url: "https://github.com/jpsim/Yams.git", from: "2.0.0"),
         .package(url: "https://github.com/scottrhoyt/SwiftyTextTable.git", from: "0.9.0"),
     ] + (addCryptoSwift ? [.package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.0.0")] : []),

diff --git a/Source/SwiftLintFramework/Rules/Idiomatic/ExplicitACLRule.swift b/Source/SwiftLintFramework/Rules/Idiomatic/ExplicitACLRule.swift
@@ -148,7 +148,7 @@ private extension SwiftDeclarationKind {
              .varGlobal, .varInstance, .varStatic, .typealias, .functionAccessorModify, .functionAccessorRead,
              .functionConstructor, .functionDestructor, .functionFree, .functionMethodClass,
              .functionMethodInstance, .functionMethodStatic, .functionOperator, .functionOperatorInfix,
-             .functionOperatorPostfix, .functionOperatorPrefix, .functionSubscript, .protocol:
+             .functionOperatorPostfix, .functionOperatorPrefix, .functionSubscript, .protocol, .opaqueType:
             return true
         case .class, .enum, .extension, .extensionClass, .extensionEnum,
              .extensionProtocol, .extensionStruct, .struct:

diff --git a/Source/SwiftLintFramework/Rules/Lint/LowerACLThanParentRule.swift b/Source/SwiftLintFramework/Rules/Lint/LowerACLThanParentRule.swift
@@ -68,7 +68,7 @@ private extension SwiftDeclarationKind {
              .extensionProtocol, .extensionStruct, .functionAccessorAddress, .functionAccessorDidset,
              .functionAccessorRead, .functionAccessorModify, .functionAccessorGetter,
              .functionAccessorMutableaddress, .functionAccessorSetter, .functionAccessorWillset,
-             .functionDestructor, .genericTypeParam, .module, .precedenceGroup, .varLocal, .varParameter:
+             .functionDestructor, .genericTypeParam, .module, .precedenceGroup, .varLocal, .varParameter, .opaqueType:
             return false
         case .class, .enum, .functionConstructor, .functionFree, .functionMethodClass, .functionMethodInstance,
              .functionMethodStatic, .functionOperator, .functionOperatorInfix, .functionOperatorPostfix,

diff --git a/SwiftLintFramework.podspec b/SwiftLintFramework.podspec
@@ -10,6 +10,6 @@ Pod::Spec.new do |s|
   s.source_files        = 'Source/SwiftLintFramework/**/*.swift'
   s.swift_versions      = ['4.2', '5.0']
   s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' }
-  s.dependency            'SourceKittenFramework', '~> 0.24'
+  s.dependency            'SourceKittenFramework', '~> 0.26.0'
   s.dependency            'Yams', '~> 2.0'
 end
diff --git a/script/oss-check b/script/oss-check
@@ -195,15 +195,15 @@ def build(branch)
     perform("git fetch && git worktree add --detach #{dir} #{target}")
   end
 
+  Dir.chdir(dir) do
+    FileUtils.rm_rf %w[Packages .build]
+  end
+
   build_command = "cd #{dir}; swift build -c release"
 
   perform(build_command)
   return if $?.success?
 
-  # Couldn't build, start fresh
-  Dir.chdir(dir) do
-    FileUtils.rm_rf %w[Packages .build]
-  end
   return_value = nil
   puts build_command if @options[:verbose]
   Open3.popen3(build_command) do |_, stdout, _, wait_thr|