Merge pull request #537 from dahlborn/feature/Swift_5_7

danger · Oct 7, 2022 · f02749a · f02749a
2 parents 85cbade + 46a66fd
commit f02749a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 - Add `reviewers` property for GitLab merge requests [@pouyayarandi][] - [#534](https://github.com/danger/swift/pull/534)
 - Update [SwiftLint][] used by [danger-swift-with-swiftlint][] from v0.46.1 to [v0.49.1](https://github.com/realm/SwiftLint/releases/tag/0.49.1). [@Kiran-B][] - [#538](https://github.com/danger/swift/pull/538)
+- Change `danger-swift edit` generated package to be compatible with swift 5.7 [@dahlborn][]
 
 ## 3.14.0
 
@@ -533,4 +534,5 @@ This release also includes:
 [@pouyayarandi]: https://github.com/pouyayarandi
 [@Kiran-B]: https://github.com/Kiran-B
 [SwiftLint]: https://github.com/realm/SwiftLint
-[danger-swift-with-swiftlint]: https://github.com/orgs/danger/packages/container/package/danger-swift-with-swiftlint
+[danger-swift-with-swiftlint]: https://github.com/orgs/danger/packages/container/package/danger-swift-with-swiftlint
+[@dahlborn]: https://github.com/dahlborn
diff --git a/Sources/DangerDependenciesResolver/PackageGenerator.swift b/Sources/DangerDependenciesResolver/PackageGenerator.swift
@@ -34,8 +34,8 @@ struct PackageGenerator {
  "let package = Package(\n" +
  " name: \"\(masterPackageName)\",\n" +
  (platform.isEmpty ? "" : " platforms: [\(platform)],\n") +
- " products: [.library(name: \"DangerDependencies\", " +
- "type: .dynamic, targets: [\"\(masterPackageName)\"])]," +
+ " products: [.executable(name: \"DangerDependencies\", " +
+ "targets: [\"\(masterPackageName)\"])]," +
  "\n" +
  " dependencies: [\n"
 
@@ -48,7 +48,7 @@ struct PackageGenerator {
  }
 
  description.append("\n ],\n")
- description.append(" targets: [.target(name: \"\(masterPackageName)\", dependencies: [")
+ description.append(" targets: [.executableTarget(name: \"\(masterPackageName)\", dependencies: [")
 
  if !packages.isEmpty {
  description.append("\"")
@@ -72,7 +72,7 @@ struct PackageGenerator {
 
  func makePackageDescriptionHeader(forSwiftToolsVersion toolsVersion: Version) -> String {
  let swiftVersion = "\(toolsVersion.major).\(toolsVersion.minor)"
- let generationVersion = 2
+ let generationVersion = 3
 
  return "// swift-tools-version:\(swiftVersion)\n" +
  "// danger-dependency-generator-version:\(generationVersion)"

diff --git a/...iesResolverTests/__Snapshots__/PackageGeneratorTests/testGeneratedDescriptionHeader.1.txt b/...iesResolverTests/__Snapshots__/PackageGeneratorTests/testGeneratedDescriptionHeader.1.txt
@@ -1,2 +1,2 @@
 // swift-tools-version:4.2
-// danger-dependency-generator-version:2
+// danger-dependency-generator-version:3
diff --git a/...ts/__Snapshots__/PackageGeneratorTests/testGeneratedPackageWhenThereAreDependencies.1.txt b/...ts/__Snapshots__/PackageGeneratorTests/testGeneratedPackageWhenThereAreDependencies.1.txt
@@ -1,17 +1,17 @@
 // swift-tools-version:5.0
-// danger-dependency-generator-version:2
+// danger-dependency-generator-version:3
 
 import PackageDescription
 
 let package = Package(
  name: "PACKAGES",
  platforms: [.macOS(.v12)],
- products: [.library(name: "DangerDependencies", type: .dynamic, targets: ["PACKAGES"])],
+ products: [.executable(name: "DangerDependencies", targets: ["PACKAGES"])],
  dependencies: [
  .package(url: "https://github.com/danger/dependency1", from: "1.0.0"),
  .package(url: "https://github.com/danger/dependency2", from: "2.0.0"),
  .package(url: "https://github.com/danger/dependency3", from: "3.0.0")
  ],
- targets: [.target(name: "PACKAGES", dependencies: ["Dependency1", "Dependency2", "Dependency3"])],
+ targets: [.executableTarget(name: "PACKAGES", dependencies: ["Dependency1", "Dependency2", "Dependency3"])],
  swiftLanguageVersions: [.version("5")]
 )
diff --git a/...kageGeneratorTests/testGeneratedPackageWhenThereAreDependenciesAndSwiftVersionIs5_2.1.txt b/...kageGeneratorTests/testGeneratedPackageWhenThereAreDependenciesAndSwiftVersionIs5_2.1.txt
@@ -1,17 +1,17 @@
 // swift-tools-version:5.2
-// danger-dependency-generator-version:2
+// danger-dependency-generator-version:3
 
 import PackageDescription
 
 let package = Package(
  name: "PACKAGES",
  platforms: [.macOS(.v12)],
- products: [.library(name: "DangerDependencies", type: .dynamic, targets: ["PACKAGES"])],
+ products: [.executable(name: "DangerDependencies", targets: ["PACKAGES"])],
  dependencies: [
  .package(name: "Dependency1", url: "https://github.com/danger/dependency1", from: "1.0.0"),
  .package(name: "Dependency2", url: "https://github.com/danger/dependency2", from: "2.0.0"),
  .package(name: "Dependency3", url: "https://github.com/danger/dependency3", from: "3.0.0")
  ],
- targets: [.target(name: "PACKAGES", dependencies: ["Dependency1", "Dependency2", "Dependency3"])],
+ targets: [.executableTarget(name: "PACKAGES", dependencies: ["Dependency1", "Dependency2", "Dependency3"])],
  swiftLanguageVersions: [.version("5")]
 )
diff --git a/.../__Snapshots__/PackageGeneratorTests/testGeneratedPackageWhenThereAreNoDependencies.1.txt b/.../__Snapshots__/PackageGeneratorTests/testGeneratedPackageWhenThereAreNoDependencies.1.txt
@@ -1,15 +1,15 @@
 // swift-tools-version:5.0
-// danger-dependency-generator-version:2
+// danger-dependency-generator-version:3
 
 import PackageDescription
 
 let package = Package(
  name: "PACKAGES",
  platforms: [.macOS(.v12)],
- products: [.library(name: "DangerDependencies", type: .dynamic, targets: ["PACKAGES"])],
+ products: [.executable(name: "DangerDependencies", targets: ["PACKAGES"])],
  dependencies: [
 
  ],
- targets: [.target(name: "PACKAGES", dependencies: [])],
+ targets: [.executableTarget(name: "PACKAGES", dependencies: [])],
  swiftLanguageVersions: [.version("5")]
 )