From a5994c512a1d608b7dbc1b74970bf240eddd2e57 Mon Sep 17 00:00:00 2001 From: Adrian Sergheev Date: Tue, 15 Feb 2022 09:44:17 +0100 Subject: [PATCH 1/2] swiftpm-support --- .gitignore | 1 + LUKeychainAccess.xcodeproj/project.pbxproj | 10 +++++++- Package.swift | 23 +++++++++++++++++++ .../LUKeychainAccess}/Info.plist | 0 .../LUKeychainAccess-Prefix.pch | 0 .../LUKeychainAccess}/LUKeychainAccess.h | 0 .../LUKeychainAccess}/LUKeychainAccess.m | 0 .../LUKeychainAccessAccessibility.h | 0 .../LUKeychainErrorHandler.h | 0 .../LUKeychainAccess}/LUKeychainServices.h | 0 .../LUKeychainAccess}/LUKeychainServices.m | 0 .../NSKeyedArchiver+Additions.h | 0 .../NSKeyedArchiver+Additions.m | 0 .../NSKeyedUnarchiver+Additions.h | 0 .../NSKeyedUnarchiver+Additions.m | 0 15 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Package.swift rename {LUKeychainAccess => Sources/LUKeychainAccess}/Info.plist (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainAccess-Prefix.pch (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainAccess.h (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainAccess.m (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainAccessAccessibility.h (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainErrorHandler.h (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainServices.h (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/LUKeychainServices.m (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/NSKeyedArchiver+Additions.h (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/NSKeyedArchiver+Additions.m (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/NSKeyedUnarchiver+Additions.h (100%) rename {LUKeychainAccess => Sources/LUKeychainAccess}/NSKeyedUnarchiver+Additions.m (100%) diff --git a/.gitignore b/.gitignore index 9596605..8ddaa39 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # Xcode .DS_Store build/ +.build/ *.pbxuser !default.pbxuser *.mode1v3 diff --git a/LUKeychainAccess.xcodeproj/project.pbxproj b/LUKeychainAccess.xcodeproj/project.pbxproj index 69e56f5..ada9030 100644 --- a/LUKeychainAccess.xcodeproj/project.pbxproj +++ b/LUKeychainAccess.xcodeproj/project.pbxproj @@ -125,8 +125,8 @@ 0226873916BAD892008FC8FA = { isa = PBXGroup; children = ( + 2AFD0B4A27BB9CE2003EB0BF /* Sources */, F6B0FEE222A89D8F00115793 /* UnitTests */, - 0226874716BAD892008FC8FA /* LUKeychainAccess */, 6AC1AB0A1E0766DD00E699C9 /* Testing App */, 0226874416BAD892008FC8FA /* Frameworks */, 0226874316BAD892008FC8FA /* Products */, @@ -194,6 +194,14 @@ name = Pods; sourceTree = ""; }; + 2AFD0B4A27BB9CE2003EB0BF /* Sources */ = { + isa = PBXGroup; + children = ( + 0226874716BAD892008FC8FA /* LUKeychainAccess */, + ); + path = Sources; + sourceTree = ""; + }; 6AC1AB0A1E0766DD00E699C9 /* Testing App */ = { isa = PBXGroup; children = ( diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..dac935f --- /dev/null +++ b/Package.swift @@ -0,0 +1,23 @@ +// swift-tools-version:5.5 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "LUKeychainAccess", + platforms: [ + .iOS(.v13) + ], + products: [ + .library( + name: "LUKeychainAccess", + targets: ["LUKeychainAccess"]), + ], + dependencies: [ + ], + targets: [ + .target( + name: "LUKeychainAccess", + dependencies: []) + ] +) diff --git a/LUKeychainAccess/Info.plist b/Sources/LUKeychainAccess/Info.plist similarity index 100% rename from LUKeychainAccess/Info.plist rename to Sources/LUKeychainAccess/Info.plist diff --git a/LUKeychainAccess/LUKeychainAccess-Prefix.pch b/Sources/LUKeychainAccess/LUKeychainAccess-Prefix.pch similarity index 100% rename from LUKeychainAccess/LUKeychainAccess-Prefix.pch rename to Sources/LUKeychainAccess/LUKeychainAccess-Prefix.pch diff --git a/LUKeychainAccess/LUKeychainAccess.h b/Sources/LUKeychainAccess/LUKeychainAccess.h similarity index 100% rename from LUKeychainAccess/LUKeychainAccess.h rename to Sources/LUKeychainAccess/LUKeychainAccess.h diff --git a/LUKeychainAccess/LUKeychainAccess.m b/Sources/LUKeychainAccess/LUKeychainAccess.m similarity index 100% rename from LUKeychainAccess/LUKeychainAccess.m rename to Sources/LUKeychainAccess/LUKeychainAccess.m diff --git a/LUKeychainAccess/LUKeychainAccessAccessibility.h b/Sources/LUKeychainAccess/LUKeychainAccessAccessibility.h similarity index 100% rename from LUKeychainAccess/LUKeychainAccessAccessibility.h rename to Sources/LUKeychainAccess/LUKeychainAccessAccessibility.h diff --git a/LUKeychainAccess/LUKeychainErrorHandler.h b/Sources/LUKeychainAccess/LUKeychainErrorHandler.h similarity index 100% rename from LUKeychainAccess/LUKeychainErrorHandler.h rename to Sources/LUKeychainAccess/LUKeychainErrorHandler.h diff --git a/LUKeychainAccess/LUKeychainServices.h b/Sources/LUKeychainAccess/LUKeychainServices.h similarity index 100% rename from LUKeychainAccess/LUKeychainServices.h rename to Sources/LUKeychainAccess/LUKeychainServices.h diff --git a/LUKeychainAccess/LUKeychainServices.m b/Sources/LUKeychainAccess/LUKeychainServices.m similarity index 100% rename from LUKeychainAccess/LUKeychainServices.m rename to Sources/LUKeychainAccess/LUKeychainServices.m diff --git a/LUKeychainAccess/NSKeyedArchiver+Additions.h b/Sources/LUKeychainAccess/NSKeyedArchiver+Additions.h similarity index 100% rename from LUKeychainAccess/NSKeyedArchiver+Additions.h rename to Sources/LUKeychainAccess/NSKeyedArchiver+Additions.h diff --git a/LUKeychainAccess/NSKeyedArchiver+Additions.m b/Sources/LUKeychainAccess/NSKeyedArchiver+Additions.m similarity index 100% rename from LUKeychainAccess/NSKeyedArchiver+Additions.m rename to Sources/LUKeychainAccess/NSKeyedArchiver+Additions.m diff --git a/LUKeychainAccess/NSKeyedUnarchiver+Additions.h b/Sources/LUKeychainAccess/NSKeyedUnarchiver+Additions.h similarity index 100% rename from LUKeychainAccess/NSKeyedUnarchiver+Additions.h rename to Sources/LUKeychainAccess/NSKeyedUnarchiver+Additions.h diff --git a/LUKeychainAccess/NSKeyedUnarchiver+Additions.m b/Sources/LUKeychainAccess/NSKeyedUnarchiver+Additions.m similarity index 100% rename from LUKeychainAccess/NSKeyedUnarchiver+Additions.m rename to Sources/LUKeychainAccess/NSKeyedUnarchiver+Additions.m From 5d5e474402b29c248581366b6c37445bfb9f0d01 Mon Sep 17 00:00:00 2001 From: Adrian Sergheev Date: Tue, 15 Feb 2022 09:53:03 +0100 Subject: [PATCH 2/2] wip --- Package.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index dac935f..768502a 100644 --- a/Package.swift +++ b/Package.swift @@ -6,7 +6,7 @@ import PackageDescription let package = Package( name: "LUKeychainAccess", platforms: [ - .iOS(.v13) + .iOS(.v13) ], products: [ .library( @@ -18,6 +18,8 @@ let package = Package( targets: [ .target( name: "LUKeychainAccess", - dependencies: []) + dependencies: [], + exclude: ["LUKeychainAccess-Prefix.pch", "Info.plist"] + ) ] )