From b126091d80e0f1ba54cc300ed7c4f466ababbbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 18 Jul 2024 12:18:04 +0200 Subject: [PATCH 1/5] new package name SQLiteSwift to avoid name collisions with Apple frameworks --- Package.swift | 8 ++++---- Sources/{SQLite => SQLiteSwift}/Core/Backup.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/Blob.swift | 0 .../Core/Connection+Aggregation.swift | 0 .../{SQLite => SQLiteSwift}/Core/Connection+Attach.swift | 0 .../{SQLite => SQLiteSwift}/Core/Connection+Pragmas.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/Connection.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/Errors.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/Result.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/SQLiteFeature.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/SQLiteVersion.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/Statement.swift | 0 .../{SQLite => SQLiteSwift}/Core/URIQueryParameter.swift | 0 Sources/{SQLite => SQLiteSwift}/Core/Value.swift | 0 Sources/{SQLite => SQLiteSwift}/Extensions/Cipher.swift | 0 Sources/{SQLite => SQLiteSwift}/Extensions/FTS4.swift | 0 Sources/{SQLite => SQLiteSwift}/Extensions/FTS5.swift | 0 Sources/{SQLite => SQLiteSwift}/Extensions/RTree.swift | 0 Sources/{SQLite => SQLiteSwift}/Foundation.swift | 0 Sources/{SQLite => SQLiteSwift}/Helpers.swift | 0 Sources/{SQLite => SQLiteSwift}/Info.plist | 0 Sources/{SQLite => SQLiteSwift}/PrivacyInfo.xcprivacy | 0 Sources/{SQLite => SQLiteSwift}/SQLite.h | 0 .../Schema/Connection+Schema.swift | 0 .../{SQLite => SQLiteSwift}/Schema/SchemaChanger.swift | 0 .../Schema/SchemaDefinitions.swift | 0 Sources/{SQLite => SQLiteSwift}/Schema/SchemaReader.swift | 0 .../Typed/AggregateFunctions.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Coding.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Collation.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/CoreFunctions.swift | 0 .../{SQLite => SQLiteSwift}/Typed/CustomFunctions.swift | 0 .../Typed/DateAndTimeFunctions.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Expression.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Operators.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Query+with.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Query.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Schema.swift | 0 Sources/{SQLite => SQLiteSwift}/Typed/Setter.swift | 0 .../{SQLite => SQLiteSwift}/Typed/WindowFunctions.swift | 0 40 files changed, 4 insertions(+), 4 deletions(-) rename Sources/{SQLite => SQLiteSwift}/Core/Backup.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Blob.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Connection+Aggregation.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Connection+Attach.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Connection+Pragmas.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Connection.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Errors.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Result.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/SQLiteFeature.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/SQLiteVersion.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Statement.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/URIQueryParameter.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Core/Value.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Extensions/Cipher.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Extensions/FTS4.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Extensions/FTS5.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Extensions/RTree.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Foundation.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Helpers.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Info.plist (100%) rename Sources/{SQLite => SQLiteSwift}/PrivacyInfo.xcprivacy (100%) rename Sources/{SQLite => SQLiteSwift}/SQLite.h (100%) rename Sources/{SQLite => SQLiteSwift}/Schema/Connection+Schema.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Schema/SchemaChanger.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Schema/SchemaDefinitions.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Schema/SchemaReader.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/AggregateFunctions.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Coding.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Collation.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/CoreFunctions.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/CustomFunctions.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/DateAndTimeFunctions.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Expression.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Operators.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Query+with.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Query.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Schema.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/Setter.swift (100%) rename Sources/{SQLite => SQLiteSwift}/Typed/WindowFunctions.swift (100%) diff --git a/Package.swift b/Package.swift index 238661ae..ddc5c0f0 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription let package = Package( - name: "SQLite.swift", + name: "SQLiteSwift.swift", platforms: [ .iOS(.v11), .macOS(.v10_13), @@ -12,13 +12,13 @@ let package = Package( ], products: [ .library( - name: "SQLite", + name: "SQLiteSwift", targets: ["SQLite"] ) ], targets: [ .target( - name: "SQLite", + name: "SQLiteSwift", exclude: [ "Info.plist" ] @@ -26,7 +26,7 @@ let package = Package( .testTarget( name: "SQLiteTests", dependencies: [ - "SQLite" + "SQLiteSwift" ], path: "Tests/SQLiteTests", exclude: [ diff --git a/Sources/SQLite/Core/Backup.swift b/Sources/SQLiteSwift/Core/Backup.swift similarity index 100% rename from Sources/SQLite/Core/Backup.swift rename to Sources/SQLiteSwift/Core/Backup.swift diff --git a/Sources/SQLite/Core/Blob.swift b/Sources/SQLiteSwift/Core/Blob.swift similarity index 100% rename from Sources/SQLite/Core/Blob.swift rename to Sources/SQLiteSwift/Core/Blob.swift diff --git a/Sources/SQLite/Core/Connection+Aggregation.swift b/Sources/SQLiteSwift/Core/Connection+Aggregation.swift similarity index 100% rename from Sources/SQLite/Core/Connection+Aggregation.swift rename to Sources/SQLiteSwift/Core/Connection+Aggregation.swift diff --git a/Sources/SQLite/Core/Connection+Attach.swift b/Sources/SQLiteSwift/Core/Connection+Attach.swift similarity index 100% rename from Sources/SQLite/Core/Connection+Attach.swift rename to Sources/SQLiteSwift/Core/Connection+Attach.swift diff --git a/Sources/SQLite/Core/Connection+Pragmas.swift b/Sources/SQLiteSwift/Core/Connection+Pragmas.swift similarity index 100% rename from Sources/SQLite/Core/Connection+Pragmas.swift rename to Sources/SQLiteSwift/Core/Connection+Pragmas.swift diff --git a/Sources/SQLite/Core/Connection.swift b/Sources/SQLiteSwift/Core/Connection.swift similarity index 100% rename from Sources/SQLite/Core/Connection.swift rename to Sources/SQLiteSwift/Core/Connection.swift diff --git a/Sources/SQLite/Core/Errors.swift b/Sources/SQLiteSwift/Core/Errors.swift similarity index 100% rename from Sources/SQLite/Core/Errors.swift rename to Sources/SQLiteSwift/Core/Errors.swift diff --git a/Sources/SQLite/Core/Result.swift b/Sources/SQLiteSwift/Core/Result.swift similarity index 100% rename from Sources/SQLite/Core/Result.swift rename to Sources/SQLiteSwift/Core/Result.swift diff --git a/Sources/SQLite/Core/SQLiteFeature.swift b/Sources/SQLiteSwift/Core/SQLiteFeature.swift similarity index 100% rename from Sources/SQLite/Core/SQLiteFeature.swift rename to Sources/SQLiteSwift/Core/SQLiteFeature.swift diff --git a/Sources/SQLite/Core/SQLiteVersion.swift b/Sources/SQLiteSwift/Core/SQLiteVersion.swift similarity index 100% rename from Sources/SQLite/Core/SQLiteVersion.swift rename to Sources/SQLiteSwift/Core/SQLiteVersion.swift diff --git a/Sources/SQLite/Core/Statement.swift b/Sources/SQLiteSwift/Core/Statement.swift similarity index 100% rename from Sources/SQLite/Core/Statement.swift rename to Sources/SQLiteSwift/Core/Statement.swift diff --git a/Sources/SQLite/Core/URIQueryParameter.swift b/Sources/SQLiteSwift/Core/URIQueryParameter.swift similarity index 100% rename from Sources/SQLite/Core/URIQueryParameter.swift rename to Sources/SQLiteSwift/Core/URIQueryParameter.swift diff --git a/Sources/SQLite/Core/Value.swift b/Sources/SQLiteSwift/Core/Value.swift similarity index 100% rename from Sources/SQLite/Core/Value.swift rename to Sources/SQLiteSwift/Core/Value.swift diff --git a/Sources/SQLite/Extensions/Cipher.swift b/Sources/SQLiteSwift/Extensions/Cipher.swift similarity index 100% rename from Sources/SQLite/Extensions/Cipher.swift rename to Sources/SQLiteSwift/Extensions/Cipher.swift diff --git a/Sources/SQLite/Extensions/FTS4.swift b/Sources/SQLiteSwift/Extensions/FTS4.swift similarity index 100% rename from Sources/SQLite/Extensions/FTS4.swift rename to Sources/SQLiteSwift/Extensions/FTS4.swift diff --git a/Sources/SQLite/Extensions/FTS5.swift b/Sources/SQLiteSwift/Extensions/FTS5.swift similarity index 100% rename from Sources/SQLite/Extensions/FTS5.swift rename to Sources/SQLiteSwift/Extensions/FTS5.swift diff --git a/Sources/SQLite/Extensions/RTree.swift b/Sources/SQLiteSwift/Extensions/RTree.swift similarity index 100% rename from Sources/SQLite/Extensions/RTree.swift rename to Sources/SQLiteSwift/Extensions/RTree.swift diff --git a/Sources/SQLite/Foundation.swift b/Sources/SQLiteSwift/Foundation.swift similarity index 100% rename from Sources/SQLite/Foundation.swift rename to Sources/SQLiteSwift/Foundation.swift diff --git a/Sources/SQLite/Helpers.swift b/Sources/SQLiteSwift/Helpers.swift similarity index 100% rename from Sources/SQLite/Helpers.swift rename to Sources/SQLiteSwift/Helpers.swift diff --git a/Sources/SQLite/Info.plist b/Sources/SQLiteSwift/Info.plist similarity index 100% rename from Sources/SQLite/Info.plist rename to Sources/SQLiteSwift/Info.plist diff --git a/Sources/SQLite/PrivacyInfo.xcprivacy b/Sources/SQLiteSwift/PrivacyInfo.xcprivacy similarity index 100% rename from Sources/SQLite/PrivacyInfo.xcprivacy rename to Sources/SQLiteSwift/PrivacyInfo.xcprivacy diff --git a/Sources/SQLite/SQLite.h b/Sources/SQLiteSwift/SQLite.h similarity index 100% rename from Sources/SQLite/SQLite.h rename to Sources/SQLiteSwift/SQLite.h diff --git a/Sources/SQLite/Schema/Connection+Schema.swift b/Sources/SQLiteSwift/Schema/Connection+Schema.swift similarity index 100% rename from Sources/SQLite/Schema/Connection+Schema.swift rename to Sources/SQLiteSwift/Schema/Connection+Schema.swift diff --git a/Sources/SQLite/Schema/SchemaChanger.swift b/Sources/SQLiteSwift/Schema/SchemaChanger.swift similarity index 100% rename from Sources/SQLite/Schema/SchemaChanger.swift rename to Sources/SQLiteSwift/Schema/SchemaChanger.swift diff --git a/Sources/SQLite/Schema/SchemaDefinitions.swift b/Sources/SQLiteSwift/Schema/SchemaDefinitions.swift similarity index 100% rename from Sources/SQLite/Schema/SchemaDefinitions.swift rename to Sources/SQLiteSwift/Schema/SchemaDefinitions.swift diff --git a/Sources/SQLite/Schema/SchemaReader.swift b/Sources/SQLiteSwift/Schema/SchemaReader.swift similarity index 100% rename from Sources/SQLite/Schema/SchemaReader.swift rename to Sources/SQLiteSwift/Schema/SchemaReader.swift diff --git a/Sources/SQLite/Typed/AggregateFunctions.swift b/Sources/SQLiteSwift/Typed/AggregateFunctions.swift similarity index 100% rename from Sources/SQLite/Typed/AggregateFunctions.swift rename to Sources/SQLiteSwift/Typed/AggregateFunctions.swift diff --git a/Sources/SQLite/Typed/Coding.swift b/Sources/SQLiteSwift/Typed/Coding.swift similarity index 100% rename from Sources/SQLite/Typed/Coding.swift rename to Sources/SQLiteSwift/Typed/Coding.swift diff --git a/Sources/SQLite/Typed/Collation.swift b/Sources/SQLiteSwift/Typed/Collation.swift similarity index 100% rename from Sources/SQLite/Typed/Collation.swift rename to Sources/SQLiteSwift/Typed/Collation.swift diff --git a/Sources/SQLite/Typed/CoreFunctions.swift b/Sources/SQLiteSwift/Typed/CoreFunctions.swift similarity index 100% rename from Sources/SQLite/Typed/CoreFunctions.swift rename to Sources/SQLiteSwift/Typed/CoreFunctions.swift diff --git a/Sources/SQLite/Typed/CustomFunctions.swift b/Sources/SQLiteSwift/Typed/CustomFunctions.swift similarity index 100% rename from Sources/SQLite/Typed/CustomFunctions.swift rename to Sources/SQLiteSwift/Typed/CustomFunctions.swift diff --git a/Sources/SQLite/Typed/DateAndTimeFunctions.swift b/Sources/SQLiteSwift/Typed/DateAndTimeFunctions.swift similarity index 100% rename from Sources/SQLite/Typed/DateAndTimeFunctions.swift rename to Sources/SQLiteSwift/Typed/DateAndTimeFunctions.swift diff --git a/Sources/SQLite/Typed/Expression.swift b/Sources/SQLiteSwift/Typed/Expression.swift similarity index 100% rename from Sources/SQLite/Typed/Expression.swift rename to Sources/SQLiteSwift/Typed/Expression.swift diff --git a/Sources/SQLite/Typed/Operators.swift b/Sources/SQLiteSwift/Typed/Operators.swift similarity index 100% rename from Sources/SQLite/Typed/Operators.swift rename to Sources/SQLiteSwift/Typed/Operators.swift diff --git a/Sources/SQLite/Typed/Query+with.swift b/Sources/SQLiteSwift/Typed/Query+with.swift similarity index 100% rename from Sources/SQLite/Typed/Query+with.swift rename to Sources/SQLiteSwift/Typed/Query+with.swift diff --git a/Sources/SQLite/Typed/Query.swift b/Sources/SQLiteSwift/Typed/Query.swift similarity index 100% rename from Sources/SQLite/Typed/Query.swift rename to Sources/SQLiteSwift/Typed/Query.swift diff --git a/Sources/SQLite/Typed/Schema.swift b/Sources/SQLiteSwift/Typed/Schema.swift similarity index 100% rename from Sources/SQLite/Typed/Schema.swift rename to Sources/SQLiteSwift/Typed/Schema.swift diff --git a/Sources/SQLite/Typed/Setter.swift b/Sources/SQLiteSwift/Typed/Setter.swift similarity index 100% rename from Sources/SQLite/Typed/Setter.swift rename to Sources/SQLiteSwift/Typed/Setter.swift diff --git a/Sources/SQLite/Typed/WindowFunctions.swift b/Sources/SQLiteSwift/Typed/WindowFunctions.swift similarity index 100% rename from Sources/SQLite/Typed/WindowFunctions.swift rename to Sources/SQLiteSwift/Typed/WindowFunctions.swift From f358ab901fb2b5369b8f1ec2367e8c9ed18b16e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20H=C3=BChne?= Date: Thu, 18 Jul 2024 13:56:49 +0200 Subject: [PATCH 2/5] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index a4d713b6..083d95d8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,12 @@ +Change by HOsy: Renamed Swift package to SQLiteSwift to void duplicate framework implementation messages: + +Class _TtC6SQLite6Backup is implemented in both /System/Library/PrivateFrameworks/LinkServices.framework/Versions/A/LinkServices +Class _TtC6SQLite10Connection is implemented in both /System/Library/PrivateFrameworks/LinkServices.framework/Versions/A/LinkServices +Class _TtC6SQLite9Statement is implemented in both /System/Library/PrivateFrameworks/LinkServices.framework/Versions/A/LinkServices +Class _TtC6SQLite13DateFunctions is implemented in both /System/Library/PrivateFrameworks/LinkServices.framework/Versions/A/LinkServices +Class _TtC6SQLite12TableBuilder is implemented in both /System/Library/PrivateFrameworks/LinkServices.framework/Versions/A/LinkServices + + # SQLite.swift ![Build Status][GitHubActionBadge] [![CocoaPods Version][CocoaPodsVersionBadge]][CocoaPodsVersionLink] [![Swift5 compatible][Swift5Badge]][Swift5Link] [![Platform][PlatformBadge]][PlatformLink] [![Carthage compatible][CartagheBadge]][CarthageLink] [![Join the chat at https://gitter.im/stephencelis/SQLite.swift][GitterBadge]][GitterLink] From cbaaa2ffd12c96c029e9c27ee486bd4b9a2f100a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 18 Jul 2024 14:54:20 +0200 Subject: [PATCH 3/5] fixed changed directory name --- SQLite.xcodeproj/project.pbxproj | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index a2d7edbe..7d77c8f0 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -631,7 +631,7 @@ isa = PBXGroup; children = ( 3D3C3CCB26E5568800759140 /* SQLite.playground */, - EE247AD51C3F04ED00AE3E12 /* SQLite */, + EE247AD51C3F04ED00AE3E12 /* SQLiteSwift */, EE247AE11C3F04ED00AE3E12 /* SQLiteTests */, DEB307132B61D04500F9D46B /* SQLite visionOS.xctestplan */, EE247B8A1C3F81D000AE3E12 /* Metadata */, @@ -658,7 +658,7 @@ name = Products; sourceTree = ""; }; - EE247AD51C3F04ED00AE3E12 /* SQLite */ = { + EE247AD51C3F04ED00AE3E12 /* SQLiteSwift */ = { isa = PBXGroup; children = ( EE247AD61C3F04ED00AE3E12 /* SQLite.h */, @@ -671,8 +671,8 @@ EE247AF91C3F06E900AE3E12 /* Typed */, 19A1792D261C689FC988A90A /* Schema */, ); - name = SQLite; - path = Sources/SQLite; + name = SQLiteSwift; + path = Sources/SQLiteSwift; sourceTree = ""; }; EE247AE11C3F04ED00AE3E12 /* SQLiteTests */ = { @@ -1536,7 +1536,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.15.3; @@ -1559,7 +1559,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.15.3; @@ -1611,7 +1611,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.15.3; @@ -1636,7 +1636,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.15.3; @@ -1661,7 +1661,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.15.3; @@ -1686,7 +1686,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MARKETING_VERSION = 0.15.3; @@ -1862,7 +1862,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1886,7 +1886,7 @@ DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1936,7 +1936,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; @@ -1962,7 +1962,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_VERSION = A; GCC_TREAT_WARNINGS_AS_ERRORS = YES; - INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLite/Info.plist"; + INFOPLIST_FILE = "$(SRCROOT)/Sources/SQLiteSwift/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; From 6a8c6e6757b58594cbf00b7ac4a339bfbcd6f954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 18 Jul 2024 15:35:47 +0200 Subject: [PATCH 4/5] renamed targets --- SQLite.xcodeproj/project.pbxproj | 58 +++++++++---------- .../xcschemes/SQLite Mac.xcscheme | 8 +-- .../xcschemes/SQLite iOS.xcscheme | 8 +-- .../xcschemes/SQLite tvOS.xcscheme | 8 +-- .../xcschemes/SQLite visionOS.xcscheme | 4 +- .../xcschemes/SQLite watchOS.xcscheme | 6 +- 6 files changed, 46 insertions(+), 46 deletions(-) diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index 7d77c8f0..18745801 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -827,9 +827,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 03A65E591C6BB0F50062603F /* SQLite tvOS */ = { + 03A65E591C6BB0F50062603F /* SQLiteSwift tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 03A65E6F1C6BB0F60062603F /* Build configuration list for PBXNativeTarget "SQLite tvOS" */; + buildConfigurationList = 03A65E6F1C6BB0F60062603F /* Build configuration list for PBXNativeTarget "SQLiteSwift tvOS" */; buildPhases = ( 03A65E571C6BB0F50062603F /* Headers */, 03A65E551C6BB0F50062603F /* Sources */, @@ -840,7 +840,7 @@ ); dependencies = ( ); - name = "SQLite tvOS"; + name = "SQLiteSwift tvOS"; productName = "SQLite tvOS"; productReference = 03A65E5A1C6BB0F50062603F /* SQLite.framework */; productType = "com.apple.product-type.framework"; @@ -863,9 +863,9 @@ productReference = 03A65E631C6BB0F60062603F /* SQLiteTests tvOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - A121AC441CA35C79005A31D1 /* SQLite watchOS */ = { + A121AC441CA35C79005A31D1 /* SQLiteSwift watchOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A121AC4C1CA35C79005A31D1 /* Build configuration list for PBXNativeTarget "SQLite watchOS" */; + buildConfigurationList = A121AC4C1CA35C79005A31D1 /* Build configuration list for PBXNativeTarget "SQLiteSwift watchOS" */; buildPhases = ( A121AC421CA35C79005A31D1 /* Headers */, A121AC401CA35C79005A31D1 /* Sources */, @@ -876,14 +876,14 @@ ); dependencies = ( ); - name = "SQLite watchOS"; + name = "SQLiteSwift watchOS"; productName = "SQLite watchOS"; productReference = A121AC451CA35C79005A31D1 /* SQLite.framework */; productType = "com.apple.product-type.framework"; }; - DEB306B82B61CEF500F9D46B /* SQLite visionOS */ = { + DEB306B82B61CEF500F9D46B /* SQLiteSwift visionOS */ = { isa = PBXNativeTarget; - buildConfigurationList = DEB306E22B61CEF500F9D46B /* Build configuration list for PBXNativeTarget "SQLite visionOS" */; + buildConfigurationList = DEB306E22B61CEF500F9D46B /* Build configuration list for PBXNativeTarget "SQLiteSwift visionOS" */; buildPhases = ( DEB306B92B61CEF500F9D46B /* Headers */, DEB306BB2B61CEF500F9D46B /* Sources */, @@ -894,7 +894,7 @@ ); dependencies = ( ); - name = "SQLite visionOS"; + name = "SQLiteSwift visionOS"; productName = SQLite; productReference = DEB306E52B61CEF500F9D46B /* SQLite.framework */; productType = "com.apple.product-type.framework"; @@ -917,9 +917,9 @@ productReference = DEB307112B61CF9500F9D46B /* SQLiteTests visionOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - EE247AD21C3F04ED00AE3E12 /* SQLite iOS */ = { + EE247AD21C3F04ED00AE3E12 /* SQLiteSwift iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = EE247AE71C3F04ED00AE3E12 /* Build configuration list for PBXNativeTarget "SQLite iOS" */; + buildConfigurationList = EE247AE71C3F04ED00AE3E12 /* Build configuration list for PBXNativeTarget "SQLiteSwift iOS" */; buildPhases = ( EE247AD01C3F04ED00AE3E12 /* Headers */, EE247ACE1C3F04ED00AE3E12 /* Sources */, @@ -930,7 +930,7 @@ ); dependencies = ( ); - name = "SQLite iOS"; + name = "SQLiteSwift iOS"; productName = SQLite; productReference = EE247AD31C3F04ED00AE3E12 /* SQLite.framework */; productType = "com.apple.product-type.framework"; @@ -953,9 +953,9 @@ productReference = EE247ADD1C3F04ED00AE3E12 /* SQLiteTests iOS.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - EE247B3B1C3F3ED000AE3E12 /* SQLite Mac */ = { + EE247B3B1C3F3ED000AE3E12 /* SQLiteSwift Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = EE247B511C3F3ED000AE3E12 /* Build configuration list for PBXNativeTarget "SQLite Mac" */; + buildConfigurationList = EE247B511C3F3ED000AE3E12 /* Build configuration list for PBXNativeTarget "SQLiteSwift Mac" */; buildPhases = ( EE247B391C3F3ED000AE3E12 /* Headers */, EE247B371C3F3ED000AE3E12 /* Sources */, @@ -966,7 +966,7 @@ ); dependencies = ( ); - name = "SQLite Mac"; + name = "SQLiteSwift Mac"; productName = SQLite; productReference = EE247B3C1C3F3ED000AE3E12 /* SQLite.framework */; productType = "com.apple.product-type.framework"; @@ -1041,14 +1041,14 @@ projectDirPath = ""; projectRoot = ""; targets = ( - EE247AD21C3F04ED00AE3E12 /* SQLite iOS */, + EE247AD21C3F04ED00AE3E12 /* SQLiteSwift iOS */, EE247ADC1C3F04ED00AE3E12 /* SQLiteTests iOS */, - EE247B3B1C3F3ED000AE3E12 /* SQLite Mac */, + EE247B3B1C3F3ED000AE3E12 /* SQLiteSwift Mac */, EE247B441C3F3ED000AE3E12 /* SQLiteTests Mac */, - 03A65E591C6BB0F50062603F /* SQLite tvOS */, + 03A65E591C6BB0F50062603F /* SQLiteSwift tvOS */, 03A65E621C6BB0F60062603F /* SQLiteTests tvOS */, - A121AC441CA35C79005A31D1 /* SQLite watchOS */, - DEB306B82B61CEF500F9D46B /* SQLite visionOS */, + A121AC441CA35C79005A31D1 /* SQLiteSwift watchOS */, + DEB306B82B61CEF500F9D46B /* SQLiteSwift visionOS */, DEB306E72B61CF9500F9D46B /* SQLiteTests visionOS */, ); }; @@ -1505,22 +1505,22 @@ /* Begin PBXTargetDependency section */ 03A65E661C6BB0F60062603F /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 03A65E591C6BB0F50062603F /* SQLite tvOS */; + target = 03A65E591C6BB0F50062603F /* SQLiteSwift tvOS */; targetProxy = 03A65E651C6BB0F60062603F /* PBXContainerItemProxy */; }; DEB307152B61D07F00F9D46B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DEB306B82B61CEF500F9D46B /* SQLite visionOS */; + target = DEB306B82B61CEF500F9D46B /* SQLiteSwift visionOS */; targetProxy = DEB307142B61D07F00F9D46B /* PBXContainerItemProxy */; }; EE247AE01C3F04ED00AE3E12 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = EE247AD21C3F04ED00AE3E12 /* SQLite iOS */; + target = EE247AD21C3F04ED00AE3E12 /* SQLiteSwift iOS */; targetProxy = EE247ADF1C3F04ED00AE3E12 /* PBXContainerItemProxy */; }; EE247B481C3F3ED000AE3E12 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = EE247B3B1C3F3ED000AE3E12 /* SQLite Mac */; + target = EE247B3B1C3F3ED000AE3E12 /* SQLiteSwift Mac */; targetProxy = EE247B471C3F3ED000AE3E12 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -2011,7 +2011,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 03A65E6F1C6BB0F60062603F /* Build configuration list for PBXNativeTarget "SQLite tvOS" */ = { + 03A65E6F1C6BB0F60062603F /* Build configuration list for PBXNativeTarget "SQLiteSwift tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 03A65E6B1C6BB0F60062603F /* Debug */, @@ -2029,7 +2029,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A121AC4C1CA35C79005A31D1 /* Build configuration list for PBXNativeTarget "SQLite watchOS" */ = { + A121AC4C1CA35C79005A31D1 /* Build configuration list for PBXNativeTarget "SQLiteSwift watchOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A121AC4A1CA35C79005A31D1 /* Debug */, @@ -2038,7 +2038,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DEB306E22B61CEF500F9D46B /* Build configuration list for PBXNativeTarget "SQLite visionOS" */ = { + DEB306E22B61CEF500F9D46B /* Build configuration list for PBXNativeTarget "SQLiteSwift visionOS" */ = { isa = XCConfigurationList; buildConfigurations = ( DEB306E32B61CEF500F9D46B /* Debug */, @@ -2065,7 +2065,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EE247AE71C3F04ED00AE3E12 /* Build configuration list for PBXNativeTarget "SQLite iOS" */ = { + EE247AE71C3F04ED00AE3E12 /* Build configuration list for PBXNativeTarget "SQLiteSwift iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( EE247AE81C3F04ED00AE3E12 /* Debug */, @@ -2083,7 +2083,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EE247B511C3F3ED000AE3E12 /* Build configuration list for PBXNativeTarget "SQLite Mac" */ = { + EE247B511C3F3ED000AE3E12 /* Build configuration list for PBXNativeTarget "SQLiteSwift Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( EE247B4D1C3F3ED000AE3E12 /* Debug */, diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme index a0db21a2..0b5b7e9c 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite Mac.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite Mac" + BlueprintName = "SQLiteSwift Mac" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -32,7 +32,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite Mac" + BlueprintName = "SQLiteSwift Mac" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -64,7 +64,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite Mac" + BlueprintName = "SQLiteSwift Mac" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -80,7 +80,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247B3B1C3F3ED000AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite Mac" + BlueprintName = "SQLiteSwift Mac" ReferencedContainer = "container:SQLite.xcodeproj"> diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme index 6cadc289..d7671cbc 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite iOS" + BlueprintName = "SQLiteSwift iOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -32,7 +32,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite iOS" + BlueprintName = "SQLiteSwift iOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -64,7 +64,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite iOS" + BlueprintName = "SQLiteSwift iOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -80,7 +80,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "EE247AD21C3F04ED00AE3E12" BuildableName = "SQLite.framework" - BlueprintName = "SQLite iOS" + BlueprintName = "SQLiteSwift iOS" ReferencedContainer = "container:SQLite.xcodeproj"> diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme index 01966aa1..170435e8 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite tvOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "03A65E591C6BB0F50062603F" BuildableName = "SQLite.framework" - BlueprintName = "SQLite tvOS" + BlueprintName = "SQLiteSwift tvOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -32,7 +32,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "03A65E591C6BB0F50062603F" BuildableName = "SQLite.framework" - BlueprintName = "SQLite tvOS" + BlueprintName = "SQLiteSwift tvOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -64,7 +64,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "03A65E591C6BB0F50062603F" BuildableName = "SQLite.framework" - BlueprintName = "SQLite tvOS" + BlueprintName = "SQLiteSwift tvOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -80,7 +80,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "03A65E591C6BB0F50062603F" BuildableName = "SQLite.framework" - BlueprintName = "SQLite tvOS" + BlueprintName = "SQLiteSwift tvOS" ReferencedContainer = "container:SQLite.xcodeproj"> diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite visionOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite visionOS.xcscheme index c1536b66..e01d03d0 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite visionOS.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite visionOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DEB306B82B61CEF500F9D46B" BuildableName = "SQLite.framework" - BlueprintName = "SQLite visionOS" + BlueprintName = "SQLiteSwift visionOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -56,7 +56,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "DEB306B82B61CEF500F9D46B" BuildableName = "SQLite.framework" - BlueprintName = "SQLite visionOS" + BlueprintName = "SQLiteSwift visionOS" ReferencedContainer = "container:SQLite.xcodeproj"> diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme index be1ef0ee..2b7d5079 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite watchOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A121AC441CA35C79005A31D1" BuildableName = "SQLite.framework" - BlueprintName = "SQLite watchOS" + BlueprintName = "SQLiteSwift watchOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -45,7 +45,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A121AC441CA35C79005A31D1" BuildableName = "SQLite.framework" - BlueprintName = "SQLite watchOS" + BlueprintName = "SQLiteSwift watchOS" ReferencedContainer = "container:SQLite.xcodeproj"> @@ -61,7 +61,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A121AC441CA35C79005A31D1" BuildableName = "SQLite.framework" - BlueprintName = "SQLite watchOS" + BlueprintName = "SQLiteSwift watchOS" ReferencedContainer = "container:SQLite.xcodeproj"> From 1ba6e03d0f3bc9473ea815753f6174b50d2d0dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Hu=CC=88hne?= Date: Thu, 18 Jul 2024 23:16:21 +0200 Subject: [PATCH 5/5] fixed target --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index ddc5c0f0..09917ed4 100644 --- a/Package.swift +++ b/Package.swift @@ -13,7 +13,7 @@ let package = Package( products: [ .library( name: "SQLiteSwift", - targets: ["SQLite"] + targets: ["SQLiteSwift"] ) ], targets: [