Skip to content

Enable a more portable binary on macOS - Approach 2 #480

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

Merged
merged 9 commits into from
Apr 16, 2022
Merged

Enable a more portable binary on macOS - Approach 2 #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3bd896
Update Package.swift to always use SwiftSyntax 5.6 and to use StaticI…
liamnichols Mar 29, 2022
adf5d6a
Remove compiler version checks from imports to SwiftSyntaxParser
liamnichols Apr 5, 2022
d227d8b
Extract lib_intenralSwiftSyntaxParser dependency into seperate packag…
liamnichols Apr 5, 2022
4fe1f94
Bump swift-tools-version to 5.3 to support binaryTargets
liamnichols Apr 6, 2022
3dfcaea
Run 'swift package update StaticSwiftSyntaxParser'
liamnichols Apr 6, 2022
9090809
Add back missing support for Swift 5.3 and 5.4. Only use StaticSwiftS…
liamnichols Apr 7, 2022
e52705c
Use SwiftSyntax 0.50500.0 on Linux when compiling with Swift 5.5 tool…
liamnichols Apr 8, 2022
90f7b00
Use SwiftSyntax fork instead of StaticSwiftSyntaxParser
liamnichols Apr 8, 2022
0707223
Use peripheryapp fork for swift-syntax
liamnichols Apr 15, 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
6 changes: 3 additions & 3 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 17 additions & 44 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,26 @@
// swift-tools-version:5.2
// swift-tools-version:5.3
import PackageDescription

#if compiler(>=5.6)
let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50600.1-static")
#elseif compiler(>=5.5)
let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50500.0-static")
#elseif compiler(>=5.4)
let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50400.0")
#elseif compiler(>=5.3)
let swiftSyntaxVersion: Package.Dependency.Requirement = .exact("0.50300.0")
#else
fatalError("This version of Periphery does not support Swift <= 5.2.")
#endif

var dependencies: [Package.Dependency] = [
.package(url: "https://github.com/apple/swift-system", from: "1.0.0"),
.package(url: "https://github.com/jpsim/Yams", from: "4.0.0"),
.package(url: "https://github.com/tadija/AEXML", from: "4.0.0"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
.package(name: "SwiftIndexStore", url: "https://github.com/kateinoigakukun/swift-indexstore", from: "0.0.0")
.package(name: "SwiftIndexStore", url: "https://github.com/kateinoigakukun/swift-indexstore", from: "0.0.0"),
.package(name: "SwiftSyntax", url: "https://github.com/peripheryapp/swift-syntax", swiftSyntaxVersion)
]
#if swift(>=5.6)
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.exact("0.50600.1")
)
)
#elseif swift(>=5.5)
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.exact("0.50500.0")
)
)
#elseif swift(>=5.4)
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.exact("0.50400.0")
)
)
#elseif swift(>=5.3)
dependencies.append(
.package(
name: "SwiftSyntax",
url: "https://github.com/apple/swift-syntax",
.exact("0.50300.0")
)
)
#else
fatalError("This version of Periphery does not support Swift <= 5.2.")
#endif

#if os(macOS)
dependencies.append(
Expand Down Expand Up @@ -72,13 +50,8 @@ var peripheryKitDependencies: [PackageDescription.Target.Dependency] = [
.product(name: "SwiftIndexStore", package: "SwiftIndexStore")
]

#if swift(>=5.6)
peripheryKitDependencies.append(
.product(
name: "SwiftSyntaxParser",
package: "SwiftSyntax"
)
)
#if compiler(>=5.6)
peripheryKitDependencies.append(.product(name: "SwiftSyntaxParser", package: "SwiftSyntax"))
#endif

var targets: [PackageDescription.Target] = [
Expand Down
2 changes: 1 addition & 1 deletion Sources/PeripheryKit/Syntax/MultiplexingSyntaxVisitor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import SystemPackage
import SwiftSyntax
#if swift(>=5.6)
#if canImport(SwiftSyntaxParser)
import SwiftSyntaxParser
#endif

Expand Down
2 changes: 1 addition & 1 deletion Sources/PeripheryKit/Syntax/UnusedParameterParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import SystemPackage
import SwiftSyntax
#if swift(>=5.6)
#if canImport(SwiftSyntaxParser)
import SwiftSyntaxParser
#endif

Expand Down
2 changes: 1 addition & 1 deletion Tests/PeripheryTests/Syntax/TypeSyntaxInspectorTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation
import XCTest
import SwiftSyntax
#if swift(>=5.6)
#if canImport(SwiftSyntaxParser)
import SwiftSyntaxParser
#endif
@testable import TestShared
Expand Down