Skip to content

Commit c5aa621

Browse files
lukepistrollukepistrol
committed
fix acknowledgements window
- bundle Package.resolved into build - update Package.resolved parsing model
1 parent ff0f796 commit c5aa621

5 files changed

Lines changed: 23 additions & 150 deletions

File tree

‎CodeEdit.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
2813F93827ECC4AA00E305E4 /* FindNavigatorResultList.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7E201B327E9989900CB86D0 /* FindNavigatorResultList.swift */; };
5151
2813F93927ECC4C300E305E4 /* NavigatorSidebarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 287776E627E3413200D46668 /* NavigatorSidebarView.swift */; };
5252
2816F594280CF50500DD548B /* CodeEditSymbols in Frameworks */ = {isa = PBXBuildFile; productRef = 2816F593280CF50500DD548B /* CodeEditSymbols */; };
53+
283BDCBD2972EEBD002AFF81 /* Package.resolved in Resources */ = {isa = PBXBuildFile; fileRef = 283BDCBC2972EEBD002AFF81 /* Package.resolved */; };
5354
2847019E27FDDF7600F87B6B /* OutlineView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2847019D27FDDF7600F87B6B /* OutlineView.swift */; };
5455
285FEC7027FE4B9800E57D53 /* OutlineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 285FEC6F27FE4B9800E57D53 /* OutlineTableViewCell.swift */; };
5556
286471AB27ED51FD0039369D /* ProjectNavigatorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 286471AA27ED51FD0039369D /* ProjectNavigatorView.swift */; };
@@ -414,6 +415,7 @@
414415
20EBB506280C32D300F3A5DA /* QuickHelpInspectorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickHelpInspectorView.swift; sourceTree = "<group>"; };
415416
20EBB50C280C383700F3A5DA /* LanguageType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LanguageType.swift; sourceTree = "<group>"; };
416417
20EBB50E280C389300F3A5DA /* FileInspectorModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileInspectorModel.swift; sourceTree = "<group>"; };
418+
283BDCBC2972EEBD002AFF81 /* Package.resolved */ = {isa = PBXFileReference; lastKnownFileType = text; name = Package.resolved; path = CodeEdit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved; sourceTree = "<group>"; };
417419
2847019D27FDDF7600F87B6B /* OutlineView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineView.swift; sourceTree = "<group>"; };
418420
285FEC6D27FE4B4A00E57D53 /* OutlineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineViewController.swift; sourceTree = "<group>"; };
419421
285FEC6F27FE4B9800E57D53 /* OutlineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutlineTableViewCell.swift; sourceTree = "<group>"; };
@@ -2115,6 +2117,7 @@
21152117
B658FB2327DA9E0F00EA4DBD = {
21162118
isa = PBXGroup;
21172119
children = (
2120+
283BDCBC2972EEBD002AFF81 /* Package.resolved */,
21182121
58F2EACE292FB2B0004A9BDE /* Documentation.docc */,
21192122
B658FB2E27DA9E0F00EA4DBD /* CodeEdit */,
21202123
587B60F329340A8000D5CD8F /* CodeEditTests */,
@@ -2221,7 +2224,6 @@
22212224
isa = PBXNativeTarget;
22222225
buildConfigurationList = B658FB5127DA9E1000EA4DBD /* Build configuration list for PBXNativeTarget "CodeEdit" */;
22232226
buildPhases = (
2224-
FDF7C12027FAE90F0039BA76 /* Copy Package.resolved into Project Directory */,
22252227
B658FB2827DA9E0F00EA4DBD /* Sources */,
22262228
B658FB2927DA9E0F00EA4DBD /* Frameworks */,
22272229
B658FB2A27DA9E0F00EA4DBD /* Resources */,
@@ -2365,6 +2367,7 @@
23652367
isa = PBXResourcesBuildPhase;
23662368
buildActionMask = 2147483647;
23672369
files = (
2370+
283BDCBD2972EEBD002AFF81 /* Package.resolved in Resources */,
23682371
B658FB3727DA9E1000EA4DBD /* Preview Assets.xcassets in Resources */,
23692372
28A51006281701B40087B0CC /* codeedit-github-dark.json in Resources */,
23702373
58A5DFA529339F6400D1BD5D /* default_keybindings.json in Resources */,
@@ -2451,25 +2454,6 @@
24512454
shellPath = /bin/sh;
24522455
shellScript = "TAGS=\"\\/\\/ swiftlint:disable all\"\necho \"searching ${SRCROOT} for ${TAGS}\"\nfind \"${SRCROOT}\" \\( -name \"*.swift\" \\) -print0 | xargs -0 egrep --with-filename --line-number --only-matching \"($TAGS).*\\$\" | perl -p -e \"s/($TAGS)/ error: Usage of \\$1 is prohibited/\"\n";
24532456
};
2454-
FDF7C12027FAE90F0039BA76 /* Copy Package.resolved into Project Directory */ = {
2455-
isa = PBXShellScriptBuildPhase;
2456-
alwaysOutOfDate = 1;
2457-
buildActionMask = 2147483647;
2458-
files = (
2459-
);
2460-
inputFileListPaths = (
2461-
);
2462-
inputPaths = (
2463-
);
2464-
name = "Copy Package.resolved into Project Directory";
2465-
outputFileListPaths = (
2466-
);
2467-
outputPaths = (
2468-
);
2469-
runOnlyForDeploymentPostprocessing = 0;
2470-
shellPath = /bin/sh;
2471-
shellScript = "# The following script copies the generated Package.resolved file into the project directory, ignoring any errors.\ncp ${PROJECT_DIR}/CodeEdit.xcworkspace/xcshareddata/swiftpm/Package.resolved ${PROJECT_DIR} || :\n";
2472-
};
24732457
/* End PBXShellScriptBuildPhase section */
24742458

24752459
/* Begin PBXSourcesBuildPhase section */

‎CodeEdit/Features/Acknowledgements/ViewModels/AcknowledgementsViewModel.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@ final class AcknowledgementsViewModel: ObservableObject {
2323
func fetchDependencies() {
2424
self.acknowledgements.removeAll()
2525
do {
26-
if let bundlePath = Bundle.main.path(forResource: "Package.resolved", ofType: nil) {
26+
if let bundlePath = Bundle.main.path(forResource: "Package", ofType: "resolved") {
2727
let jsonData = try String(contentsOfFile: bundlePath).data(using: .utf8)
28-
let parsedJSON = try JSONDecoder().decode(AcknowledgementRootObject.self, from: jsonData!)
29-
for dependency in parsedJSON.object.pins.sorted(by: { $0.package < $1.package })
30-
where dependency.package.range(
28+
let parsedJSON = try JSONDecoder().decode(AcknowledgementObject.self, from: jsonData!)
29+
for dependency in parsedJSON.pins.sorted(by: { $0.identity < $1.identity })
30+
where dependency.identity.range(
3131
of: "[Cc]ode[Ee]dit",
3232
options: .regularExpression,
3333
range: nil,
3434
locale: nil
3535
) == nil {
3636
self.acknowledgements.append(
3737
AcknowledgementDependency(
38-
name: dependency.package,
39-
repositoryLink: dependency.repositoryURL,
38+
name: dependency.name,
39+
repositoryLink: dependency.location,
4040
version: dependency.state.version ?? ""
4141
)
4242
)

‎CodeEdit/Features/Acknowledgements/Views/AcknowledgementsView.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ struct AcknowledgementsView: View {
3333
}.padding(.horizontal, 15)
3434
}
3535
}
36+
.frame(minWidth: 300, alignment: .leading)
3637
}
3738

3839
func showWindow(width: CGFloat, height: CGFloat) {
@@ -64,6 +65,12 @@ struct AcknowledgementRow: View {
6465
}
6566
}
6667

68+
struct Ackn_Previews: PreviewProvider {
69+
static var previews: some View {
70+
AcknowledgementsView()
71+
}
72+
}
73+
6774
final class AcknowledgementsViewWindowController: NSWindowController {
6875
convenience init<T: View>(view: T, size: NSSize) {
6976
let hostingController = NSHostingController(rootView: view)

‎CodeEdit/Features/Acknowledgements/Views/ParsePackagesResolved.swift‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@ struct AcknowledgementObject: Codable {
2727

2828
// MARK: - Pin
2929
struct AcknowledgementPin: Codable {
30-
let package: String
31-
let repositoryURL: String
30+
let identity: String
31+
let location: String
3232
let state: AcknowledgementPackageState
33+
34+
var name: String {
35+
location.split(separator: "/").last?.replacingOccurrences(of: ".git", with: "") ?? identity
36+
}
3337
}
3438

3539
// MARK: - State

‎Package.resolved‎

Lines changed: 0 additions & 122 deletions
This file was deleted.

0 commit comments

Comments
 (0)