From 3986514ef02c69461f389894fe9206b04259817c Mon Sep 17 00:00:00 2001 From: Oleg Gnidets Date: Tue, 19 Aug 2025 11:18:37 +0300 Subject: [PATCH 1/3] Introduce SPM. Remove CocoaPods support. Small update of documentation --- .gitignore | 1 + OHMySQL.docc/Installation.md | 16 +- OHMySQL.podspec | 27 -- OHMySQL.xcodeproj/project.pbxproj | 408 +++++++++--------- .../Sources/{Constants => }/CharsetEncoding.h | 0 .../Sources/{Constants => }/CharsetEncoding.m | 0 .../{Categories => }/NSData+OHSerialization.h | 0 .../{Categories => }/NSData+OHSerialization.m | 0 .../NSNumber+OHSerialization.h | 0 .../NSNumber+OHSerialization.m | 0 .../{Categories => }/NSObject+Mapping.h | 0 .../{Categories => }/NSObject+Mapping.m | 0 .../{Categories => }/NSString+Escaping.h | 0 .../{Categories => }/NSString+Escaping.m | 0 .../NSString+OHSerialization.h | 0 .../NSString+OHSerialization.m | 0 .../{Categories => }/NSString+Utility.h | 0 .../{Categories => }/NSString+Utility.m | 0 OHMySQL/Sources/{Constants => }/OHConstants.h | 0 .../Sources/{Constants => }/OHJoinConstants.h | 0 .../Sources/{Constants => }/OHJoinConstants.m | 0 OHMySQL/Sources/{Constants => }/OHLogging.h | 0 .../{Models => }/OHMySQLConfiguration.h | 0 .../{Models => }/OHMySQLConfiguration.m | 0 .../{Models => }/OHMySQLQueryRequest.h | 0 .../{Models => }/OHMySQLQueryRequest.m | 0 .../{Models => }/OHMySQLQueryTimeline.h | 0 .../{Models => }/OHMySQLQueryTimeline.m | 0 OHMySQL/Sources/{Models => }/OHMySQLStore.h | 0 OHMySQL/Sources/{Models => }/OHMySQLStore.m | 0 .../Sources/{Constants => }/OHProtocolType.h | 0 .../Sources/{Constants => }/OHRefreshOption.h | 0 .../{Constants => }/OHResultErrorType.h | 0 .../{Constants => }/OHResultErrorType.m | 0 OHMySQL/Sources/{Models => }/OHSSLConfig.h | 0 OHMySQL/Sources/{Models => }/OHSSLConfig.m | 0 Package.swift | 50 +++ PrivacyInfo.xcprivacy | 27 ++ README.md | 1 - .../OHMySQL.xcodeproj/project.pbxproj | 109 ++--- .../contents.xcworkspacedata | 2 +- .../contents.xcworkspacedata | 10 - .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../TaskList/TaskListViewModel.swift | 1 + SampleProject/Podfile | 14 - 45 files changed, 314 insertions(+), 360 deletions(-) delete mode 100644 OHMySQL.podspec rename OHMySQL/Sources/{Constants => }/CharsetEncoding.h (100%) rename OHMySQL/Sources/{Constants => }/CharsetEncoding.m (100%) rename OHMySQL/Sources/{Categories => }/NSData+OHSerialization.h (100%) rename OHMySQL/Sources/{Categories => }/NSData+OHSerialization.m (100%) rename OHMySQL/Sources/{Categories => }/NSNumber+OHSerialization.h (100%) rename OHMySQL/Sources/{Categories => }/NSNumber+OHSerialization.m (100%) rename OHMySQL/Sources/{Categories => }/NSObject+Mapping.h (100%) rename OHMySQL/Sources/{Categories => }/NSObject+Mapping.m (100%) rename OHMySQL/Sources/{Categories => }/NSString+Escaping.h (100%) rename OHMySQL/Sources/{Categories => }/NSString+Escaping.m (100%) rename OHMySQL/Sources/{Categories => }/NSString+OHSerialization.h (100%) rename OHMySQL/Sources/{Categories => }/NSString+OHSerialization.m (100%) rename OHMySQL/Sources/{Categories => }/NSString+Utility.h (100%) rename OHMySQL/Sources/{Categories => }/NSString+Utility.m (100%) rename OHMySQL/Sources/{Constants => }/OHConstants.h (100%) rename OHMySQL/Sources/{Constants => }/OHJoinConstants.h (100%) rename OHMySQL/Sources/{Constants => }/OHJoinConstants.m (100%) rename OHMySQL/Sources/{Constants => }/OHLogging.h (100%) rename OHMySQL/Sources/{Models => }/OHMySQLConfiguration.h (100%) rename OHMySQL/Sources/{Models => }/OHMySQLConfiguration.m (100%) rename OHMySQL/Sources/{Models => }/OHMySQLQueryRequest.h (100%) rename OHMySQL/Sources/{Models => }/OHMySQLQueryRequest.m (100%) rename OHMySQL/Sources/{Models => }/OHMySQLQueryTimeline.h (100%) rename OHMySQL/Sources/{Models => }/OHMySQLQueryTimeline.m (100%) rename OHMySQL/Sources/{Models => }/OHMySQLStore.h (100%) rename OHMySQL/Sources/{Models => }/OHMySQLStore.m (100%) rename OHMySQL/Sources/{Constants => }/OHProtocolType.h (100%) rename OHMySQL/Sources/{Constants => }/OHRefreshOption.h (100%) rename OHMySQL/Sources/{Constants => }/OHResultErrorType.h (100%) rename OHMySQL/Sources/{Constants => }/OHResultErrorType.m (100%) rename OHMySQL/Sources/{Models => }/OHSSLConfig.h (100%) rename OHMySQL/Sources/{Models => }/OHSSLConfig.m (100%) create mode 100644 Package.swift create mode 100644 PrivacyInfo.xcprivacy delete mode 100644 SampleProject/OHMySQL.xcworkspace/contents.xcworkspacedata delete mode 100644 SampleProject/OHMySQL.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 SampleProject/Podfile diff --git a/.gitignore b/.gitignore index 11f878e..5d9a493 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ ## Build generated build/ +.build/ DerivedData ## Various settings diff --git a/OHMySQL.docc/Installation.md b/OHMySQL.docc/Installation.md index 69a16b0..402ca59 100644 --- a/OHMySQL.docc/Installation.md +++ b/OHMySQL.docc/Installation.md @@ -6,19 +6,15 @@ Learn the ways to integrate the framework in your application. The framework can be installed in different ways. -### CocoaPods +### SPM -Open `Podfile` and declare the dependency: -```bash -pod 'OHMySQL' -``` +Once you have your Swift package set up, adding `OHMySQL` as a dependency is as easy as adding it to the dependencies value of your Package.swift or the Package list in Xcode. -Then open Terminal, navigate to project folder and install the dependencies: +```swift +dependencies: [ + .package(url: "https://github.com/oleghnidets/OHMySQL.git", .upToNextMajor(from: "3.4.1")) +] ``` -pod install --repo-update -``` - -> Tip: Learn how to use [CocoaPods](https://guides.cocoapods.org/using/getting-started.html). ### Carthage diff --git a/OHMySQL.podspec b/OHMySQL.podspec deleted file mode 100644 index f8849da..0000000 --- a/OHMySQL.podspec +++ /dev/null @@ -1,27 +0,0 @@ -# Be sure to run `pod lib lint OHMySQL.podspec --allow-warnings' to ensure this is a -# valid spec before submitting. - -Pod::Spec.new do |spec| - spec.name = 'OHMySQL' - spec.version = '3.4.0' - - spec.summary = 'The Objective-C wrapper for mysqlclient (MySQL C API)' - spec.description = <<-DESC -You can connect to your remote MySQL database using OHMySQL API. It allows you doing queries in easy and object-oriented way. Common queries such as SELECT, INSERT, DELETE, JOIN are wrapped by Objective-C code and you don't need to dive into MySQL C API. - DESC - - spec.documentation_url = 'https://oleghnidets.github.io/OHMySQL/documentation/ohmysql/' - spec.homepage = 'https://github.com/oleghnidets/OHMySQL' - spec.license = 'MIT' - spec.authors = { 'Oleg Hnidets' => 'oleg.oleksan@gmail.com' } - - spec.source = { :git => 'https://github.com/oleghnidets/OHMySQL.git', :tag => spec.version.to_s } - spec.ios.deployment_target = '14.0' - spec.osx.deployment_target = '11.0' - spec.requires_arc = true - spec.source_files = 'OHMySQL/Sources/**/*.{h,m}' - spec.frameworks = 'Foundation' - spec.compiler_flags = '-Wno-incomplete-umbrella' - spec.vendored_frameworks = 'OHMySQL/lib/MySQL.xcframework', 'OHMySQL/lib/OpenSSL.xcframework', - spec.library = 'c++' -end diff --git a/OHMySQL.xcodeproj/project.pbxproj b/OHMySQL.xcodeproj/project.pbxproj index 5512f79..99d1b57 100644 --- a/OHMySQL.xcodeproj/project.pbxproj +++ b/OHMySQL.xcodeproj/project.pbxproj @@ -7,115 +7,115 @@ objects = { /* Begin PBXBuildFile section */ - 005809C0892DD9D071B8CD74 /* OHProtocolType.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B3A81B9ED87328A91D7AADF /* OHProtocolType.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 00B4DA0E414697F91E957799 /* NSNumber+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = A20ECBF4A82262860B9E4FDE /* NSNumber+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 014B4E848FFB55094F038C4F /* NSNumber+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = FB86682A4F243FBB8F7821E8 /* NSNumber+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0192478A1B7CDE3BA25C226C /* CharsetEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 64F73393620B7B029EF98D5A /* CharsetEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; }; 0287C0BECF102A94159AF3FB /* OHMySQLSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F5075398C1297B498D695C82 /* OHMySQLSerialization.m */; }; - 062DDCC2233C29DB0B8D620F /* NSString+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6D80A5B242875642DF2744 /* NSString+OHSerialization.m */; }; - 06E7AEDE3F461A3DD197BF1C /* OHResultErrorType.m in Sources */ = {isa = PBXBuildFile; fileRef = DB5DEB27B7B68688529056B0 /* OHResultErrorType.m */; }; + 081BF69BE73EC52BAEDAE7E1 /* NSData+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D21E3DA1BB4B1BE2743A31F /* NSData+OHSerialization.m */; }; 0E348A0F31336F7F4E1CFD57 /* OHMySQLStoreCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = CF6E113C7B1E1F43F6E289F2 /* OHMySQLStoreCoordinator.m */; }; - 0EBFE0E530A3231E191FE3E2 /* OHMySQLQueryRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BCC2C529CF6265C285856F2 /* OHMySQLQueryRequest.m */; }; + 12C600FC2FAEEA28DB0941B5 /* OHConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = D989D4A95C6A58D5EE126476 /* OHConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; 130BA6D50449B6C8B2210FB9 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E362352B7CD1893B51B3E606 /* libc++.tbd */; }; - 143B43EBFD55D04D48BC0CAD /* NSData+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = DEEEEF538AE9BF689B278EE2 /* NSData+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 158F6D1B0FDC811545354504 /* NSNumber+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = A20ECBF4A82262860B9E4FDE /* NSNumber+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 15BB128CB6EE45B8420BB3D4 /* OHResultErrorType.m in Sources */ = {isa = PBXBuildFile; fileRef = DB5DEB27B7B68688529056B0 /* OHResultErrorType.m */; }; - 174B05F6FB0E2150194BC81B /* CharsetEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = C435FA9DF07CBBEB4147B3EB /* CharsetEncoding.m */; }; - 18C0D86A8485AFBEED35B342 /* OHSSLConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CCD4EE2692BBF08E1135E596 /* OHSSLConfig.m */; }; - 18FFF84E8BA6D15879FC16A9 /* OHJoinConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DDF3E4FF6792F68F39C0935 /* OHJoinConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 193AF978B20D7D8EE537722E /* OHRefreshOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E285C3CDD8788EFAC8595C6 /* OHRefreshOption.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1985A4E153E316B7712ABCF7 /* OHMySQLMappingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 47105C5061A672559C75E4D0 /* OHMySQLMappingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 1B24DCB86AA88CA0DA7CE169 /* OHJoinConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 20020A05D168A5C6059D59D6 /* OHJoinConstants.m */; }; - 1CA6788192D0B4A7160FF545 /* OHMySQLQueryTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 6AAF06B107DDE779C643F60B /* OHMySQLQueryTimeline.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 1991805F8E9C87F2F6565904 /* NSNumber+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AE8E69A0EFA1A0F8577F949 /* NSNumber+OHSerialization.m */; }; + 1A748B6FAF70E2DF8C527585 /* OHLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E2C3CB0E20998D85076FE2D /* OHLogging.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1CC532F70EA9EF547E297E53 /* OHMySQL.h in Headers */ = {isa = PBXBuildFile; fileRef = 155949D8DDC3F04CA50728E2 /* OHMySQL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 230F6EB7745BC97E938CA2A8 /* OHResultErrorType.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F1DF80A522EB85A7BB9389 /* OHResultErrorType.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2336A6E3E7E0566C1AA7DF66 /* OHConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 2095B2974FDD55CED704F068 /* OHConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 2368DBBC1D660C0170B2D95B /* NSString+Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CBA397A869931CE9A0028B6 /* NSString+Utility.m */; }; + 1F83825C7379B2E8E0D16A00 /* OHRefreshOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E412B5642D45541B92E3ECC /* OHRefreshOption.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 21D26AB5E93767333AF83FC1 /* NSObject+Mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = F73F9CA179A402DDC36DE18D /* NSObject+Mapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 24240B505BE45B389AF00367 /* NSObject+Mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = F73F9CA179A402DDC36DE18D /* NSObject+Mapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; 243576990EE6B1D271E3964E /* OHMySQLSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DEC8F2733508C1207AE09C /* OHMySQLSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; 28A7476C79D3864AA1C6320E /* OHMySQL.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0F02FB24BEE828CAD824A73E /* OHMySQL.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 28F7974B0B1C777196137E7D /* OHMySQL.docc in Sources */ = {isa = PBXBuildFile; fileRef = D3D05CFA604B03FB957D3A76 /* OHMySQL.docc */; }; - 290EB97A1DE3A79D4DCF86E1 /* OHSSLConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 78C4EFDB51A00C06C828ACF1 /* OHSSLConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 291458F4063714E8D842FB95 /* OHMySQLMappingProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 47105C5061A672559C75E4D0 /* OHMySQLMappingProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; 29C75B381C2315C76664A364 /* OHMySQLQueryContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EE99441999A137908029090 /* OHMySQLQueryContext.m */; }; - 32D2EC74D9D75786B1CA365E /* NSData+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 07FA26394A693BEA959D935C /* NSData+OHSerialization.m */; }; + 2CA909CF1362B69847D6E408 /* NSString+Escaping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DB4D3ED3A2742E02297F39C /* NSString+Escaping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 2EF694D8B02FC2ACF3BC7AC2 /* CharsetEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 64F73393620B7B029EF98D5A /* CharsetEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 34C4CA4C1ACE19170C39ABD3 /* NSData+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 86B95C8E69A78ECA9022CF03 /* NSData+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 34CD13E14A43FFC8BB67665E /* OHMySQLQueryRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = D5DB8438A7153CC64A50A58A /* OHMySQLQueryRequest.m */; }; 3542E2057434397577B0FF01 /* XCTestCase+Utility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FFD433639083362E497B1A /* XCTestCase+Utility.swift */; }; - 3A4B7A86A281367A7482550F /* NSString+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A6D80A5B242875642DF2744 /* NSString+OHSerialization.m */; }; + 3886E841E8136885AD8E38D6 /* OHMySQLConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 777D928766E968861926B7F0 /* OHMySQLConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 389D6534EAEF8B084E70DD4D /* OHSSLConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 1954C0291FA63B50FFFC3512 /* OHSSLConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 396F72D505C20B07CEA89EC0 /* OHMySQLConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 777D928766E968861926B7F0 /* OHMySQLConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3D67E3A8812EB26748F425B3 /* SelectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CB45069021220F00F7B52D4 /* SelectTests.swift */; }; 407EDF58966A71693ACE8638 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = E362352B7CD1893B51B3E606 /* libc++.tbd */; }; - 42560D13B9D110914C543850 /* NSString+Escaping.h in Headers */ = {isa = PBXBuildFile; fileRef = C53393F7981927F4CE736CEA /* NSString+Escaping.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 443102DA23C2AB9465935364 /* OHMySQLConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E91AE30F4BE598D8BCA6BC5 /* OHMySQLConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 42D85C51A134597B4AA44FE6 /* OHMySQLQueryRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = D5DB8438A7153CC64A50A58A /* OHMySQLQueryRequest.m */; }; 44802D966EF212440CEF9920 /* OHMySQLStoreCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = EAB98B038BC80CE968997140 /* OHMySQLStoreCoordinator.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 44AA464CEA0F16AB146EEB30 /* OHMySQLQueryRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A30EC09F3678FC28556B695 /* OHMySQLQueryRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4506EBC504BDBF793CB865EB /* OHMySQLContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB0CA08D7366D7AB4D1D9A /* OHMySQLContainer.m */; }; - 452ECD34F5BC039616D3C186 /* NSData+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 07FA26394A693BEA959D935C /* NSData+OHSerialization.m */; }; 4780B6467B8C951696F360B3 /* MySQL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B8A6C36E9B38D6C20652459 /* MySQL.xcframework */; }; - 4898DB98206A58A3C09E3EA1 /* OHProtocolType.h in Headers */ = {isa = PBXBuildFile; fileRef = 9B3A81B9ED87328A91D7AADF /* OHProtocolType.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 4DCDE1F137D7A665AABD1AF7 /* NSString+Utility.h in Headers */ = {isa = PBXBuildFile; fileRef = E5C689BDDAFA2C8F9A671123 /* NSString+Utility.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5374C139228ED40EF0A289A6 /* OHSSLConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CCD4EE2692BBF08E1135E596 /* OHSSLConfig.m */; }; + 47E1A861083AE57B6F72F89D /* OHMySQLStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BF1086100D257D3E4FF72F7 /* OHMySQLStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4CF0090434ADCEF42F62B625 /* OHMySQLQueryTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E194F2509AA339E584CA6C4 /* OHMySQLQueryTimeline.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4D1C9402B2B3C714E06F8775 /* OHMySQLQueryRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7A30EC09F3678FC28556B695 /* OHMySQLQueryRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 4F05930FDDDA499786B6D595 /* NSString+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE3013CD26E88C32C041C32 /* NSString+OHSerialization.m */; }; + 50E3043BBA188160EDACAFA9 /* NSString+Utility.h in Headers */ = {isa = PBXBuildFile; fileRef = B3149A8E16F4F31FF646F7C8 /* NSString+Utility.h */; settings = {ATTRIBUTES = (Public, ); }; }; 54FAA2925F21FC1D866AB60F /* OHMySQLQueryRequestFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 584C06F6CE1DEE4DE17EA2DD /* OHMySQLQueryRequestFactory.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 5712765F35D53BFB5749EC5C /* OHMySQLStore.h in Headers */ = {isa = PBXBuildFile; fileRef = CCB1BF92B5208C7CA889C6FE /* OHMySQLStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 5518442901F75016077452EC /* NSString+Escaping.m in Sources */ = {isa = PBXBuildFile; fileRef = 594115E6AFBA88F907AD332D /* NSString+Escaping.m */; }; + 56D5D2C71A6CC11022EFA12F /* OHSSLConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 85E36ADA72FBBD4F968EE678 /* OHSSLConfig.m */; }; + 56FDFB4ECE8EFC962F7EA1CC /* CharsetEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D9B78743A987F01BEE6FF06 /* CharsetEncoding.m */; }; + 5B9B24C7FE00C4FAD7279349 /* OHMySQLStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BF1086100D257D3E4FF72F7 /* OHMySQLStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 5D106369E9C92A0CACBD6430 /* StoreCoordinatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35534A48E8F3A16FE19FFD94 /* StoreCoordinatorTests.swift */; }; - 609A328E32E1E41B3C1F34F4 /* OHMySQLStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 20A9008547AEB1A5738FAFAE /* OHMySQLStore.m */; }; - 609FE148C247D6D332829A52 /* NSObject+Mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = DE242D80A01F5A9E50D12F7F /* NSObject+Mapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; 610E2DCFD7DA0A4B937D3831 /* EscapeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A701800558CBE398C725A05 /* EscapeTests.swift */; }; 619C27DCAB9BFAA9A8F589E4 /* MySQL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B8A6C36E9B38D6C20652459 /* MySQL.xcframework */; }; + 62A0074BC0EBED5640D13A74 /* NSString+Escaping.m in Sources */ = {isa = PBXBuildFile; fileRef = 594115E6AFBA88F907AD332D /* NSString+Escaping.m */; }; 63FEAB34E96CE2774B8126A2 /* OHMySQLQueryRequestFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE81AF9B2C70DFF9885D48 /* OHMySQLQueryRequestFactory.m */; }; 6650DD9E6FA148E9E64EB090 /* OHMySQLQueryContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EE99441999A137908029090 /* OHMySQLQueryContext.m */; }; 669BD344A824B72E55A4E697 /* TestPerson.swift in Sources */ = {isa = PBXBuildFile; fileRef = B11DB1140606AFA9AC6961BB /* TestPerson.swift */; }; - 685715D1BA23B2085D0A956F /* OHMySQLConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 00AAFB8FF94890F3A79EF342 /* OHMySQLConfiguration.m */; }; 6A3506330E1C34EBAD516D47 /* OHMySQLContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB0CA08D7366D7AB4D1D9A /* OHMySQLContainer.m */; }; 6A4A434692EB70251D83C981 /* OHMySQLContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = D386C12C577B071B5386C471 /* OHMySQLContainer.h */; settings = {ATTRIBUTES = (Public, ); }; }; 6DFDFD0A061DE720066857DE /* OHMySQLQueryContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BAB51A09B7C7D7F716CAE4E0 /* OHMySQLQueryContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 6E7A686AFFCBB0C0595C0209 /* OHConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 2095B2974FDD55CED704F068 /* OHConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 72DC65B9283DA427FB9CA662 /* NSString+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = B13AB92A8DFC315226F26B83 /* NSString+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 73B4FAD95B64322E30C244CF /* OHRefreshOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E285C3CDD8788EFAC8595C6 /* OHRefreshOption.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 75F2A43483DFBD1D21A9CF19 /* NSString+Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 0CBA397A869931CE9A0028B6 /* NSString+Utility.m */; }; + 6F32677CE7A7BB0B82D00C02 /* NSString+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EE3013CD26E88C32C041C32 /* NSString+OHSerialization.m */; }; + 75CCBC666BB28D5EABE750B6 /* OHSSLConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 1954C0291FA63B50FFFC3512 /* OHSSLConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; 766D4620DF6ED4D450CAABB7 /* OHSerializationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E8CE23805D0B550224EEF929 /* OHSerializationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 77B61F0E8CCD99EBA466A660 /* NSString+Escaping.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DCD5707A8D9740BB4DC0EEA /* NSString+Escaping.m */; }; + 78283D58B4CF523483AC0A81 /* OHResultErrorType.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EA485F418776C741F5F534A /* OHResultErrorType.m */; }; 7B89EB9550EE6DFCF9277662 /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7276E6E6BB6B32F193BD678 /* OpenSSL.xcframework */; }; + 7C4301A75E855F6EC28A092B /* OHProtocolType.h in Headers */ = {isa = PBXBuildFile; fileRef = FD7AE1703B35CF3CA656382D /* OHProtocolType.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7E6FB152D509B56027C70A7E /* OpenSSL.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = D7276E6E6BB6B32F193BD678 /* OpenSSL.xcframework */; }; - 84414D306F6C5FCD579FAA61 /* OHJoinConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DDF3E4FF6792F68F39C0935 /* OHJoinConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8454C50FF8885E131E5C00A0 /* NSString+Escaping.m in Sources */ = {isa = PBXBuildFile; fileRef = 6DCD5707A8D9740BB4DC0EEA /* NSString+Escaping.m */; }; - 84DC055F3263F06AE950A6EC /* OHLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C01D6C8FC6B61302484AA37 /* OHLogging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 850E638B19296C60F5F78898 /* NSString+Escaping.h in Headers */ = {isa = PBXBuildFile; fileRef = C53393F7981927F4CE736CEA /* NSString+Escaping.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8BF730F7DABC48EC88812A19 /* CharsetEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 40C2551D0475779E22E3C105 /* CharsetEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 8DB3BB21CFAD95804322C8A1 /* OHMySQLStore.h in Headers */ = {isa = PBXBuildFile; fileRef = CCB1BF92B5208C7CA889C6FE /* OHMySQLStore.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8975FE0FC18BD2A1DA90946E /* OHSSLConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 85E36ADA72FBBD4F968EE678 /* OHSSLConfig.m */; }; + 8A0B765CAA8B674D077A4D65 /* OHMySQLQueryTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E194F2509AA339E584CA6C4 /* OHMySQLQueryTimeline.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8B7A09B623580DFC607B987F /* NSString+Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 24763759BD6A11A0F65F813C /* NSString+Utility.m */; }; + 8BE8B041F5B61D71FDCECF90 /* NSData+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 86B95C8E69A78ECA9022CF03 /* NSData+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 9397F5394126E1003CD67179 /* OHJoinConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = A782FE266DE15545389DE520 /* OHJoinConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; 93C82CDC303D2E7CF624724B /* OHMySQLQueryContext.h in Headers */ = {isa = PBXBuildFile; fileRef = BAB51A09B7C7D7F716CAE4E0 /* OHMySQLQueryContext.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 96441F9E94FE7B9D617F520B /* NSObject+Mapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E13114042F143778DA7C666 /* NSObject+Mapping.m */; }; + 96084878DF9D641A66955541 /* OHJoinConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = A782FE266DE15545389DE520 /* OHJoinConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; 98E28F19278A60D04CB5A3AB /* OHMySQLQueryRequestFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DBE81AF9B2C70DFF9885D48 /* OHMySQLQueryRequestFactory.m */; }; - 9A9241C2807F3143B42D8356 /* NSNumber+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E9477DF0068596D4ADD1F82 /* NSNumber+OHSerialization.m */; }; 9F870272FE634E7E7DC2D820 /* OHMySQLSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = F5075398C1297B498D695C82 /* OHMySQLSerialization.m */; }; - A0F3B0E61DE90ADF1DF00EDA /* NSString+Utility.h in Headers */ = {isa = PBXBuildFile; fileRef = E5C689BDDAFA2C8F9A671123 /* NSString+Utility.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A4CD88E62EADE97E3D87AEED /* OHLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4C01D6C8FC6B61302484AA37 /* OHLogging.h */; settings = {ATTRIBUTES = (Public, ); }; }; - A644FFE148CEC24D087EB39B /* OHMySQLQueryTimeline.m in Sources */ = {isa = PBXBuildFile; fileRef = 88801128DFDA3466BCA1C8B4 /* OHMySQLQueryTimeline.m */; }; - A7714A702C013FCD73EDBA5E /* CharsetEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = C435FA9DF07CBBEB4147B3EB /* CharsetEncoding.m */; }; - A8C2B05261728B9615E136D6 /* OHMySQLQueryRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 75F1B9A9E57AF09470E2ED9B /* OHMySQLQueryRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - AD2F9A2C510BEC5CBC6ACEC2 /* OHSSLConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 78C4EFDB51A00C06C828ACF1 /* OHSSLConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; + A517C72F7ECBB0D75497103C /* OHMySQLConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 263DBBC085ED734F41082E68 /* OHMySQLConfiguration.m */; }; + AA7F900FC4DAA3A15400A482 /* OHJoinConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C501CC03473A4EDFD43228B /* OHJoinConstants.m */; }; + AB957518304BB5131EBDCEDB /* NSObject+Mapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B044E2D959C94B0DFAB8A49 /* NSObject+Mapping.m */; }; + ACB33550BC248168FC1D74D2 /* NSString+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D4B68E6001A4102408F0965 /* NSString+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; ADCB5AF1CD6D1B0A9E1E1FC0 /* ObjectTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45DC9FC4ED3BC3A2F3B52BD2 /* ObjectTests.swift */; }; - B210C1BC7C6D8B94C1AC0941 /* NSData+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = DEEEEF538AE9BF689B278EE2 /* NSData+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + AEE1E73534C17364D7D9ACC7 /* NSNumber+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 0AE8E69A0EFA1A0F8577F949 /* NSNumber+OHSerialization.m */; }; + B1A6AF854DB916385A58BC3E /* OHProtocolType.h in Headers */ = {isa = PBXBuildFile; fileRef = FD7AE1703B35CF3CA656382D /* OHProtocolType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B230CCCF95C6C0344EAA0046 /* NSString+Utility.m in Sources */ = {isa = PBXBuildFile; fileRef = 24763759BD6A11A0F65F813C /* NSString+Utility.m */; }; B4CA850D9E811E4CDC2DC52D /* OHMySQLContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = D386C12C577B071B5386C471 /* OHMySQLContainer.h */; settings = {ATTRIBUTES = (Public, ); }; }; - B82E69B0D20B487E450F886C /* OHMySQLConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E91AE30F4BE598D8BCA6BC5 /* OHMySQLConfiguration.h */; settings = {ATTRIBUTES = (Public, ); }; }; + B5378119C2EF99B8325A771F /* OHResultErrorType.h in Headers */ = {isa = PBXBuildFile; fileRef = EA845377406399FE522F9C22 /* OHResultErrorType.h */; settings = {ATTRIBUTES = (Public, ); }; }; B918C4201FCB7C84E802E04D /* OHMySQL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F02FB24BEE828CAD824A73E /* OHMySQL.framework */; }; - C0A7E75BC543320FB52CE6C2 /* NSObject+Mapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E13114042F143778DA7C666 /* NSObject+Mapping.m */; }; - C53F7B245861D5AEB5F892DF /* OHMySQLConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 00AAFB8FF94890F3A79EF342 /* OHMySQLConfiguration.m */; }; - C5731890169F3EC783E079E0 /* OHResultErrorType.h in Headers */ = {isa = PBXBuildFile; fileRef = 40F1DF80A522EB85A7BB9389 /* OHResultErrorType.h */; settings = {ATTRIBUTES = (Public, ); }; }; - C618B25C46E8F9D4708821BB /* OHMySQLQueryTimeline.h in Headers */ = {isa = PBXBuildFile; fileRef = 6AAF06B107DDE779C643F60B /* OHMySQLQueryTimeline.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BB29A6C85A814C1F9F07D2AF /* OHJoinConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C501CC03473A4EDFD43228B /* OHJoinConstants.m */; }; + BE0BF724E4819E3361A0443C /* OHMySQLQueryTimeline.m in Sources */ = {isa = PBXBuildFile; fileRef = FF84201C4F4A7A4ABA52B1E8 /* OHMySQLQueryTimeline.m */; }; + BE251893423297A820CF5082 /* NSNumber+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = FB86682A4F243FBB8F7821E8 /* NSNumber+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BEE76A26B93870EFCC3E4325 /* NSString+Utility.h in Headers */ = {isa = PBXBuildFile; fileRef = B3149A8E16F4F31FF646F7C8 /* NSString+Utility.h */; settings = {ATTRIBUTES = (Public, ); }; }; C698455FB70D55A62374FA52 /* OHMySQLSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 41DEC8F2733508C1207AE09C /* OHMySQLSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; C71BC6C54B61E5F0ED8EC095 /* OHMySQLStoreCoordinator.m in Sources */ = {isa = PBXBuildFile; fileRef = CF6E113C7B1E1F43F6E289F2 /* OHMySQLStoreCoordinator.m */; }; + C9FC5C168B6E2339E97EB455 /* CharsetEncoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D9B78743A987F01BEE6FF06 /* CharsetEncoding.m */; }; + CAE51ADE7AB2432E9D84455D /* OHMySQLStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A7F64FC4DE82A268EA7563F /* OHMySQLStore.m */; }; + CC03DA763AB0A85D747744E6 /* OHMySQLStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A7F64FC4DE82A268EA7563F /* OHMySQLStore.m */; }; CC92E4B982530C3B15376D2D /* OHMySQLQueryRequestFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 584C06F6CE1DEE4DE17EA2DD /* OHMySQLQueryRequestFactory.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D59B923768E5CEB93D26FB56 /* NSNumber+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 0E9477DF0068596D4ADD1F82 /* NSNumber+OHSerialization.m */; }; + CE8A5CB3E11E7719CDF4615E /* OHResultErrorType.h in Headers */ = {isa = PBXBuildFile; fileRef = EA845377406399FE522F9C22 /* OHResultErrorType.h */; settings = {ATTRIBUTES = (Public, ); }; }; + D26C26CF6D4E02CA48FF0C5C /* OHMySQLQueryTimeline.m in Sources */ = {isa = PBXBuildFile; fileRef = FF84201C4F4A7A4ABA52B1E8 /* OHMySQLQueryTimeline.m */; }; DC78812F3C769CB82CE0D8C5 /* NullTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC242ECF51558924B70DE100 /* NullTests.swift */; }; DD3E5167406AE5AB8154C10B /* OHMySQLStoreCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = EAB98B038BC80CE968997140 /* OHMySQLStoreCoordinator.h */; settings = {ATTRIBUTES = (Public, ); }; }; DD7DAC9714BD40E591DFAD73 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BA27F6296064D375F4EC1D9 /* Foundation.framework */; }; - E1B6DBB08CA3E575A235DA25 /* OHJoinConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 20020A05D168A5C6059D59D6 /* OHJoinConstants.m */; }; - E2562FA4DF43F4279A9B5DF7 /* NSObject+Mapping.h in Headers */ = {isa = PBXBuildFile; fileRef = DE242D80A01F5A9E50D12F7F /* NSObject+Mapping.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E3E113AB2744582174F39643 /* OHMySQLStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 20A9008547AEB1A5738FAFAE /* OHMySQLStore.m */; }; - E461EB7E60AA0578F710FD85 /* CharsetEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 40C2551D0475779E22E3C105 /* CharsetEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; }; - E563638CCEDED18847646DDC /* OHMySQLQueryTimeline.m in Sources */ = {isa = PBXBuildFile; fileRef = 88801128DFDA3466BCA1C8B4 /* OHMySQLQueryTimeline.m */; }; - E765317097A85B2A31FF7063 /* NSString+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = B13AB92A8DFC315226F26B83 /* NSString+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E0DF6671C6E543462AA3E26C /* OHConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = D989D4A95C6A58D5EE126476 /* OHConstants.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E1AD7D9EE10F92E94852D6C0 /* OHRefreshOption.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E412B5642D45541B92E3ECC /* OHRefreshOption.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E69D8F70E366756D8AF2714D /* OHMySQLConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 263DBBC085ED734F41082E68 /* OHMySQLConfiguration.m */; }; + E815EF5F1C2E0F665AC2E211 /* OHLogging.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E2C3CB0E20998D85076FE2D /* OHLogging.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E899FE953FFF437C3A367962 /* NSData+OHSerialization.m in Sources */ = {isa = PBXBuildFile; fileRef = 2D21E3DA1BB4B1BE2743A31F /* NSData+OHSerialization.m */; }; EB0036B4A4364DC49548C3A0 /* OHSerializationProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E8CE23805D0B550224EEF929 /* OHSerializationProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; }; + EB37ABC2D63BA2C394A08850 /* OHResultErrorType.m in Sources */ = {isa = PBXBuildFile; fileRef = 5EA485F418776C741F5F534A /* OHResultErrorType.m */; }; ECBE24F6334DCACEFAF91161 /* OHMySQL.h in Headers */ = {isa = PBXBuildFile; fileRef = 155949D8DDC3F04CA50728E2 /* OHMySQL.h */; settings = {ATTRIBUTES = (Public, ); }; }; - ED0895056A8B6ABE40383EDF /* OHMySQLQueryRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 75F1B9A9E57AF09470E2ED9B /* OHMySQLQueryRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; - F2A2E06FFCE6D0E8086E5A90 /* OHMySQLQueryRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BCC2C529CF6265C285856F2 /* OHMySQLQueryRequest.m */; }; + F4586F4F2B8B4F33F11EB217 /* NSString+Escaping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DB4D3ED3A2742E02297F39C /* NSString+Escaping.h */; settings = {ATTRIBUTES = (Public, ); }; }; + F45B52B389E797C9B9A7C800 /* NSObject+Mapping.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B044E2D959C94B0DFAB8A49 /* NSObject+Mapping.m */; }; FA5DD0FCED9120DA3770B47B /* QueryTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8B0E7AC436F4721B6F88C01C /* QueryTests.swift */; }; FA6EAC4599B1A5E2440540C8 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6BA27F6296064D375F4EC1D9 /* Foundation.framework */; }; + FBF6D80206DEFBF8018CE86A /* NSString+OHSerialization.h in Headers */ = {isa = PBXBuildFile; fileRef = 1D4B68E6001A4102408F0965 /* NSString+OHSerialization.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -143,67 +143,67 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 00AAFB8FF94890F3A79EF342 /* OHMySQLConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLConfiguration.m; sourceTree = ""; }; 02FFD433639083362E497B1A /* XCTestCase+Utility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestCase+Utility.swift"; sourceTree = ""; }; - 07FA26394A693BEA959D935C /* NSData+OHSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+OHSerialization.m"; sourceTree = ""; }; - 0CBA397A869931CE9A0028B6 /* NSString+Utility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Utility.m"; sourceTree = ""; }; - 0E9477DF0068596D4ADD1F82 /* NSNumber+OHSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSNumber+OHSerialization.m"; sourceTree = ""; }; + 0AE8E69A0EFA1A0F8577F949 /* NSNumber+OHSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSNumber+OHSerialization.m"; sourceTree = ""; }; 0F02FB24BEE828CAD824A73E /* OHMySQL.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OHMySQL.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 155949D8DDC3F04CA50728E2 /* OHMySQL.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQL.h; sourceTree = ""; }; - 1DDF3E4FF6792F68F39C0935 /* OHJoinConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHJoinConstants.h; sourceTree = ""; }; + 1954C0291FA63B50FFFC3512 /* OHSSLConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHSSLConfig.h; sourceTree = ""; }; + 1D4B68E6001A4102408F0965 /* NSString+OHSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+OHSerialization.h"; sourceTree = ""; }; 1E79627101CEA0E3DEB1C2C1 /* OHMySQL-macOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = "OHMySQL-macOS.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; - 20020A05D168A5C6059D59D6 /* OHJoinConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHJoinConstants.m; sourceTree = ""; }; - 2095B2974FDD55CED704F068 /* OHConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHConstants.h; sourceTree = ""; }; - 20A9008547AEB1A5738FAFAE /* OHMySQLStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLStore.m; sourceTree = ""; }; - 2A6D80A5B242875642DF2744 /* NSString+OHSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+OHSerialization.m"; sourceTree = ""; }; + 24763759BD6A11A0F65F813C /* NSString+Utility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Utility.m"; sourceTree = ""; }; + 263DBBC085ED734F41082E68 /* OHMySQLConfiguration.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLConfiguration.m; sourceTree = ""; }; + 2BF1086100D257D3E4FF72F7 /* OHMySQLStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLStore.h; sourceTree = ""; }; + 2D21E3DA1BB4B1BE2743A31F /* NSData+OHSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+OHSerialization.m"; sourceTree = ""; }; 35534A48E8F3A16FE19FFD94 /* StoreCoordinatorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreCoordinatorTests.swift; sourceTree = ""; }; - 3E13114042F143778DA7C666 /* NSObject+Mapping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Mapping.m"; sourceTree = ""; }; - 3E91AE30F4BE598D8BCA6BC5 /* OHMySQLConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLConfiguration.h; sourceTree = ""; }; - 40C2551D0475779E22E3C105 /* CharsetEncoding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CharsetEncoding.h; sourceTree = ""; }; - 40F1DF80A522EB85A7BB9389 /* OHResultErrorType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHResultErrorType.h; sourceTree = ""; }; 41DEC8F2733508C1207AE09C /* OHMySQLSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLSerialization.h; sourceTree = ""; }; 45DC9FC4ED3BC3A2F3B52BD2 /* ObjectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ObjectTests.swift; sourceTree = ""; }; 47105C5061A672559C75E4D0 /* OHMySQLMappingProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLMappingProtocol.h; sourceTree = ""; }; - 4C01D6C8FC6B61302484AA37 /* OHLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHLogging.h; sourceTree = ""; }; + 4C501CC03473A4EDFD43228B /* OHJoinConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHJoinConstants.m; sourceTree = ""; }; 584C06F6CE1DEE4DE17EA2DD /* OHMySQLQueryRequestFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLQueryRequestFactory.h; sourceTree = ""; }; + 594115E6AFBA88F907AD332D /* NSString+Escaping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Escaping.m"; sourceTree = ""; }; + 5B044E2D959C94B0DFAB8A49 /* NSObject+Mapping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSObject+Mapping.m"; sourceTree = ""; }; 5B8A6C36E9B38D6C20652459 /* MySQL.xcframework */ = {isa = PBXFileReference; expectedSignature = "SelfSigned:F5D1C04A2C9F0FD8D4E09008425773D57EB5530308F5DAED2ECE85EA7487E92B"; lastKnownFileType = wrapper.xcframework; name = MySQL.xcframework; path = OHMySQL/lib/MySQL.xcframework; sourceTree = ""; }; + 5D9B78743A987F01BEE6FF06 /* CharsetEncoding.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CharsetEncoding.m; sourceTree = ""; }; 5DBE81AF9B2C70DFF9885D48 /* OHMySQLQueryRequestFactory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLQueryRequestFactory.m; sourceTree = ""; }; + 5EA485F418776C741F5F534A /* OHResultErrorType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHResultErrorType.m; sourceTree = ""; }; 5EE99441999A137908029090 /* OHMySQLQueryContext.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLQueryContext.m; sourceTree = ""; }; - 6AAF06B107DDE779C643F60B /* OHMySQLQueryTimeline.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLQueryTimeline.h; sourceTree = ""; }; + 64F73393620B7B029EF98D5A /* CharsetEncoding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CharsetEncoding.h; sourceTree = ""; }; 6BA27F6296064D375F4EC1D9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6CB45069021220F00F7B52D4 /* SelectTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectTests.swift; sourceTree = ""; }; - 6DCD5707A8D9740BB4DC0EEA /* NSString+Escaping.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+Escaping.m"; sourceTree = ""; }; 72EB0CA08D7366D7AB4D1D9A /* OHMySQLContainer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLContainer.m; sourceTree = ""; }; - 75F1B9A9E57AF09470E2ED9B /* OHMySQLQueryRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLQueryRequest.h; sourceTree = ""; }; - 78C4EFDB51A00C06C828ACF1 /* OHSSLConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHSSLConfig.h; sourceTree = ""; }; + 777D928766E968861926B7F0 /* OHMySQLConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLConfiguration.h; sourceTree = ""; }; + 7A30EC09F3678FC28556B695 /* OHMySQLQueryRequest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLQueryRequest.h; sourceTree = ""; }; 7A701800558CBE398C725A05 /* EscapeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EscapeTests.swift; sourceTree = ""; }; - 7BCC2C529CF6265C285856F2 /* OHMySQLQueryRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLQueryRequest.m; sourceTree = ""; }; - 88801128DFDA3466BCA1C8B4 /* OHMySQLQueryTimeline.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLQueryTimeline.m; sourceTree = ""; }; + 7DB4D3ED3A2742E02297F39C /* NSString+Escaping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Escaping.h"; sourceTree = ""; }; + 7E412B5642D45541B92E3ECC /* OHRefreshOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHRefreshOption.h; sourceTree = ""; }; + 7EE3013CD26E88C32C041C32 /* NSString+OHSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+OHSerialization.m"; sourceTree = ""; }; + 85E36ADA72FBBD4F968EE678 /* OHSSLConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHSSLConfig.m; sourceTree = ""; }; + 86B95C8E69A78ECA9022CF03 /* NSData+OHSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+OHSerialization.h"; sourceTree = ""; }; 8B0E7AC436F4721B6F88C01C /* QueryTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueryTests.swift; sourceTree = ""; }; - 8E285C3CDD8788EFAC8595C6 /* OHRefreshOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHRefreshOption.h; sourceTree = ""; }; - 9B3A81B9ED87328A91D7AADF /* OHProtocolType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHProtocolType.h; sourceTree = ""; }; - A20ECBF4A82262860B9E4FDE /* NSNumber+OHSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSNumber+OHSerialization.h"; sourceTree = ""; }; + 9A7F64FC4DE82A268EA7563F /* OHMySQLStore.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLStore.m; sourceTree = ""; }; + 9E194F2509AA339E584CA6C4 /* OHMySQLQueryTimeline.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLQueryTimeline.h; sourceTree = ""; }; + 9E2C3CB0E20998D85076FE2D /* OHLogging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHLogging.h; sourceTree = ""; }; + A782FE266DE15545389DE520 /* OHJoinConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHJoinConstants.h; sourceTree = ""; }; B11DB1140606AFA9AC6961BB /* TestPerson.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestPerson.swift; sourceTree = ""; }; - B13AB92A8DFC315226F26B83 /* NSString+OHSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+OHSerialization.h"; sourceTree = ""; }; + B3149A8E16F4F31FF646F7C8 /* NSString+Utility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Utility.h"; sourceTree = ""; }; BAB51A09B7C7D7F716CAE4E0 /* OHMySQLQueryContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLQueryContext.h; sourceTree = ""; }; - C435FA9DF07CBBEB4147B3EB /* CharsetEncoding.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CharsetEncoding.m; sourceTree = ""; }; - C53393F7981927F4CE736CEA /* NSString+Escaping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Escaping.h"; sourceTree = ""; }; - CCB1BF92B5208C7CA889C6FE /* OHMySQLStore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLStore.h; sourceTree = ""; }; - CCD4EE2692BBF08E1135E596 /* OHSSLConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHSSLConfig.m; sourceTree = ""; }; CF6E113C7B1E1F43F6E289F2 /* OHMySQLStoreCoordinator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLStoreCoordinator.m; sourceTree = ""; }; D386C12C577B071B5386C471 /* OHMySQLContainer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLContainer.h; sourceTree = ""; }; D3D05CFA604B03FB957D3A76 /* OHMySQL.docc */ = {isa = PBXFileReference; lastKnownFileType = folder.documentationcatalog; path = OHMySQL.docc; sourceTree = ""; }; + D5DB8438A7153CC64A50A58A /* OHMySQLQueryRequest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLQueryRequest.m; sourceTree = ""; }; D7276E6E6BB6B32F193BD678 /* OpenSSL.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:67RAULRX93:Marcin Krzyzanowski"; lastKnownFileType = wrapper.xcframework; name = OpenSSL.xcframework; path = OHMySQL/lib/OpenSSL.xcframework; sourceTree = ""; }; + D989D4A95C6A58D5EE126476 /* OHConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHConstants.h; sourceTree = ""; }; DAD9266AF8FD656D4C28C091 /* OHMySQLTests.xctest */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.cfbundle; path = OHMySQLTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DB5DEB27B7B68688529056B0 /* OHResultErrorType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHResultErrorType.m; sourceTree = ""; }; - DE242D80A01F5A9E50D12F7F /* NSObject+Mapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Mapping.h"; sourceTree = ""; }; - DEEEEF538AE9BF689B278EE2 /* NSData+OHSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+OHSerialization.h"; sourceTree = ""; }; E362352B7CD1893B51B3E606 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; - E5C689BDDAFA2C8F9A671123 /* NSString+Utility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+Utility.h"; sourceTree = ""; }; E8CE23805D0B550224EEF929 /* OHSerializationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHSerializationProtocol.h; sourceTree = ""; }; + EA845377406399FE522F9C22 /* OHResultErrorType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHResultErrorType.h; sourceTree = ""; }; EAB98B038BC80CE968997140 /* OHMySQLStoreCoordinator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHMySQLStoreCoordinator.h; sourceTree = ""; }; F5075398C1297B498D695C82 /* OHMySQLSerialization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLSerialization.m; sourceTree = ""; }; + F73F9CA179A402DDC36DE18D /* NSObject+Mapping.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSObject+Mapping.h"; sourceTree = ""; }; + FB86682A4F243FBB8F7821E8 /* NSNumber+OHSerialization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSNumber+OHSerialization.h"; sourceTree = ""; }; FC242ECF51558924B70DE100 /* NullTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NullTests.swift; sourceTree = ""; }; + FD7AE1703B35CF3CA656382D /* OHProtocolType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OHProtocolType.h; sourceTree = ""; }; + FF84201C4F4A7A4ABA52B1E8 /* OHMySQLQueryTimeline.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OHMySQLQueryTimeline.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -240,44 +240,54 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 11BBD027F87C7196D44CCEB7 /* Categories */ = { - isa = PBXGroup; - children = ( - DEEEEF538AE9BF689B278EE2 /* NSData+OHSerialization.h */, - 07FA26394A693BEA959D935C /* NSData+OHSerialization.m */, - A20ECBF4A82262860B9E4FDE /* NSNumber+OHSerialization.h */, - 0E9477DF0068596D4ADD1F82 /* NSNumber+OHSerialization.m */, - DE242D80A01F5A9E50D12F7F /* NSObject+Mapping.h */, - 3E13114042F143778DA7C666 /* NSObject+Mapping.m */, - C53393F7981927F4CE736CEA /* NSString+Escaping.h */, - 6DCD5707A8D9740BB4DC0EEA /* NSString+Escaping.m */, - B13AB92A8DFC315226F26B83 /* NSString+OHSerialization.h */, - 2A6D80A5B242875642DF2744 /* NSString+OHSerialization.m */, - E5C689BDDAFA2C8F9A671123 /* NSString+Utility.h */, - 0CBA397A869931CE9A0028B6 /* NSString+Utility.m */, - ); - path = Categories; - sourceTree = ""; - }; 18DFDFF8059A5C7FEE7AF586 /* Sources */ = { isa = PBXGroup; children = ( + 64F73393620B7B029EF98D5A /* CharsetEncoding.h */, + 5D9B78743A987F01BEE6FF06 /* CharsetEncoding.m */, + 86B95C8E69A78ECA9022CF03 /* NSData+OHSerialization.h */, + 2D21E3DA1BB4B1BE2743A31F /* NSData+OHSerialization.m */, + FB86682A4F243FBB8F7821E8 /* NSNumber+OHSerialization.h */, + 0AE8E69A0EFA1A0F8577F949 /* NSNumber+OHSerialization.m */, + F73F9CA179A402DDC36DE18D /* NSObject+Mapping.h */, + 5B044E2D959C94B0DFAB8A49 /* NSObject+Mapping.m */, + 7DB4D3ED3A2742E02297F39C /* NSString+Escaping.h */, + 594115E6AFBA88F907AD332D /* NSString+Escaping.m */, + 1D4B68E6001A4102408F0965 /* NSString+OHSerialization.h */, + 7EE3013CD26E88C32C041C32 /* NSString+OHSerialization.m */, + B3149A8E16F4F31FF646F7C8 /* NSString+Utility.h */, + 24763759BD6A11A0F65F813C /* NSString+Utility.m */, + D989D4A95C6A58D5EE126476 /* OHConstants.h */, + A782FE266DE15545389DE520 /* OHJoinConstants.h */, + 4C501CC03473A4EDFD43228B /* OHJoinConstants.m */, + 9E2C3CB0E20998D85076FE2D /* OHLogging.h */, 155949D8DDC3F04CA50728E2 /* OHMySQL.h */, + 777D928766E968861926B7F0 /* OHMySQLConfiguration.h */, + 263DBBC085ED734F41082E68 /* OHMySQLConfiguration.m */, D386C12C577B071B5386C471 /* OHMySQLContainer.h */, 72EB0CA08D7366D7AB4D1D9A /* OHMySQLContainer.m */, 47105C5061A672559C75E4D0 /* OHMySQLMappingProtocol.h */, BAB51A09B7C7D7F716CAE4E0 /* OHMySQLQueryContext.h */, 5EE99441999A137908029090 /* OHMySQLQueryContext.m */, + 7A30EC09F3678FC28556B695 /* OHMySQLQueryRequest.h */, + D5DB8438A7153CC64A50A58A /* OHMySQLQueryRequest.m */, 584C06F6CE1DEE4DE17EA2DD /* OHMySQLQueryRequestFactory.h */, 5DBE81AF9B2C70DFF9885D48 /* OHMySQLQueryRequestFactory.m */, + 9E194F2509AA339E584CA6C4 /* OHMySQLQueryTimeline.h */, + FF84201C4F4A7A4ABA52B1E8 /* OHMySQLQueryTimeline.m */, 41DEC8F2733508C1207AE09C /* OHMySQLSerialization.h */, F5075398C1297B498D695C82 /* OHMySQLSerialization.m */, + 2BF1086100D257D3E4FF72F7 /* OHMySQLStore.h */, + 9A7F64FC4DE82A268EA7563F /* OHMySQLStore.m */, EAB98B038BC80CE968997140 /* OHMySQLStoreCoordinator.h */, CF6E113C7B1E1F43F6E289F2 /* OHMySQLStoreCoordinator.m */, + FD7AE1703B35CF3CA656382D /* OHProtocolType.h */, + 7E412B5642D45541B92E3ECC /* OHRefreshOption.h */, + EA845377406399FE522F9C22 /* OHResultErrorType.h */, + 5EA485F418776C741F5F534A /* OHResultErrorType.m */, E8CE23805D0B550224EEF929 /* OHSerializationProtocol.h */, - 11BBD027F87C7196D44CCEB7 /* Categories */, - F939981110F8BE17E66A5E87 /* Constants */, - 89015983E662663D2F4B9B74 /* Models */, + 1954C0291FA63B50FFFC3512 /* OHSSLConfig.h */, + 85E36ADA72FBBD4F968EE678 /* OHSSLConfig.m */, ); name = Sources; path = OHMySQL/Sources; @@ -329,23 +339,6 @@ path = OHMySQL/Tests; sourceTree = ""; }; - 89015983E662663D2F4B9B74 /* Models */ = { - isa = PBXGroup; - children = ( - 3E91AE30F4BE598D8BCA6BC5 /* OHMySQLConfiguration.h */, - 00AAFB8FF94890F3A79EF342 /* OHMySQLConfiguration.m */, - 75F1B9A9E57AF09470E2ED9B /* OHMySQLQueryRequest.h */, - 7BCC2C529CF6265C285856F2 /* OHMySQLQueryRequest.m */, - 6AAF06B107DDE779C643F60B /* OHMySQLQueryTimeline.h */, - 88801128DFDA3466BCA1C8B4 /* OHMySQLQueryTimeline.m */, - CCB1BF92B5208C7CA889C6FE /* OHMySQLStore.h */, - 20A9008547AEB1A5738FAFAE /* OHMySQLStore.m */, - 78C4EFDB51A00C06C828ACF1 /* OHSSLConfig.h */, - CCD4EE2692BBF08E1135E596 /* OHSSLConfig.m */, - ); - path = Models; - sourceTree = ""; - }; 9E7AA0D74862D8992157F014 /* Products */ = { isa = PBXGroup; children = ( @@ -364,23 +357,6 @@ path = Helpers; sourceTree = ""; }; - F939981110F8BE17E66A5E87 /* Constants */ = { - isa = PBXGroup; - children = ( - 40C2551D0475779E22E3C105 /* CharsetEncoding.h */, - C435FA9DF07CBBEB4147B3EB /* CharsetEncoding.m */, - 2095B2974FDD55CED704F068 /* OHConstants.h */, - 1DDF3E4FF6792F68F39C0935 /* OHJoinConstants.h */, - 20020A05D168A5C6059D59D6 /* OHJoinConstants.m */, - 4C01D6C8FC6B61302484AA37 /* OHLogging.h */, - 9B3A81B9ED87328A91D7AADF /* OHProtocolType.h */, - 8E285C3CDD8788EFAC8595C6 /* OHRefreshOption.h */, - 40F1DF80A522EB85A7BB9389 /* OHResultErrorType.h */, - DB5DEB27B7B68688529056B0 /* OHResultErrorType.m */, - ); - path = Constants; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -388,31 +364,31 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - E461EB7E60AA0578F710FD85 /* CharsetEncoding.h in Headers */, - B210C1BC7C6D8B94C1AC0941 /* NSData+OHSerialization.h in Headers */, - 158F6D1B0FDC811545354504 /* NSNumber+OHSerialization.h in Headers */, - E2562FA4DF43F4279A9B5DF7 /* NSObject+Mapping.h in Headers */, - 42560D13B9D110914C543850 /* NSString+Escaping.h in Headers */, - 72DC65B9283DA427FB9CA662 /* NSString+OHSerialization.h in Headers */, - A0F3B0E61DE90ADF1DF00EDA /* NSString+Utility.h in Headers */, - 2336A6E3E7E0566C1AA7DF66 /* OHConstants.h in Headers */, - 18FFF84E8BA6D15879FC16A9 /* OHJoinConstants.h in Headers */, - 84DC055F3263F06AE950A6EC /* OHLogging.h in Headers */, + 0192478A1B7CDE3BA25C226C /* CharsetEncoding.h in Headers */, + 8BE8B041F5B61D71FDCECF90 /* NSData+OHSerialization.h in Headers */, + BE251893423297A820CF5082 /* NSNumber+OHSerialization.h in Headers */, + 21D26AB5E93767333AF83FC1 /* NSObject+Mapping.h in Headers */, + 2CA909CF1362B69847D6E408 /* NSString+Escaping.h in Headers */, + ACB33550BC248168FC1D74D2 /* NSString+OHSerialization.h in Headers */, + 50E3043BBA188160EDACAFA9 /* NSString+Utility.h in Headers */, + 12C600FC2FAEEA28DB0941B5 /* OHConstants.h in Headers */, + 9397F5394126E1003CD67179 /* OHJoinConstants.h in Headers */, + 1A748B6FAF70E2DF8C527585 /* OHLogging.h in Headers */, 1CC532F70EA9EF547E297E53 /* OHMySQL.h in Headers */, - 443102DA23C2AB9465935364 /* OHMySQLConfiguration.h in Headers */, + 3886E841E8136885AD8E38D6 /* OHMySQLConfiguration.h in Headers */, B4CA850D9E811E4CDC2DC52D /* OHMySQLContainer.h in Headers */, 291458F4063714E8D842FB95 /* OHMySQLMappingProtocol.h in Headers */, 93C82CDC303D2E7CF624724B /* OHMySQLQueryContext.h in Headers */, - ED0895056A8B6ABE40383EDF /* OHMySQLQueryRequest.h in Headers */, + 44AA464CEA0F16AB146EEB30 /* OHMySQLQueryRequest.h in Headers */, CC92E4B982530C3B15376D2D /* OHMySQLQueryRequestFactory.h in Headers */, - C618B25C46E8F9D4708821BB /* OHMySQLQueryTimeline.h in Headers */, + 4CF0090434ADCEF42F62B625 /* OHMySQLQueryTimeline.h in Headers */, 243576990EE6B1D271E3964E /* OHMySQLSerialization.h in Headers */, - 5712765F35D53BFB5749EC5C /* OHMySQLStore.h in Headers */, + 47E1A861083AE57B6F72F89D /* OHMySQLStore.h in Headers */, DD3E5167406AE5AB8154C10B /* OHMySQLStoreCoordinator.h in Headers */, - 4898DB98206A58A3C09E3EA1 /* OHProtocolType.h in Headers */, - 73B4FAD95B64322E30C244CF /* OHRefreshOption.h in Headers */, - 230F6EB7745BC97E938CA2A8 /* OHResultErrorType.h in Headers */, - AD2F9A2C510BEC5CBC6ACEC2 /* OHSSLConfig.h in Headers */, + 7C4301A75E855F6EC28A092B /* OHProtocolType.h in Headers */, + 1F83825C7379B2E8E0D16A00 /* OHRefreshOption.h in Headers */, + CE8A5CB3E11E7719CDF4615E /* OHResultErrorType.h in Headers */, + 389D6534EAEF8B084E70DD4D /* OHSSLConfig.h in Headers */, EB0036B4A4364DC49548C3A0 /* OHSerializationProtocol.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -421,31 +397,31 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 8BF730F7DABC48EC88812A19 /* CharsetEncoding.h in Headers */, - 143B43EBFD55D04D48BC0CAD /* NSData+OHSerialization.h in Headers */, - 00B4DA0E414697F91E957799 /* NSNumber+OHSerialization.h in Headers */, - 609FE148C247D6D332829A52 /* NSObject+Mapping.h in Headers */, - 850E638B19296C60F5F78898 /* NSString+Escaping.h in Headers */, - E765317097A85B2A31FF7063 /* NSString+OHSerialization.h in Headers */, - 4DCDE1F137D7A665AABD1AF7 /* NSString+Utility.h in Headers */, - 6E7A686AFFCBB0C0595C0209 /* OHConstants.h in Headers */, - 84414D306F6C5FCD579FAA61 /* OHJoinConstants.h in Headers */, - A4CD88E62EADE97E3D87AEED /* OHLogging.h in Headers */, + 2EF694D8B02FC2ACF3BC7AC2 /* CharsetEncoding.h in Headers */, + 34C4CA4C1ACE19170C39ABD3 /* NSData+OHSerialization.h in Headers */, + 014B4E848FFB55094F038C4F /* NSNumber+OHSerialization.h in Headers */, + 24240B505BE45B389AF00367 /* NSObject+Mapping.h in Headers */, + F4586F4F2B8B4F33F11EB217 /* NSString+Escaping.h in Headers */, + FBF6D80206DEFBF8018CE86A /* NSString+OHSerialization.h in Headers */, + BEE76A26B93870EFCC3E4325 /* NSString+Utility.h in Headers */, + E0DF6671C6E543462AA3E26C /* OHConstants.h in Headers */, + 96084878DF9D641A66955541 /* OHJoinConstants.h in Headers */, + E815EF5F1C2E0F665AC2E211 /* OHLogging.h in Headers */, ECBE24F6334DCACEFAF91161 /* OHMySQL.h in Headers */, - B82E69B0D20B487E450F886C /* OHMySQLConfiguration.h in Headers */, + 396F72D505C20B07CEA89EC0 /* OHMySQLConfiguration.h in Headers */, 6A4A434692EB70251D83C981 /* OHMySQLContainer.h in Headers */, 1985A4E153E316B7712ABCF7 /* OHMySQLMappingProtocol.h in Headers */, 6DFDFD0A061DE720066857DE /* OHMySQLQueryContext.h in Headers */, - A8C2B05261728B9615E136D6 /* OHMySQLQueryRequest.h in Headers */, + 4D1C9402B2B3C714E06F8775 /* OHMySQLQueryRequest.h in Headers */, 54FAA2925F21FC1D866AB60F /* OHMySQLQueryRequestFactory.h in Headers */, - 1CA6788192D0B4A7160FF545 /* OHMySQLQueryTimeline.h in Headers */, + 8A0B765CAA8B674D077A4D65 /* OHMySQLQueryTimeline.h in Headers */, C698455FB70D55A62374FA52 /* OHMySQLSerialization.h in Headers */, - 8DB3BB21CFAD95804322C8A1 /* OHMySQLStore.h in Headers */, + 5B9B24C7FE00C4FAD7279349 /* OHMySQLStore.h in Headers */, 44802D966EF212440CEF9920 /* OHMySQLStoreCoordinator.h in Headers */, - 005809C0892DD9D071B8CD74 /* OHProtocolType.h in Headers */, - 193AF978B20D7D8EE537722E /* OHRefreshOption.h in Headers */, - C5731890169F3EC783E079E0 /* OHResultErrorType.h in Headers */, - 290EB97A1DE3A79D4DCF86E1 /* OHSSLConfig.h in Headers */, + B1A6AF854DB916385A58BC3E /* OHProtocolType.h in Headers */, + E1AD7D9EE10F92E94852D6C0 /* OHRefreshOption.h in Headers */, + B5378119C2EF99B8325A771F /* OHResultErrorType.h in Headers */, + 75CCBC666BB28D5EABE750B6 /* OHSSLConfig.h in Headers */, 766D4620DF6ED4D450CAABB7 /* OHSerializationProtocol.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; @@ -545,26 +521,26 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 174B05F6FB0E2150194BC81B /* CharsetEncoding.m in Sources */, - 452ECD34F5BC039616D3C186 /* NSData+OHSerialization.m in Sources */, - D59B923768E5CEB93D26FB56 /* NSNumber+OHSerialization.m in Sources */, - 96441F9E94FE7B9D617F520B /* NSObject+Mapping.m in Sources */, - 8454C50FF8885E131E5C00A0 /* NSString+Escaping.m in Sources */, - 062DDCC2233C29DB0B8D620F /* NSString+OHSerialization.m in Sources */, - 2368DBBC1D660C0170B2D95B /* NSString+Utility.m in Sources */, - E1B6DBB08CA3E575A235DA25 /* OHJoinConstants.m in Sources */, + 56FDFB4ECE8EFC962F7EA1CC /* CharsetEncoding.m in Sources */, + E899FE953FFF437C3A367962 /* NSData+OHSerialization.m in Sources */, + AEE1E73534C17364D7D9ACC7 /* NSNumber+OHSerialization.m in Sources */, + F45B52B389E797C9B9A7C800 /* NSObject+Mapping.m in Sources */, + 5518442901F75016077452EC /* NSString+Escaping.m in Sources */, + 6F32677CE7A7BB0B82D00C02 /* NSString+OHSerialization.m in Sources */, + 8B7A09B623580DFC607B987F /* NSString+Utility.m in Sources */, + BB29A6C85A814C1F9F07D2AF /* OHJoinConstants.m in Sources */, 28F7974B0B1C777196137E7D /* OHMySQL.docc in Sources */, - C53F7B245861D5AEB5F892DF /* OHMySQLConfiguration.m in Sources */, + A517C72F7ECBB0D75497103C /* OHMySQLConfiguration.m in Sources */, 6A3506330E1C34EBAD516D47 /* OHMySQLContainer.m in Sources */, 29C75B381C2315C76664A364 /* OHMySQLQueryContext.m in Sources */, - F2A2E06FFCE6D0E8086E5A90 /* OHMySQLQueryRequest.m in Sources */, + 42D85C51A134597B4AA44FE6 /* OHMySQLQueryRequest.m in Sources */, 63FEAB34E96CE2774B8126A2 /* OHMySQLQueryRequestFactory.m in Sources */, - A644FFE148CEC24D087EB39B /* OHMySQLQueryTimeline.m in Sources */, + D26C26CF6D4E02CA48FF0C5C /* OHMySQLQueryTimeline.m in Sources */, 9F870272FE634E7E7DC2D820 /* OHMySQLSerialization.m in Sources */, - 609A328E32E1E41B3C1F34F4 /* OHMySQLStore.m in Sources */, + CC03DA763AB0A85D747744E6 /* OHMySQLStore.m in Sources */, C71BC6C54B61E5F0ED8EC095 /* OHMySQLStoreCoordinator.m in Sources */, - 06E7AEDE3F461A3DD197BF1C /* OHResultErrorType.m in Sources */, - 5374C139228ED40EF0A289A6 /* OHSSLConfig.m in Sources */, + 78283D58B4CF523483AC0A81 /* OHResultErrorType.m in Sources */, + 8975FE0FC18BD2A1DA90946E /* OHSSLConfig.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -572,25 +548,25 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A7714A702C013FCD73EDBA5E /* CharsetEncoding.m in Sources */, - 32D2EC74D9D75786B1CA365E /* NSData+OHSerialization.m in Sources */, - 9A9241C2807F3143B42D8356 /* NSNumber+OHSerialization.m in Sources */, - C0A7E75BC543320FB52CE6C2 /* NSObject+Mapping.m in Sources */, - 77B61F0E8CCD99EBA466A660 /* NSString+Escaping.m in Sources */, - 3A4B7A86A281367A7482550F /* NSString+OHSerialization.m in Sources */, - 75F2A43483DFBD1D21A9CF19 /* NSString+Utility.m in Sources */, - 1B24DCB86AA88CA0DA7CE169 /* OHJoinConstants.m in Sources */, - 685715D1BA23B2085D0A956F /* OHMySQLConfiguration.m in Sources */, + C9FC5C168B6E2339E97EB455 /* CharsetEncoding.m in Sources */, + 081BF69BE73EC52BAEDAE7E1 /* NSData+OHSerialization.m in Sources */, + 1991805F8E9C87F2F6565904 /* NSNumber+OHSerialization.m in Sources */, + AB957518304BB5131EBDCEDB /* NSObject+Mapping.m in Sources */, + 62A0074BC0EBED5640D13A74 /* NSString+Escaping.m in Sources */, + 4F05930FDDDA499786B6D595 /* NSString+OHSerialization.m in Sources */, + B230CCCF95C6C0344EAA0046 /* NSString+Utility.m in Sources */, + AA7F900FC4DAA3A15400A482 /* OHJoinConstants.m in Sources */, + E69D8F70E366756D8AF2714D /* OHMySQLConfiguration.m in Sources */, 4506EBC504BDBF793CB865EB /* OHMySQLContainer.m in Sources */, 6650DD9E6FA148E9E64EB090 /* OHMySQLQueryContext.m in Sources */, - 0EBFE0E530A3231E191FE3E2 /* OHMySQLQueryRequest.m in Sources */, + 34CD13E14A43FFC8BB67665E /* OHMySQLQueryRequest.m in Sources */, 98E28F19278A60D04CB5A3AB /* OHMySQLQueryRequestFactory.m in Sources */, - E563638CCEDED18847646DDC /* OHMySQLQueryTimeline.m in Sources */, + BE0BF724E4819E3361A0443C /* OHMySQLQueryTimeline.m in Sources */, 0287C0BECF102A94159AF3FB /* OHMySQLSerialization.m in Sources */, - E3E113AB2744582174F39643 /* OHMySQLStore.m in Sources */, + CAE51ADE7AB2432E9D84455D /* OHMySQLStore.m in Sources */, 0E348A0F31336F7F4E1CFD57 /* OHMySQLStoreCoordinator.m in Sources */, - 15BB128CB6EE45B8420BB3D4 /* OHResultErrorType.m in Sources */, - 18C0D86A8485AFBEED35B342 /* OHSSLConfig.m in Sources */, + EB37ABC2D63BA2C394A08850 /* OHResultErrorType.m in Sources */, + 56D5D2C71A6CC11022EFA12F /* OHSSLConfig.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/OHMySQL/Sources/Constants/CharsetEncoding.h b/OHMySQL/Sources/CharsetEncoding.h similarity index 100% rename from OHMySQL/Sources/Constants/CharsetEncoding.h rename to OHMySQL/Sources/CharsetEncoding.h diff --git a/OHMySQL/Sources/Constants/CharsetEncoding.m b/OHMySQL/Sources/CharsetEncoding.m similarity index 100% rename from OHMySQL/Sources/Constants/CharsetEncoding.m rename to OHMySQL/Sources/CharsetEncoding.m diff --git a/OHMySQL/Sources/Categories/NSData+OHSerialization.h b/OHMySQL/Sources/NSData+OHSerialization.h similarity index 100% rename from OHMySQL/Sources/Categories/NSData+OHSerialization.h rename to OHMySQL/Sources/NSData+OHSerialization.h diff --git a/OHMySQL/Sources/Categories/NSData+OHSerialization.m b/OHMySQL/Sources/NSData+OHSerialization.m similarity index 100% rename from OHMySQL/Sources/Categories/NSData+OHSerialization.m rename to OHMySQL/Sources/NSData+OHSerialization.m diff --git a/OHMySQL/Sources/Categories/NSNumber+OHSerialization.h b/OHMySQL/Sources/NSNumber+OHSerialization.h similarity index 100% rename from OHMySQL/Sources/Categories/NSNumber+OHSerialization.h rename to OHMySQL/Sources/NSNumber+OHSerialization.h diff --git a/OHMySQL/Sources/Categories/NSNumber+OHSerialization.m b/OHMySQL/Sources/NSNumber+OHSerialization.m similarity index 100% rename from OHMySQL/Sources/Categories/NSNumber+OHSerialization.m rename to OHMySQL/Sources/NSNumber+OHSerialization.m diff --git a/OHMySQL/Sources/Categories/NSObject+Mapping.h b/OHMySQL/Sources/NSObject+Mapping.h similarity index 100% rename from OHMySQL/Sources/Categories/NSObject+Mapping.h rename to OHMySQL/Sources/NSObject+Mapping.h diff --git a/OHMySQL/Sources/Categories/NSObject+Mapping.m b/OHMySQL/Sources/NSObject+Mapping.m similarity index 100% rename from OHMySQL/Sources/Categories/NSObject+Mapping.m rename to OHMySQL/Sources/NSObject+Mapping.m diff --git a/OHMySQL/Sources/Categories/NSString+Escaping.h b/OHMySQL/Sources/NSString+Escaping.h similarity index 100% rename from OHMySQL/Sources/Categories/NSString+Escaping.h rename to OHMySQL/Sources/NSString+Escaping.h diff --git a/OHMySQL/Sources/Categories/NSString+Escaping.m b/OHMySQL/Sources/NSString+Escaping.m similarity index 100% rename from OHMySQL/Sources/Categories/NSString+Escaping.m rename to OHMySQL/Sources/NSString+Escaping.m diff --git a/OHMySQL/Sources/Categories/NSString+OHSerialization.h b/OHMySQL/Sources/NSString+OHSerialization.h similarity index 100% rename from OHMySQL/Sources/Categories/NSString+OHSerialization.h rename to OHMySQL/Sources/NSString+OHSerialization.h diff --git a/OHMySQL/Sources/Categories/NSString+OHSerialization.m b/OHMySQL/Sources/NSString+OHSerialization.m similarity index 100% rename from OHMySQL/Sources/Categories/NSString+OHSerialization.m rename to OHMySQL/Sources/NSString+OHSerialization.m diff --git a/OHMySQL/Sources/Categories/NSString+Utility.h b/OHMySQL/Sources/NSString+Utility.h similarity index 100% rename from OHMySQL/Sources/Categories/NSString+Utility.h rename to OHMySQL/Sources/NSString+Utility.h diff --git a/OHMySQL/Sources/Categories/NSString+Utility.m b/OHMySQL/Sources/NSString+Utility.m similarity index 100% rename from OHMySQL/Sources/Categories/NSString+Utility.m rename to OHMySQL/Sources/NSString+Utility.m diff --git a/OHMySQL/Sources/Constants/OHConstants.h b/OHMySQL/Sources/OHConstants.h similarity index 100% rename from OHMySQL/Sources/Constants/OHConstants.h rename to OHMySQL/Sources/OHConstants.h diff --git a/OHMySQL/Sources/Constants/OHJoinConstants.h b/OHMySQL/Sources/OHJoinConstants.h similarity index 100% rename from OHMySQL/Sources/Constants/OHJoinConstants.h rename to OHMySQL/Sources/OHJoinConstants.h diff --git a/OHMySQL/Sources/Constants/OHJoinConstants.m b/OHMySQL/Sources/OHJoinConstants.m similarity index 100% rename from OHMySQL/Sources/Constants/OHJoinConstants.m rename to OHMySQL/Sources/OHJoinConstants.m diff --git a/OHMySQL/Sources/Constants/OHLogging.h b/OHMySQL/Sources/OHLogging.h similarity index 100% rename from OHMySQL/Sources/Constants/OHLogging.h rename to OHMySQL/Sources/OHLogging.h diff --git a/OHMySQL/Sources/Models/OHMySQLConfiguration.h b/OHMySQL/Sources/OHMySQLConfiguration.h similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLConfiguration.h rename to OHMySQL/Sources/OHMySQLConfiguration.h diff --git a/OHMySQL/Sources/Models/OHMySQLConfiguration.m b/OHMySQL/Sources/OHMySQLConfiguration.m similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLConfiguration.m rename to OHMySQL/Sources/OHMySQLConfiguration.m diff --git a/OHMySQL/Sources/Models/OHMySQLQueryRequest.h b/OHMySQL/Sources/OHMySQLQueryRequest.h similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLQueryRequest.h rename to OHMySQL/Sources/OHMySQLQueryRequest.h diff --git a/OHMySQL/Sources/Models/OHMySQLQueryRequest.m b/OHMySQL/Sources/OHMySQLQueryRequest.m similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLQueryRequest.m rename to OHMySQL/Sources/OHMySQLQueryRequest.m diff --git a/OHMySQL/Sources/Models/OHMySQLQueryTimeline.h b/OHMySQL/Sources/OHMySQLQueryTimeline.h similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLQueryTimeline.h rename to OHMySQL/Sources/OHMySQLQueryTimeline.h diff --git a/OHMySQL/Sources/Models/OHMySQLQueryTimeline.m b/OHMySQL/Sources/OHMySQLQueryTimeline.m similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLQueryTimeline.m rename to OHMySQL/Sources/OHMySQLQueryTimeline.m diff --git a/OHMySQL/Sources/Models/OHMySQLStore.h b/OHMySQL/Sources/OHMySQLStore.h similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLStore.h rename to OHMySQL/Sources/OHMySQLStore.h diff --git a/OHMySQL/Sources/Models/OHMySQLStore.m b/OHMySQL/Sources/OHMySQLStore.m similarity index 100% rename from OHMySQL/Sources/Models/OHMySQLStore.m rename to OHMySQL/Sources/OHMySQLStore.m diff --git a/OHMySQL/Sources/Constants/OHProtocolType.h b/OHMySQL/Sources/OHProtocolType.h similarity index 100% rename from OHMySQL/Sources/Constants/OHProtocolType.h rename to OHMySQL/Sources/OHProtocolType.h diff --git a/OHMySQL/Sources/Constants/OHRefreshOption.h b/OHMySQL/Sources/OHRefreshOption.h similarity index 100% rename from OHMySQL/Sources/Constants/OHRefreshOption.h rename to OHMySQL/Sources/OHRefreshOption.h diff --git a/OHMySQL/Sources/Constants/OHResultErrorType.h b/OHMySQL/Sources/OHResultErrorType.h similarity index 100% rename from OHMySQL/Sources/Constants/OHResultErrorType.h rename to OHMySQL/Sources/OHResultErrorType.h diff --git a/OHMySQL/Sources/Constants/OHResultErrorType.m b/OHMySQL/Sources/OHResultErrorType.m similarity index 100% rename from OHMySQL/Sources/Constants/OHResultErrorType.m rename to OHMySQL/Sources/OHResultErrorType.m diff --git a/OHMySQL/Sources/Models/OHSSLConfig.h b/OHMySQL/Sources/OHSSLConfig.h similarity index 100% rename from OHMySQL/Sources/Models/OHSSLConfig.h rename to OHMySQL/Sources/OHSSLConfig.h diff --git a/OHMySQL/Sources/Models/OHSSLConfig.m b/OHMySQL/Sources/OHSSLConfig.m similarity index 100% rename from OHMySQL/Sources/Models/OHSSLConfig.m rename to OHMySQL/Sources/OHSSLConfig.m diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..8c32ac8 --- /dev/null +++ b/Package.swift @@ -0,0 +1,50 @@ +// swift-tools-version: 5.7 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "OHMySQL", + platforms: [ + .iOS(.v14), + .macOS(.v11) + ], + products: [ + // Products define the executables and libraries a package produces, making them visible to other packages. + .library( + name: "OHMySQL", + targets: ["OHMySQL"] + ), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + ], + targets: [ + // Targets are the basic building blocks of a package, defining a module or a test suite. + // Targets can depend on other targets in this package and products from dependencies. + .target( + name: "OHMySQL", + dependencies: ["MySQL", "OpenSSL"], + path: "OHMySQL/Sources", + resources: [.process("PrivacyInfo.xcprivacy")], + publicHeadersPath: "", + cSettings: [ + .define("SWIFT_PACKAGE") + ] + ), + .binaryTarget( + name: "MySQL", + path: "OHMySQL/lib/MySQL.xcframework" + ), + .binaryTarget( + name: "OpenSSL", + path: "OHMySQL/lib/OpenSSL.xcframework" + ), + .testTarget( + name: "OHMySQLTests", + dependencies: ["OHMySQL"], + path: "OHMySQL/Tests", + + ), + ] +) \ No newline at end of file diff --git a/PrivacyInfo.xcprivacy b/PrivacyInfo.xcprivacy new file mode 100644 index 0000000..472b9ba --- /dev/null +++ b/PrivacyInfo.xcprivacy @@ -0,0 +1,27 @@ + + + + + NSPrivacyCollectedDataTypes + + NSPrivacyAccessedAPITypes + + NSPrivacyTrackingDomains + + NSPrivacyTracking + + + NSPrivacyCollectedDataType + + NSPrivacyCollectedDataTypeLinked + + NSPrivacyCollectedDataTypeTracking + + NSPrivacyCollectedDataTypePurposes + + + + + + + diff --git a/README.md b/README.md index 6177bfd..6a433ea 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@ [![License][platform-image]][platform-url] [![License][license-image]][license-url] -[![CocoaPods Compatible][cocoapods-image]][cocoapods-url] [![Carthage Compatible][carthage-image]][carthage-url] [![Documentation][docs-image]][docs-url] diff --git a/SampleProject/OHMySQL.xcodeproj/project.pbxproj b/SampleProject/OHMySQL.xcodeproj/project.pbxproj index c4f7208..acded7c 100644 --- a/SampleProject/OHMySQL.xcodeproj/project.pbxproj +++ b/SampleProject/OHMySQL.xcodeproj/project.pbxproj @@ -3,11 +3,10 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ - 26FD804DE3AF9752104EDB1D /* Pods_OHMySQLDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 38F5F954AD80EAAD5E97C201 /* Pods_OHMySQLDemo.framework */; }; 924BF1BA292411B8009A9F69 /* MySQLDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 924BF1B9292411B8009A9F69 /* MySQLDemoApp.swift */; }; 924BF1BE292411BA009A9F69 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 924BF1BD292411BA009A9F69 /* Assets.xcassets */; }; 924BF1C1292411BA009A9F69 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 924BF1C0292411BA009A9F69 /* Preview Assets.xcassets */; }; @@ -21,11 +20,10 @@ 92D2598F2924125E00B43D8D /* TaskItemRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92775C92291ADEF10097B49C /* TaskItemRepository.swift */; }; 92D259902924125E00B43D8D /* PersistentCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 92775C90291ADEA20097B49C /* PersistentCoordinator.swift */; }; 92D259912924125E00B43D8D /* TaskItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 925EAB16287C155F00D80CA8 /* TaskItem.swift */; }; + 92FE6CAF2E536FE2004AC165 /* OHMySQL in Frameworks */ = {isa = PBXBuildFile; productRef = 92FE6CAE2E536FE2004AC165 /* OHMySQL */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1F1042AE50199E07C66B3C5F /* Pods-OHMySQLDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHMySQLDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OHMySQLDemo/Pods-OHMySQLDemo.debug.xcconfig"; sourceTree = ""; }; - 38F5F954AD80EAAD5E97C201 /* Pods_OHMySQLDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OHMySQLDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7CCC61F81B7B5661003A468F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 7CCC61FA1B7B566A003A468F /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 924BF19429240E17009A9F69 /* TaskDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskDetailsView.swift; sourceTree = ""; }; @@ -42,7 +40,6 @@ 92775C92291ADEF10097B49C /* TaskItemRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskItemRepository.swift; sourceTree = ""; }; 92775C94291ADFBF0097B49C /* TaskListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskListViewModel.swift; sourceTree = ""; }; 92B3E6AA291D96800015062A /* TaskPresentationItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskPresentationItem.swift; sourceTree = ""; }; - B9C467B052CF356E2E06989C /* Pods-OHMySQLDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OHMySQLDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-OHMySQLDemo/Pods-OHMySQLDemo.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -50,7 +47,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 26FD804DE3AF9752104EDB1D /* Pods_OHMySQLDemo.framework in Frameworks */, + 92FE6CAF2E536FE2004AC165 /* OHMySQL in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -62,7 +59,6 @@ children = ( 924BF1B8292411B8009A9F69 /* OHMySQLDemo */, FE42F509C0FD8A891F7BA875 /* Frameworks */, - 9481FD4AF0BB3CCFFB913AF8 /* Pods */, 7CCC61CA1B7B38BA003A468F /* Products */, ); sourceTree = ""; @@ -151,21 +147,11 @@ path = Models; sourceTree = ""; }; - 9481FD4AF0BB3CCFFB913AF8 /* Pods */ = { - isa = PBXGroup; - children = ( - 1F1042AE50199E07C66B3C5F /* Pods-OHMySQLDemo.debug.xcconfig */, - B9C467B052CF356E2E06989C /* Pods-OHMySQLDemo.release.xcconfig */, - ); - name = Pods; - sourceTree = ""; - }; FE42F509C0FD8A891F7BA875 /* Frameworks */ = { isa = PBXGroup; children = ( 7CCC61FA1B7B566A003A468F /* CoreFoundation.framework */, 7CCC61F81B7B5661003A468F /* Foundation.framework */, - 38F5F954AD80EAAD5E97C201 /* Pods_OHMySQLDemo.framework */, ); name = Frameworks; sourceTree = ""; @@ -177,11 +163,9 @@ isa = PBXNativeTarget; buildConfigurationList = 924BF1C2292411BA009A9F69 /* Build configuration list for PBXNativeTarget "OHMySQLDemo" */; buildPhases = ( - FB0CD5A9E4620AB9DB98ECA3 /* [CP] Check Pods Manifest.lock */, 924BF1B3292411B8009A9F69 /* Sources */, 924BF1B4292411B8009A9F69 /* Frameworks */, 924BF1B5292411B8009A9F69 /* Resources */, - 94E875029E0B3738A96EAE90 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -219,6 +203,9 @@ Base, ); mainGroup = 7CCC61C01B7B38BA003A468F; + packageReferences = ( + 92FE6CAD2E536FE2004AC165 /* XCLocalSwiftPackageReference "../../OHMySQL" */, + ); productRefGroup = 7CCC61CA1B7B38BA003A468F /* Products */; projectDirPath = ""; projectRoot = ""; @@ -240,53 +227,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 94E875029E0B3738A96EAE90 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-OHMySQLDemo/Pods-OHMySQLDemo-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OHMySQL/OHMySQL.framework", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OHMySQL/MySQL.framework/MySQL", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OHMySQL/OpenSSL.framework/OpenSSL", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OHMySQL.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MySQL.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OHMySQLDemo/Pods-OHMySQLDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - FB0CD5A9E4620AB9DB98ECA3 /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-OHMySQLDemo-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 924BF1B3292411B8009A9F69 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -420,7 +360,6 @@ }; 924BF1C3292411BA009A9F69 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1F1042AE50199E07C66B3C5F /* Pods-OHMySQLDemo.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -430,6 +369,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; @@ -444,12 +384,16 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; IPHONEOS_DEPLOYMENT_TARGET = 15.5; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 3.3.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.sample.OHMySQLDemo; + PRODUCT_BUNDLE_IDENTIFIER = com.sample.OHMySQLDemo1; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -460,7 +404,6 @@ }; 924BF1C4292411BA009A9F69 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B9C467B052CF356E2E06989C /* Pods-OHMySQLDemo.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -470,6 +413,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_ASSET_PATHS = "\"OHMySQLDemo/Preview Content\""; @@ -483,13 +427,18 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; IPHONEOS_DEPLOYMENT_TARGET = 15.5; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); MARKETING_VERSION = 3.3.1; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.sample.OHMySQLDemo; + PRODUCT_BUNDLE_IDENTIFIER = com.sample.OHMySQLDemo1; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -517,6 +466,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 92FE6CAD2E536FE2004AC165 /* XCLocalSwiftPackageReference "../../OHMySQL" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../OHMySQL; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 92FE6CAE2E536FE2004AC165 /* OHMySQL */ = { + isa = XCSwiftPackageProductDependency; + productName = OHMySQL; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 7CCC61C11B7B38BA003A468F /* Project object */; } diff --git a/SampleProject/OHMySQL.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/SampleProject/OHMySQL.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 4d83ff9..919434a 100644 --- a/SampleProject/OHMySQL.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/SampleProject/OHMySQL.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/SampleProject/OHMySQL.xcworkspace/contents.xcworkspacedata b/SampleProject/OHMySQL.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index ac187da..0000000 --- a/SampleProject/OHMySQL.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/SampleProject/OHMySQL.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SampleProject/OHMySQL.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/SampleProject/OHMySQL.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/SampleProject/OHMySQLDemo/Presentation/TaskList/TaskListViewModel.swift b/SampleProject/OHMySQLDemo/Presentation/TaskList/TaskListViewModel.swift index d4ebac7..52ca94c 100644 --- a/SampleProject/OHMySQLDemo/Presentation/TaskList/TaskListViewModel.swift +++ b/SampleProject/OHMySQLDemo/Presentation/TaskList/TaskListViewModel.swift @@ -22,6 +22,7 @@ import Foundation import OHMySQL +import class UIKit.UIDevice final class TaskListViewModel: ObservableObject { enum State { diff --git a/SampleProject/Podfile b/SampleProject/Podfile deleted file mode 100644 index fdfda75..0000000 --- a/SampleProject/Podfile +++ /dev/null @@ -1,14 +0,0 @@ -platform :ios, '14.0' -use_frameworks! - -def shared_pods - pod 'OHMySQL', :path => '../' -end - -# target 'OHMySQLTests' do -# shared_pods -# end - -target 'OHMySQLDemo' do - shared_pods -end From 66800ac3d8f8862252eeed8075fb4cbed4831960 Mon Sep 17 00:00:00 2001 From: Oleg Gnidets Date: Tue, 19 Aug 2025 11:46:07 +0300 Subject: [PATCH 2/3] Update GitHub actions --- .github/ISSUE_TEMPLATE/custom.md | 10 ---------- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- .github/workflows/documentation.yml | 5 +---- .github/workflows/ohmysql.yml | 18 +++++++++++------- .../Sources/PrivacyInfo.xcprivacy | 0 README.md | 2 -- 6 files changed, 13 insertions(+), 24 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/custom.md rename PrivacyInfo.xcprivacy => OHMySQL/Sources/PrivacyInfo.xcprivacy (100%) diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md deleted file mode 100644 index 44ed81e..0000000 --- a/.github/ISSUE_TEMPLATE/custom.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Custom issue template -about: Describe this issue template's purpose here. -title: '' -labels: '' -assignees: oleghnidets - ---- - - diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index c68f8cb..d76fa68 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,7 +7,7 @@ assignees: oleghnidets --- -**Is your feature request related to a problem? Please describe.** +**Is your feature request related to a problem?** **Describe the solution you'd like** diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 1622224..f0b362c 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -4,9 +4,6 @@ on: push: branches: [ master ] -env: - DEVELOPER_DIR: /Applications/Xcode_14.0.1.app/Contents/Developer - jobs: Generate: runs-on: macos-latest @@ -17,7 +14,7 @@ jobs: xcodebuild docbuild \ -scheme 'OHMySQL' \ -derivedDataPath ./build \ - -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13' + -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15' - name: Generate pages run: | $(xcrun --find docc) process-archive transform-for-static-hosting \ diff --git a/.github/workflows/ohmysql.yml b/.github/workflows/ohmysql.yml index 771e3e7..3c9d0ce 100644 --- a/.github/workflows/ohmysql.yml +++ b/.github/workflows/ohmysql.yml @@ -9,6 +9,16 @@ on: - master jobs: + SPMValidation: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: SPM describe + run: swift package describe + - name: SPM resolve + run: swift package resolve + - name: SPM build all targets + run: swift package resolve UnitTests: runs-on: macos-latest steps: @@ -19,16 +29,10 @@ jobs: mysql-version: 8.0 database: tests - name: Run tests - run: xcodebuild -project OHMySQL.xcodeproj -scheme "OHMySQLTests" -parallel-testing-enabled NO -destination "platform=iOS Simulator,OS=latest,name=iPhone 14" test \ + run: xcodebuild -project OHMySQL.xcodeproj -scheme "OHMySQLTests" -parallel-testing-enabled NO -destination "platform=iOS Simulator,OS=latest,name=iPhone 15" test \ USER_NAME='root' \ USER_PASSWORD='' \ DB_NAME='tests' \ DB_HOST='localhost' \ DB_PORT='3306' \ DB_SOCKET='/tmp/mysql.sock' | xcpretty - CocoaPodsValidation: - runs-on: macos-latest - steps: - - uses: actions/checkout@v2 - - name: Cocoapods - run: pod lib lint --allow-warnings diff --git a/PrivacyInfo.xcprivacy b/OHMySQL/Sources/PrivacyInfo.xcprivacy similarity index 100% rename from PrivacyInfo.xcprivacy rename to OHMySQL/Sources/PrivacyInfo.xcprivacy diff --git a/README.md b/README.md index 6a433ea..7866645 100644 --- a/README.md +++ b/README.md @@ -171,8 +171,6 @@ See [LICENSE](LICENSE). [platform-url]: https://oleghnidets.github.io/OHMySQL/documentation/ohmysql [license-image]: https://img.shields.io/badge/License-MIT-green.svg [license-url]: LICENSE -[cocoapods-image]: https://img.shields.io/cocoapods/v/OHMySQL.svg?style=flat-square -[cocoapods-url]: OHMySQL.podspec [carthage-image]: https://img.shields.io/badge/carthage-compatible-blue.svg [carthage-url]: https://github.com/Carthage/Carthage [docs-image]: https://img.shields.io/badge/documentation-DocC-lightgrey.svg From 52e28f709cb71dace103028039d9f4cfb7782694 Mon Sep 17 00:00:00 2001 From: Oleg Gnidets Date: Tue, 19 Aug 2025 11:50:50 +0300 Subject: [PATCH 3/3] Update README --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 7866645..4fde9b5 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![License][platform-image]][platform-url] [![License][license-image]][license-url] +[![SPM][spm-image]](spm-url) [![Carthage Compatible][carthage-image]][carthage-url] [![Documentation][docs-image]][docs-url] @@ -167,6 +168,8 @@ try? context.save() See [LICENSE](LICENSE). +[spm-image]: https://img.shields.io/badge/Swift_Package_Manager-compatible-orange?style=flat-square +[spm-url]: Package.swift [platform-image]: https://img.shields.io/badge/platforms-ios%20|%20macOS%20|%20catalyst%20-orange.svg [platform-url]: https://oleghnidets.github.io/OHMySQL/documentation/ohmysql [license-image]: https://img.shields.io/badge/License-MIT-green.svg