Merge pull request #65 from taji-taji/update-dependencies

Update dependencies

Author: taji-taji

.github/workflows/test.yml

@@ -11,10 +11,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["14.3.1"]
+        xcode: ["14.3.1", "15.0.1"]
         include:
           - xcode: "14.3.1"
             macos: macos-13
+          - xcode: "15.0.1"
+            macos: macos-13
     runs-on: ${{ matrix.macos }}
     name: macOS
     steps:
@@ -57,11 +59,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        swift: ["5.8"]
+        swift: ["5.8", "5.9"]
         include:
           - swift: "5.8"
             container: "swift:5.8"
             cache-version: 1
+          - swift: "5.9"
+            container: "swift:5.9"
+            cache-version: 1
     runs-on: ubuntu-latest
     container: ${{ matrix.container }}
     name: Linux

Package.resolved

@@ -34,7 +34,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/danger/swift.git", from: "3.0.0"),
         .package(url: "https://github.com/taji-taji/swift-shell.git", from: "1.0.0"),
-        .package(url: "https://github.com/peripheryapp/periphery", from: "2.15.0"),
+        .package(url: "https://github.com/peripheryapp/periphery", from: "2.0.0"),
     ],
     targets: [
         .target(

Package.swift

@@ -9,8 +9,21 @@ extension DangerDSL: ViolationNotifier {
 }
 
 extension DangerDSL: PullRequestDiffProvidable {
+    private var sourceBranch: String {
+        if let github = github {
+            return "\(github.pullRequest.base.sha)..\(github.pullRequest.head.sha)"
+        } else if let gitLab = gitLab {
+            return gitLab.mergeRequest.targetBranch
+        } else if let bitbucketCloud = bitbucketCloud {
+            return bitbucketCloud.pr.destination.branchName
+        } else if let bitbucketServer = bitbucketServer {
+            return bitbucketServer.pullRequest.fromRef.displayId
+        }
+        return ""
+    }
+
     func diff(forFile file: String) throws -> FileDiff.Changes {
-        try utils.diff(forFile: file, sourceBranch: sourceBranch())
+        try utils.diff(forFile: file, sourceBranch: sourceBranch)
                  .map {
                      Logger.shared.debug("changes for \(file):\($0.changes)")
                      switch $0.changes {
@@ -27,19 +40,6 @@ extension DangerDSL: PullRequestDiffProvidable {
                  }
                  .get()
     }
-
-    private func sourceBranch() -> String {
-        if let github = github {
-            return "origin/\(github.pullRequest.base.ref)..HEAD"
-        } else if let gitLab = gitLab {
-            return gitLab.mergeRequest.targetBranch
-        } else if let bitbucketCloud = bitbucketCloud {
-            return bitbucketCloud.pr.destination.branchName
-        } else if let bitbucketServer = bitbucketServer {
-            return bitbucketServer.pullRequest.fromRef.displayId
-        }
-        return ""
-    }
 }
 
 private extension FileDiff.Hunk {

Sources/DangerSwiftPeriphery/DangerDSL+Extensions.swift

@@ -19,64 +19,85 @@ public enum PeripheryScanOptions {
     case retainAssignOnlyProperties
     case retainAssignOnlyPropertyTypes([String])
     case externalEncodableProtocols([String])
+    case externalTestCaseClasses([String])
     case retainObjcAccessible
+    case retainObjcAnnotated
     case retainUnusedProtocolFuncParams
     case cleanBuild
+    case retainSwiftUIPreviews
     case skipBuild
+    case relativeResults
     case strict
     case custom(String)
 }
 
 extension PeripheryScanOptions {
     var optionString: String {
-        if case let .custom(value) = self {
-            return value
-        }
-        if values.isEmpty {
-            return key
-        } else {
-            return values
-                .map { [key, $0].joined(separator: " ") }
+        switch self {
+        case .config(let config):
+            return "--config \(config)"
+        case .workspace(let workspace):
+            return "--workspace \(workspace)"
+        case .project(let project):
+            return "--project \(project)"
+        case .schemes(let schemes):
+            return schemes
+                .map({ "--schemes \($0)" })
                 .joined(separator: " ")
+        case .targets(let targets):
+            return targets
+                .map({ "--targets \($0)" })
+                .joined(separator: " ")
+        case .indexExclude(let indexes):
+            return indexes
+                .map({ "--index-exclude \($0)" })
+                .joined(separator: " ")
+        case .reportExclude(let reports):
+            return reports
+                .map({ "--report-exclude \($0)" })
+                .joined(separator: " ")
+        case .reportInclude(let reports):
+            return reports
+                .map({ "--report-include \($0)" })
+                .joined(separator: " ")
+        case .indexStorePath(let path):
+            return "--index-store-path \(path)"
+        case .retainPublic:
+            return "--retain-public"
+        case .disableRedundantPublicAnalysis:
+            return "--disable-redundant-public-analysis"
+        case .retainAssignOnlyProperties:
+            return "--retain-assign-only-properties"
+        case .retainAssignOnlyPropertyTypes(let types):
+            return types
+                .map({ "--retain-assign-only-property-types \($0)" })
+                .joined(separator: " ")
+        case .externalEncodableProtocols(let protocols):
+            return protocols
+                .map({ "--external-encodable-protocols \($0)" })
+                .joined(separator: " ")
+        case .externalTestCaseClasses(let classes):
+            return classes
+                .map({ "--external-test-case-classes \($0)" })
+                .joined(separator: " ")
+        case .retainObjcAccessible:
+            return "--retain-objc-accessible"
+        case .retainObjcAnnotated:
+            return "--retain-objc-annotated"
+        case .retainUnusedProtocolFuncParams:
+            return "--retain-unused-protocol-func-params"
+        case .cleanBuild:
+            return "--clean-build"
+        case .retainSwiftUIPreviews:
+            return "--retain-swift-ui-previews"
+        case .skipBuild:
+            return "--skip-build"
+        case .relativeResults:
+            return "--relative-results"
+        case .strict:
+            return "--strict"
+        case .custom(let option):
+            return option
         }
     }
 }
-
-private extension PeripheryScanOptions {
-    var key: String {
-        let reflection = Mirror(reflecting: self)
-        guard reflection.displayStyle == .enum,
-              let associated = reflection.children.first else {
-            return "--" + "\(self)".kebabCased
-        }
-        return "--" + associated.label!.kebabCased
-    }
-
-    var values: [String] {
-        let reflection = Mirror(reflecting: self)
-        guard reflection.displayStyle == .enum,
-              let associated = reflection.children.first else {
-            return []
-        }
-        switch associated.value {
-        case let value as String:
-            return [value]
-        case let values as [String]:
-            return values
-        default:
-            return []
-        }
-    }
-}
-
-private extension String {
-    var kebabCased: String {
-        let pattern = "([a-z0-9])([A-Z])"
-
-        guard let regex = try? NSRegularExpression(pattern: pattern, options: []) else {
-            return self
-        }
-        let range = NSRange(location: 0, length: count)
-        return regex.stringByReplacingMatches(in: self, options: [], range: range, withTemplate: "$1-$2").lowercased()
-    }
-}

Sources/DangerSwiftPeriphery/PeripheryScanOptions.swift

@@ -21,10 +21,14 @@ final class PeripheryScanOptionsTests: XCTestCase {
                     "--retain-assign-only-property-types type1 --retain-assign-only-property-types type2"),
                 (.externalEncodableProtocols(["protocol1", "protocol2"]),
                     "--external-encodable-protocols protocol1 --external-encodable-protocols protocol2"),
+                (.externalTestCaseClasses(["class1", "class2"]), "--external-test-case-classes class1 --external-test-case-classes class2"),
                 (.retainObjcAccessible, "--retain-objc-accessible"),
+                (.retainObjcAnnotated, "--retain-objc-annotated"),
                 (.retainUnusedProtocolFuncParams, "--retain-unused-protocol-func-params"),
                 (.cleanBuild, "--clean-build"),
+                (.retainSwiftUIPreviews, "--retain-swift-ui-previews"),
                 (.skipBuild, "--skip-build"),
+                (.relativeResults, "--relative-results"),
                 (.strict, "--strict"),
                 (.custom("--test test"), "--test test"),
             ]