From c63f8d818d139f9ec627fec08b66e565fa8e56f9 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 16 Jan 2025 12:10:55 +0100 Subject: [PATCH 1/3] add path to PrivacyInfo file --- Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package.swift b/Package.swift index 3bed349e..e3ba5c67 100644 --- a/Package.swift +++ b/Package.swift @@ -21,6 +21,9 @@ let package = Package( name: "ComponentsKit", dependencies: [ .product(name: "AutoLayout", package: "AutoLayout") + ], + resources: [ + .process("Resources/PrivacyInfo.xcprivacy") ] ) ] From 857ac28a6ffc2523f9a28f28e5fdfe519591a641 Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 16 Jan 2025 14:11:56 +0100 Subject: [PATCH 2/3] add package to demos app as a reference instead of dependency --- Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj | 10 ++-------- .../xcshareddata/swiftpm/Package.resolved | 12 +----------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj b/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj index 88512111..75718df9 100644 --- a/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj +++ b/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ /* Begin PBXFileReference section */ 740D22272CD3BECA006731A5 /* DemosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemosApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 74DBFD612D393C5B007FE962 /* ComponentsKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = ComponentsKit; path = /Users/mikhail/componentskit/ComponentsKit; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ @@ -33,6 +34,7 @@ 740D221E2CD3BECA006731A5 = { isa = PBXGroup; children = ( + 74DBFD612D393C5B007FE962 /* ComponentsKit */, 740D22292CD3BECA006731A5 /* DemosApp */, 740D22282CD3BECA006731A5 /* Products */, ); @@ -98,7 +100,6 @@ mainGroup = 740D221E2CD3BECA006731A5; minimizedProjectReferenceProxies = 1; packageReferences = ( - 740D22502CD3BF50006731A5 /* XCLocalSwiftPackageReference "../../../ComponentsKit" */, ); productRefGroup = 740D22282CD3BECA006731A5 /* Products */; projectDirPath = ""; @@ -328,13 +329,6 @@ }; /* End XCConfigurationList section */ -/* Begin XCLocalSwiftPackageReference section */ - 740D22502CD3BF50006731A5 /* XCLocalSwiftPackageReference "../../../ComponentsKit" */ = { - isa = XCLocalSwiftPackageReference; - relativePath = ../../../ComponentsKit; - }; -/* End XCLocalSwiftPackageReference section */ - /* Begin XCSwiftPackageProductDependency section */ 740D22512CD3BF50006731A5 /* ComponentsKit */ = { isa = XCSwiftPackageProductDependency; diff --git a/Examples/DemosApp/DemosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Examples/DemosApp/DemosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 969105a5..0770c436 100644 --- a/Examples/DemosApp/DemosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Examples/DemosApp/DemosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,4 @@ { - "originHash" : "5750ee9f6b665533d5c59ce2e9fc4c78e08b258f84db6ca2921bdd1bd026f8f8", "pins" : [ { "identity" : "autolayout", @@ -9,16 +8,7 @@ "revision" : "78e39facca2cc459a135655cae0e9feb5a587892", "version" : "1.0.0" } - }, - { - "identity" : "swiftlintplugins", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SimplyDanny/SwiftLintPlugins", - "state" : { - "revision" : "7c80ce6f142164b0201871e580b021d1b2c69804", - "version" : "0.57.0" - } } ], - "version" : 3 + "version" : 2 } From 76cbc933da20b921121060c6405f2439acfb262b Mon Sep 17 00:00:00 2001 From: Mikhail Date: Thu, 16 Jan 2025 14:18:24 +0100 Subject: [PATCH 3/3] make path to the package relative instead of absolute in the demo app --- Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj | 2 +- Package.resolved | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj b/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj index 75718df9..23945356 100644 --- a/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj +++ b/Examples/DemosApp/DemosApp.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ /* Begin PBXFileReference section */ 740D22272CD3BECA006731A5 /* DemosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemosApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 74DBFD612D393C5B007FE962 /* ComponentsKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = ComponentsKit; path = /Users/mikhail/componentskit/ComponentsKit; sourceTree = ""; }; + 74DBFD612D393C5B007FE962 /* ComponentsKit */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = ComponentsKit; path = ../..; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ diff --git a/Package.resolved b/Package.resolved index 33f42961..0770c436 100644 --- a/Package.resolved +++ b/Package.resolved @@ -8,15 +8,6 @@ "revision" : "78e39facca2cc459a135655cae0e9feb5a587892", "version" : "1.0.0" } - }, - { - "identity" : "swiftlintplugins", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SimplyDanny/SwiftLintPlugins", - "state" : { - "revision" : "7c80ce6f142164b0201871e580b021d1b2c69804", - "version" : "0.57.0" - } } ], "version" : 2