Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support compiling project with Swift 5.5 #1049

Merged
merged 3 commits into from
Apr 5, 2022
Merged

Support compiling project with Swift 5.5 #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60847ec
Revert Package.resolved back to v1, update Package.swift to support S…
liamnichols Apr 1, 2022
937ee19
Revert Package.resolved properly
liamnichols Apr 1, 2022
682b6ce
Update CHANGELOG.md
liamnichols Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Sourcery CHANGELOG

## 1.8.1
## Internal Changes
- Lower project requirements to allow compilation using Swift 5.5/Xcode 13.x [#1049](https://github.com/krzysztofzablocki/Sourcery/pull/1049)

## 1.8.0
## New Features
- Adds `xcframework` key to `target` object in configuration file to enable processing of `swiftinterface`
Expand Down
296 changes: 149 additions & 147 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,149 +1,151 @@
{
"pins" : [
{
"identity" : "aexml",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tadija/AEXML.git",
"state" : {
"revision" : "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
"version" : "4.6.1"
}
},
{
"identity" : "commander",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kylef/Commander.git",
"state" : {
"revision" : "4b6133c3071d521489a80c38fb92d7983f19d438",
"version" : "0.9.1"
}
},
{
"identity" : "cwlcatchexception",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattgallagher/CwlCatchException.git",
"state" : {
"revision" : "f809deb30dc5c9d9b78c872e553261a61177721a",
"version" : "2.0.0"
}
},
{
"identity" : "cwlpreconditiontesting",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state" : {
"revision" : "02b7a39a99c4da27abe03cab2053a9034379639f",
"version" : "2.0.0"
}
},
{
"identity" : "komondor",
"kind" : "remoteSourceControl",
"location" : "https://github.com/shibapm/Komondor.git",
"state" : {
"revision" : "855c74f395a4dc9e02828f58d931be6920bcbf6f",
"version" : "1.0.6"
}
},
{
"identity" : "nimble",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Quick/Nimble.git",
"state" : {
"revision" : "e491a6731307bb23783bf664d003be9b2fa59ab5",
"version" : "9.0.0"
}
},
{
"identity" : "packageconfig",
"kind" : "remoteSourceControl",
"location" : "https://github.com/shibapm/PackageConfig.git",
"state" : {
"revision" : "bf90dc69fa0792894b08a0b74cf34029694ae486",
"version" : "0.13.0"
}
},
{
"identity" : "pathkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kylef/PathKit.git",
"state" : {
"revision" : "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
"version" : "1.0.1"
}
},
{
"identity" : "quick",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Quick/Quick.git",
"state" : {
"revision" : "8cce6acd38f965f5baa3167b939f86500314022b",
"version" : "3.1.2"
}
},
{
"identity" : "shellout",
"kind" : "remoteSourceControl",
"location" : "https://github.com/JohnSundell/ShellOut.git",
"state" : {
"revision" : "e1577acf2b6e90086d01a6d5e2b8efdaae033568",
"version" : "2.3.0"
}
},
{
"identity" : "spectre",
"kind" : "remoteSourceControl",
"location" : "https://github.com/kylef/Spectre.git",
"state" : {
"revision" : "26cc5e9ae0947092c7139ef7ba612e34646086c7",
"version" : "0.10.1"
}
},
{
"identity" : "stencil",
"kind" : "remoteSourceControl",
"location" : "https://github.com/stencilproject/Stencil.git",
"state" : {
"revision" : "94197b3adbbf926348ad8765476a158aa4e54f8a",
"version" : "0.14.0"
}
},
{
"identity" : "stencilswiftkit",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SwiftGen/StencilSwiftKit.git",
"state" : {
"revision" : "54cbedcdbb4334e03930adcff7343ffaf317bf0f",
"version" : "2.8.0"
}
},
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"state" : {
"revision" : "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
"version" : "0.50600.1"
}
},
{
"identity" : "xcodeproj",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/xcodeproj",
"state" : {
"revision" : "446f3a0db73e141c7f57e26fcdb043096b1db52c",
"version" : "8.3.1"
}
},
{
"identity" : "yams",
"kind" : "remoteSourceControl",
"location" : "https://github.com/jpsim/Yams.git",
"state" : {
"revision" : "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
"version" : "4.0.6"
}
}
],
"version" : 2
"object": {
"pins": [
{
"package": "AEXML",
"repositoryURL": "https://github.com/tadija/AEXML.git",
"state": {
"branch": null,
"revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
"version": "4.6.1"
}
},
{
"package": "Commander",
"repositoryURL": "https://github.com/kylef/Commander.git",
"state": {
"branch": null,
"revision": "4b6133c3071d521489a80c38fb92d7983f19d438",
"version": "0.9.1"
}
},
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
"state": {
"branch": null,
"revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
"version": "2.0.0"
}
},
{
"package": "CwlPreconditionTesting",
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state": {
"branch": null,
"revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
"version": "2.0.0"
}
},
{
"package": "Komondor",
"repositoryURL": "https://github.com/shibapm/Komondor.git",
"state": {
"branch": null,
"revision": "855c74f395a4dc9e02828f58d931be6920bcbf6f",
"version": "1.0.6"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "e491a6731307bb23783bf664d003be9b2fa59ab5",
"version": "9.0.0"
}
},
{
"package": "PackageConfig",
"repositoryURL": "https://github.com/shibapm/PackageConfig.git",
"state": {
"branch": null,
"revision": "bf90dc69fa0792894b08a0b74cf34029694ae486",
"version": "0.13.0"
}
},
{
"package": "PathKit",
"repositoryURL": "https://github.com/kylef/PathKit.git",
"state": {
"branch": null,
"revision": "3bfd2737b700b9a36565a8c94f4ad2b050a5e574",
"version": "1.0.1"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "8cce6acd38f965f5baa3167b939f86500314022b",
"version": "3.1.2"
}
},
{
"package": "ShellOut",
"repositoryURL": "https://github.com/JohnSundell/ShellOut.git",
"state": {
"branch": null,
"revision": "e1577acf2b6e90086d01a6d5e2b8efdaae033568",
"version": "2.3.0"
}
},
{
"package": "Spectre",
"repositoryURL": "https://github.com/kylef/Spectre.git",
"state": {
"branch": null,
"revision": "26cc5e9ae0947092c7139ef7ba612e34646086c7",
"version": "0.10.1"
}
},
{
"package": "Stencil",
"repositoryURL": "https://github.com/stencilproject/Stencil.git",
"state": {
"branch": null,
"revision": "94197b3adbbf926348ad8765476a158aa4e54f8a",
"version": "0.14.0"
}
},
{
"package": "StencilSwiftKit",
"repositoryURL": "https://github.com/SwiftGen/StencilSwiftKit.git",
"state": {
"branch": null,
"revision": "54cbedcdbb4334e03930adcff7343ffaf317bf0f",
"version": "2.8.0"
}
},
{
"package": "SwiftSyntax",
"repositoryURL": "https://github.com/apple/swift-syntax.git",
"state": {
"branch": null,
"revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f",
"version": "0.50600.1"
}
},
{
"package": "XcodeProj",
"repositoryURL": "https://github.com/tuist/XcodeProj.git",
"state": {
"branch": null,
"revision": "446f3a0db73e141c7f57e26fcdb043096b1db52c",
"version": "8.3.1"
}
},
{
"package": "Yams",
"repositoryURL": "https://github.com/jpsim/Yams.git",
"state": {
"branch": null,
"revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",
"version": "4.0.6"
}
}
]
},
"version": 1
}
12 changes: 6 additions & 6 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.6
// swift-tools-version:5.5

import PackageDescription
import Foundation
Expand All @@ -20,12 +20,12 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/jpsim/Yams.git", from: "4.0.6"),
.package(url: "https://github.com/kylef/Commander.git", exact: "0.9.1"),
.package(url: "https://github.com/kylef/Commander.git", .exact("0.9.1")),
// PathKit needs to be exact to avoid a SwiftPM bug where dependency resolution takes a very long time.
.package(url: "https://github.com/kylef/PathKit.git", exact: "1.0.1"),
.package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", exact: "2.8.0"),
.package(url: "https://github.com/tuist/XcodeProj.git", exact: "8.3.1"),
.package(url: "https://github.com/apple/swift-syntax.git", exact: "0.50600.1"),
.package(url: "https://github.com/kylef/PathKit.git", .exact("1.0.1")),
.package(url: "https://github.com/SwiftGen/StencilSwiftKit.git", .exact("2.8.0")),
.package(url: "https://github.com/tuist/XcodeProj.git", .exact("8.3.1")),
.package(url: "https://github.com/apple/swift-syntax.git", .exact("0.50600.1")),
.package(url: "https://github.com/Quick/Quick.git", from: "3.0.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "9.0.0")
],
Expand Down