Skip to content
This repository has been archived by the owner on Jun 29, 2024. It is now read-only.

Commit

Permalink
fix: Update about screen and Diligence license (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbmorley
jbmorley authored Feb 20, 2024
1 parent 1402f95 commit e538a97
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion diligence
Submodule diligence updated 67 files
+36 −0 .github/workflows/build.yaml
+2 −0 .gitignore
+3 −0 .gitmodules
+7 −0 .spi.yaml
+1 −1 LICENSE
+2 −1 Package.swift
+80 −7 README.md
+1 −1 Sources/Diligence/Builders/AcknowledgementsBuilder.swift
+1 −1 Sources/Diligence/Builders/ActionsBuilder.swift
+1 −1 Sources/Diligence/Builders/CreditsBuilder.swift
+50 −0 Sources/Diligence/Builders/LicenseGroupsBuilder.swift
+9 −1 Sources/Diligence/Builders/LicensesBuilder.swift
+1 −1 Sources/Diligence/Commands/AboutCommands.swift
+44 −0 Sources/Diligence/Environment/PrefersTextualRepresentationEnvironmentKey.swift
+31 −0 Sources/Diligence/Extensions/Array.swift
+5 −1 Sources/Diligence/Extensions/Bundle.swift
+1 −1 Sources/Diligence/Extensions/Color.swift
+48 −0 Sources/Diligence/Extensions/NSWindow.swift
+1 −1 Sources/Diligence/Extensions/String.swift
+36 −0 Sources/Diligence/Extensions/UIView.swift
+1 −1 Sources/Diligence/Extensions/URL.swift
+1 −1 Sources/Diligence/Model/Acknowledgements.swift
+1 −1 Sources/Diligence/Model/Action.swift
+55 −0 Sources/Diligence/Model/Contents.swift
+1 −1 Sources/Diligence/Model/Credit.swift
+27 −0 Sources/Diligence/Model/Legal.swift
+41 −8 Sources/Diligence/Model/License.swift
+43 −0 Sources/Diligence/Model/LicenseGroup.swift
+35 −0 Sources/Diligence/Model/NamedURL.swift
+9 −0 Sources/Diligence/Resources/LICENSE
+26 −6 Sources/Diligence/Scenes/AboutWindowGroup.swift
+6 −12 Sources/Diligence/Scenes/MacAboutWindow.swift
+2 −3 Sources/Diligence/Scenes/MacLicenseWindowGroup.swift
+52 −0 Sources/Diligence/View Modifiers/HookView.swift
+3 −3 Sources/Diligence/View Modifiers/HorizontalSpace.swift
+1 −1 Sources/Diligence/View Modifiers/Hyperlink.swift
+80 −0 Sources/Diligence/View Modifiers/IsVisibleInScrollView.swift
+1 −1 Sources/Diligence/View Modifiers/PaddingWithMultiplier.swift
+54 −0 Sources/Diligence/Views/AboutLink.swift
+32 −0 Sources/Diligence/Views/AboutView.swift
+1 −1 Sources/Diligence/Views/ActionSection.swift
+1 −1 Sources/Diligence/Views/ApplicationNameTitle.swift
+33 −11 Sources/Diligence/Views/BuildSection.swift
+1 −1 Sources/Diligence/Views/CreditSection.swift
+34 −0 Sources/Diligence/Views/DefaultAboutLinkLabel.swift
+1 −1 Sources/Diligence/Views/HeaderSection.swift
+1 −1 Sources/Diligence/Views/Icon.swift
+1 −1 Sources/Diligence/Views/LabeledContent.swift
+1 −1 Sources/Diligence/Views/LicenseRow.swift
+3 −4 Sources/Diligence/Views/LicenseSection.swift
+5 −1 Sources/Diligence/Views/LicenseView.swift
+13 −2 Sources/Diligence/Views/Link.swift
+1 −1 Sources/Diligence/Views/MacAboutSection.swift
+76 −10 Sources/Diligence/Views/MacAboutView.swift
+1 −1 Sources/Diligence/Views/MacIcon.swift
+7 −1 Sources/Diligence/Views/MacLicenseView.swift
+132 −0 Sources/Diligence/Views/PhoneAboutView.swift
+41 −0 Sources/Diligence/Windows/NSLicenseWindow.swift
+81 −5 Tests/DiligenceTests/DiligenceTests.swift
+84 −0 Tests/DiligenceTests/Equivalence.swift
+ − images/Fileaway-macOS.png
+30 −0 scripts/build-number.swift
+20 −0 scripts/build.sh
+1 −0 scripts/changes
+31 −0 scripts/environment.sh
+38 −0 scripts/install-dependencies.sh
+31 −0 scripts/release.sh
6 changes: 0 additions & 6 deletions macos/Multifolder.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@
D8ABEAD4263C42CD00B9D2B9 /* MultifolderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8ABEAD3263C42CD00B9D2B9 /* MultifolderTests.swift */; };
D8ABEADF263C42CD00B9D2B9 /* MultifolderUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8ABEADE263C42CD00B9D2B9 /* MultifolderUITests.swift */; };
D8E14AA328B4EEBD00C7C982 /* Diligence in Frameworks */ = {isa = PBXBuildFile; productRef = D8E14AA228B4EEBD00C7C982 /* Diligence */; };
D8E14AA628B4EF4F00C7C982 /* diligence-license in Sources */ = {isa = PBXBuildFile; fileRef = D8E14AA528B4EF4F00C7C982 /* diligence-license */; };
D8E14AA828B4EFA400C7C982 /* interact-license in Resources */ = {isa = PBXBuildFile; fileRef = D8E14AA728B4EFA400C7C982 /* interact-license */; };
D8E14AA928B4F01600C7C982 /* diligence-license in Resources */ = {isa = PBXBuildFile; fileRef = D8E14AA528B4EF4F00C7C982 /* diligence-license */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -64,7 +62,6 @@
D8ABEADE263C42CD00B9D2B9 /* MultifolderUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultifolderUITests.swift; sourceTree = "<group>"; };
D8ABEAE0263C42CD00B9D2B9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
D8E14AA128B4EEAF00C7C982 /* diligence */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = diligence; path = ../diligence; sourceTree = "<group>"; };
D8E14AA528B4EF4F00C7C982 /* diligence-license */ = {isa = PBXFileReference; lastKnownFileType = text; path = "diligence-license"; sourceTree = "<group>"; };
D8E14AA728B4EFA400C7C982 /* interact-license */ = {isa = PBXFileReference; lastKnownFileType = text; path = "interact-license"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -199,7 +196,6 @@
D8E14AA428B4EEFB00C7C982 /* Licenses */ = {
isa = PBXGroup;
children = (
D8E14AA528B4EF4F00C7C982 /* diligence-license */,
D8E14AA728B4EFA400C7C982 /* interact-license */,
);
path = Licenses;
Expand Down Expand Up @@ -313,7 +309,6 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
D8E14AA928B4F01600C7C982 /* diligence-license in Resources */,
D8ABEAC8263C42CD00B9D2B9 /* Preview Assets.xcassets in Resources */,
D8ABEAC5263C42CD00B9D2B9 /* Assets.xcassets in Resources */,
D8E14AA828B4EFA400C7C982 /* interact-license in Resources */,
Expand Down Expand Up @@ -342,7 +337,6 @@
buildActionMask = 2147483647;
files = (
D89501FE264A30D700A99E64 /* SmartFolder.swift in Sources */,
D8E14AA628B4EF4F00C7C982 /* diligence-license in Sources */,
D8950200264A38B500A99E64 /* Finder.swift in Sources */,
D89501FC264A290100A99E64 /* SmartFolderView.swift in Sources */,
D89501FA264A013600A99E64 /* FileDropDelegate.swift in Sources */,
Expand Down
9 changes: 0 additions & 9 deletions macos/Multifolder/Licenses/diligence-license
View file

This file was deleted.

1 change: 0 additions & 1 deletion macos/Multifolder/MultifolderApp.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ struct MultifolderApp: App {
Credit("Jason Morley", url: URL(string: "https://jbmorley.co.uk"))
}
} licenses: {
License("Diligence", author: "InSeven Limited", filename: "diligence-license")
License("Interact", author: "InSeven Limited", filename: "interact-license")
}
}
Expand Down

0 comments on commit e538a97

Please sign in to comment.