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

Jump to bottom

Removes internal files used for swift demangling and replaces with package dependency on swift-demangling #16

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Removes internal files used for swift demangling and replaces with package dependency on swift-demangling #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ea4252
Removes internal files used for swift demangling and replaces with pa…
atreat Apr 10, 2024
69fbf34
Removes more files no longer needed with swift-demangler package depe…
atreat Apr 12, 2024
d2f87c6
Updates Package.swift to use swift-demangler dependency
atreat Apr 12, 2024
415b8c9
Updates name to AppleSwiftDemangling to match swift-demangle package
atreat Apr 12, 2024
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
Prev Previous commit
Next Next commit
Updates Package.swift to use swift-demangler dependency 
Updates swift tools version to 5.7
  • Loading branch information
@atreat
atreat committed May 7, 2024
commit d2f87c6f50e1ce7ac9d0dec1032a5bfc7ddea95f
14 changes: 14 additions & 0 deletions Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"pins" : [
{
"identity" : "swift-demangler",
"kind" : "remoteSourceControl",
"location" : "https://github.com/embrace-io/swift-demangler.git",
"state" : {
"branch" : "main",
"revision" : "602376930d19d1f21ef6501dceede8b1143ab9f9"
}
}
],
"version" : 2
}
23 changes: 9 additions & 14 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.1
// swift-tools-version:5.7

import PackageDescription

Expand All @@ -15,12 +15,15 @@ let package = Package(
"KSCrash/Reporting/Filters",
"KSCrash/Reporting/Filters/Tools",
"KSCrash/Reporting/Tools",
"KSCrash/Reporting/Sinks",
"KSCrash/swift/Basic"
"KSCrash/Reporting/Sinks"
]
)
],
dependencies: [
.package(
url: "https://github.com/embrace-io/swift-demangler.git",
branch: "main"
),
],
targets: [
.target(
Expand Down Expand Up @@ -63,6 +66,9 @@ let package = Package(
),
.target(
name: "KSCrash/Recording/Tools",
dependencies: [
.product(name: "AppleSwiftDemangler", package: "swift-demangler")
],
path: "Source/KSCrash/Recording/Tools",
publicHeadersPath: ".",
cxxSettings: [
Expand Down Expand Up @@ -117,17 +123,6 @@ let package = Package(
.headerSearchPath("../../Recording/Tools"),
.headerSearchPath("../../Recording/Monitors")
]
),
.target(
name: "KSCrash/swift/Basic",
path: "Source/KSCrash/swift/Basic",
publicHeadersPath: ".",
cxxSettings: [
.headerSearchPath(".."),
.headerSearchPath("../../llvm/ADT"),
.headerSearchPath("../../llvm/Config"),
.headerSearchPath("../../llvm/Support")
]
)
],
cxxLanguageStandard: .gnucxx11
Expand Down