diff --git a/.gitmodules b/.gitmodules index 0fd07fdca2..f534e1db62 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,6 +19,3 @@ [submodule "Carthage/Checkouts/Yams"] path = Carthage/Checkouts/Yams url = https://github.com/jpsim/Yams.git -[submodule "Carthage/Checkouts/CryptoSwift"] - path = Carthage/Checkouts/CryptoSwift - url = https://github.com/krzyzanowskim/CryptoSwift.git diff --git a/CHANGELOG.md b/CHANGELOG.md index f434fe32aa..600a87b8df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,9 @@ [Daniel Metzing](https://github.com/dirtydanee) [#2499](https://github.com/realm/SwiftLint/issues/2499) +* Fix an error when pulling SwiftLint as a dependency using Carthage. + [JP Simard](https://github.com/jpsim) + ## 0.29.1: There’s Always More Laundry #### Breaking diff --git a/Cartfile.resolved b/Cartfile.resolved index 848a028b6b..fc3893d63d 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,6 +1,6 @@ github "Carthage/Commandant" "0.15.0" github "antitypical/Result" "4.0.0" -github "drmohundro/SWXMLHash" "4.7.5" +github "drmohundro/SWXMLHash" "4.7.6" github "jpsim/SourceKitten" "0.22.0" github "jpsim/Yams" "1.0.1" github "jspahrsummers/xcconfigs" "0.12" diff --git a/Carthage/Checkouts/SWXMLHash b/Carthage/Checkouts/SWXMLHash index 26b7613546..9ba1168411 160000 --- a/Carthage/Checkouts/SWXMLHash +++ b/Carthage/Checkouts/SWXMLHash @@ -1 +1 @@ -Subproject commit 26b7613546db50e1b260999ca1d8e74679c4ee9a +Subproject commit 9ba116841126f6c63435beef21a4cd247c32d2e7 diff --git a/Source/SwiftLintFramework/Rules/Idiomatic/LegacyHashingRule.swift b/Source/SwiftLintFramework/Rules/Idiomatic/LegacyHashingRule.swift index 5766436a89..c7ed51be31 100644 --- a/Source/SwiftLintFramework/Rules/Idiomatic/LegacyHashingRule.swift +++ b/Source/SwiftLintFramework/Rules/Idiomatic/LegacyHashingRule.swift @@ -1,4 +1,3 @@ -import Foundation import SourceKittenFramework public struct LegacyHashingRule: ASTRule, ConfigurationProviderRule, AutomaticTestableRule { diff --git a/SwiftLint.xcodeproj/project.pbxproj b/SwiftLint.xcodeproj/project.pbxproj index 8e4c4ba4a4..1855a5bbab 100644 --- a/SwiftLint.xcodeproj/project.pbxproj +++ b/SwiftLint.xcodeproj/project.pbxproj @@ -589,7 +589,6 @@ 8F6B3153213CDCD100858E44 /* UnusedPrivateDeclarationRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnusedPrivateDeclarationRule.swift; sourceTree = ""; }; 8F715B82213B528B00427BD9 /* UnusedImportRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnusedImportRule.swift; sourceTree = ""; }; 8F8050811FFE0CBB006F5B93 /* Configuration+IndentationStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Configuration+IndentationStyle.swift"; sourceTree = ""; }; - 8FB2AE2E21A1F99200D380F3 /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8FC8523A2117BDDE0015269B /* ExplicitSelfRule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExplicitSelfRule.swift; sourceTree = ""; }; 8FC9F5101F4B8E48006826C1 /* IsDisjointRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IsDisjointRule.swift; sourceTree = ""; }; 8FD216CB205584AF008ED13F /* CharacterSet+SwiftLint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "CharacterSet+SwiftLint.swift"; sourceTree = ""; }; @@ -1171,14 +1170,6 @@ path = Idiomatic; sourceTree = ""; }; - 8FB2AE2D21A1F99200D380F3 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 8FB2AE2E21A1F99200D380F3 /* CryptoSwift.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; D0D1210F19E87861005E4BAA = { isa = PBXGroup; children = (