diff --git a/SQLite/Info.plist b/Info.plist similarity index 100% rename from SQLite/Info.plist rename to Info.plist diff --git a/SQLite.xcodeproj/project.pbxproj b/SQLite.xcodeproj/project.pbxproj index 1ccac375..08e92b3b 100644 --- a/SQLite.xcodeproj/project.pbxproj +++ b/SQLite.xcodeproj/project.pbxproj @@ -7,6 +7,37 @@ objects = { /* Begin PBXBuildFile section */ + 22DADD001AE5E40C002D30E2 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743419C8D626004FCF85 /* Database.swift */; }; + 22DADD011AE5E40C002D30E2 /* SQLite-Bridging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2393C71ABE35F8003FF113 /* SQLite-Bridging.m */; }; + 22DADD021AE5E40C002D30E2 /* FTS.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAFEAD21AABC818000C21A1 /* FTS.swift */; }; + 22DADD031AE5E40C002D30E2 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743A19C8D6C0004FCF85 /* Statement.swift */; }; + 22DADD041AE5E40C002D30E2 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743719C8D693004FCF85 /* Value.swift */; }; + 22DADD051AE5E40C002D30E2 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC650B9519F0CDC3002FBE91 /* Expression.swift */; }; + 22DADD061AE5E40C002D30E2 /* RTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCBE28401ABDF18F0042A3FC /* RTree.swift */; }; + 22DADD071AE5E40C002D30E2 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAD429619E2E0F1004A51DF /* Query.swift */; }; + 22DADD081AE5E40C002D30E2 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC109CE01A0C4D970070988E /* Schema.swift */; }; + 22DADD091AE5E40C002D30E2 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3F170F1A8127A300C83A2F /* Functions.swift */; }; + 22DADD0B1AE5E40C002D30E2 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC37744219C8DC91004FCF85 /* libsqlite3.dylib */; }; + 22DADD0D1AE5E40C002D30E2 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9D389B1AAD458500780AE7 /* fts3_tokenizer.h */; }; + 22DADD0E1AE5E40C002D30E2 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3773F819C8CBB3004FCF85 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22DADD0F1AE5E40C002D30E2 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2393C61ABE35F8003FF113 /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22DADD1D1AE5E8EC002D30E2 /* Database.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743419C8D626004FCF85 /* Database.swift */; }; + 22DADD1E1AE5E8EC002D30E2 /* Statement.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743A19C8D6C0004FCF85 /* Statement.swift */; }; + 22DADD1F1AE5E8EC002D30E2 /* Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC37743719C8D693004FCF85 /* Value.swift */; }; + 22DADD201AE5E8EC002D30E2 /* Expression.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC650B9519F0CDC3002FBE91 /* Expression.swift */; }; + 22DADD211AE5E8EC002D30E2 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAD429619E2E0F1004A51DF /* Query.swift */; }; + 22DADD221AE5E8EC002D30E2 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC109CE01A0C4D970070988E /* Schema.swift */; }; + 22DADD231AE5E8EC002D30E2 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3F170F1A8127A300C83A2F /* Functions.swift */; }; + 22DADD241AE5E8EC002D30E2 /* FTS.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAFEAD21AABC818000C21A1 /* FTS.swift */; }; + 22DADD251AE5E8EC002D30E2 /* RTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCBE28401ABDF18F0042A3FC /* RTree.swift */; }; + 22DADD261AE5E8EC002D30E2 /* SQLite-Bridging.m in Sources */ = {isa = PBXBuildFile; fileRef = DC2393C71ABE35F8003FF113 /* SQLite-Bridging.m */; }; + 22DADD271AE5E8EC002D30E2 /* Cipher.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC6B3A31A9194A800734B78 /* Cipher.swift */; }; + 22DADD291AE5E8EC002D30E2 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DC2DD6AC1ABE428E00C2C71A /* libsqlcipher.a */; }; + 22DADD2A1AE5E8EC002D30E2 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = DC37744219C8DC91004FCF85 /* libsqlite3.dylib */; }; + 22DADD2C1AE5E8EC002D30E2 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = DC9D389B1AAD458500780AE7 /* fts3_tokenizer.h */; }; + 22DADD2D1AE5E8EC002D30E2 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = DC3773F819C8CBB3004FCF85 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22DADD2E1AE5E8EC002D30E2 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2393C61ABE35F8003FF113 /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 22DADD311AE5E8EC002D30E2 /* libsqlcipher.a in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DC2DD6AC1ABE428E00C2C71A /* libsqlcipher.a */; }; DC109CE11A0C4D970070988E /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC109CE01A0C4D970070988E /* Schema.swift */; }; DC109CE41A0C4F5D0070988E /* SchemaTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC109CE31A0C4F5D0070988E /* SchemaTests.swift */; }; DC2393C81ABE35F8003FF113 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = DC2393C61ABE35F8003FF113 /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -47,7 +78,7 @@ DCC6B3A71A91974B00734B78 /* FunctionsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3F17121A814F7000C83A2F /* FunctionsTests.swift */; }; DCC6B3A81A91975700734B78 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3F170F1A8127A300C83A2F /* Functions.swift */; }; DCC6B3A91A91975C00734B78 /* Functions.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC3F170F1A8127A300C83A2F /* Functions.swift */; }; - DCC6B3AC1A91979F00734B78 /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC6B3801A9191C300734B78 /* SQLite.framework */; }; + DCC6B3AC1A91979F00734B78 /* SQLiteCipher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCC6B3801A9191C300734B78 /* SQLiteCipher.framework */; }; DCC6B3AD1A9197B500734B78 /* TestHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF37F8719DDAF79001534AA /* TestHelper.swift */; }; DCF37F8219DDAC2D001534AA /* DatabaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF37F8119DDAC2D001534AA /* DatabaseTests.swift */; }; DCF37F8519DDAF3F001534AA /* StatementTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCF37F8419DDAF3F001534AA /* StatementTests.swift */; }; @@ -55,6 +86,27 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 22DADCFE1AE5E40C002D30E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DCAE4D141ABE0B3300EFCE7A; + remoteInfo = sqlite3; + }; + 22DADD191AE5E8EC002D30E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DCC6B3961A91938F00734B78 /* sqlcipher.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = D2AAC045055464E500DB518D; + remoteInfo = sqlcipher; + }; + 22DADD1B1AE5E8EC002D30E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */; + proxyType = 1; + remoteGlobalIDString = DCAE4D141ABE0B3300EFCE7A; + remoteInfo = sqlite3; + }; DC2393CF1ABE37A5003FF113 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = DC3773EA19C8CBB3004FCF85 /* Project object */; @@ -100,6 +152,17 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 22DADD301AE5E8EC002D30E2 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 22DADD311AE5E8EC002D30E2 /* libsqlcipher.a in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; DC2393D21ABE37C4003FF113 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -114,12 +177,14 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 22DADD141AE5E40C002D30E2 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 22DADD151AE5E40C002D30E2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = /Users/sam/Projects/SQLite.swift/Info.plist; sourceTree = ""; }; + 22DADD351AE5E8EC002D30E2 /* SQLiteCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLiteCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DC109CE01A0C4D970070988E /* Schema.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = Schema.swift; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; }; DC109CE31A0C4F5D0070988E /* SchemaTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SchemaTests.swift; sourceTree = ""; }; DC2393C61ABE35F8003FF113 /* SQLite-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SQLite-Bridging.h"; sourceTree = ""; }; DC2393C71ABE35F8003FF113 /* SQLite-Bridging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SQLite-Bridging.m"; sourceTree = ""; }; DC3773F319C8CBB3004FCF85 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DC3773F719C8CBB3004FCF85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../SQLite/Info.plist; sourceTree = ""; }; DC3773F819C8CBB3004FCF85 /* SQLite.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SQLite.h; path = ../SQLite/SQLite.h; sourceTree = ""; }; DC3773FE19C8CBB3004FCF85 /* SQLite Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SQLite Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; DC37740419C8CBB3004FCF85 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -148,7 +213,7 @@ DCAFEAD61AABEFA7000C21A1 /* FTSTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FTSTests.swift; sourceTree = ""; }; DCBE28401ABDF18F0042A3FC /* RTree.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTree.swift; sourceTree = ""; }; DCBE28441ABDF2A80042A3FC /* RTreeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RTreeTests.swift; sourceTree = ""; }; - DCC6B3801A9191C300734B78 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DCC6B3801A9191C300734B78 /* SQLiteCipher.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLiteCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; DCC6B3921A9191D100734B78 /* SQLiteCipher Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "SQLiteCipher Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; DCC6B3961A91938F00734B78 /* sqlcipher.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = sqlcipher.xcodeproj; path = Vendor/sqlcipher/sqlcipher.xcodeproj; sourceTree = ""; }; DCC6B3A31A9194A800734B78 /* Cipher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Cipher.swift; sourceTree = ""; }; @@ -159,6 +224,23 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 22DADD0A1AE5E40C002D30E2 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DADD0B1AE5E40C002D30E2 /* libsqlite3.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 22DADD281AE5E8EC002D30E2 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DADD291AE5E8EC002D30E2 /* libsqlcipher.a in Frameworks */, + 22DADD2A1AE5E8EC002D30E2 /* libsqlite3.dylib in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DC3773EF19C8CBB3004FCF85 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -196,7 +278,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - DCC6B3AC1A91979F00734B78 /* SQLite.framework in Frameworks */, + DCC6B3AC1A91979F00734B78 /* SQLiteCipher.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -264,9 +346,11 @@ children = ( DC3773F319C8CBB3004FCF85 /* SQLite.framework */, DC3773FE19C8CBB3004FCF85 /* SQLite Tests.xctest */, - DCC6B3801A9191C300734B78 /* SQLite.framework */, + DCC6B3801A9191C300734B78 /* SQLiteCipher.framework */, DCC6B3921A9191D100734B78 /* SQLiteCipher Tests.xctest */, DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */, + 22DADD141AE5E40C002D30E2 /* SQLite.framework */, + 22DADD351AE5E8EC002D30E2 /* SQLiteCipher.framework */, ); name = Products; sourceTree = ""; @@ -295,11 +379,11 @@ DC37743319C8CFCE004FCF85 /* Supporting Files */ = { isa = PBXGroup; children = ( + 22DADD151AE5E40C002D30E2 /* Info.plist */, DC3773F819C8CBB3004FCF85 /* SQLite.h */, DC2393C61ABE35F8003FF113 /* SQLite-Bridging.h */, DC2393C71ABE35F8003FF113 /* SQLite-Bridging.m */, DC9D389B1AAD458500780AE7 /* fts3_tokenizer.h */, - DC3773F719C8CBB3004FCF85 /* Info.plist */, DC37744219C8DC91004FCF85 /* libsqlite3.dylib */, DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */, ); @@ -346,6 +430,26 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 22DADD0C1AE5E40C002D30E2 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DADD0D1AE5E40C002D30E2 /* fts3_tokenizer.h in Headers */, + 22DADD0E1AE5E40C002D30E2 /* SQLite.h in Headers */, + 22DADD0F1AE5E40C002D30E2 /* SQLite-Bridging.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 22DADD2B1AE5E8EC002D30E2 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DADD2C1AE5E8EC002D30E2 /* fts3_tokenizer.h in Headers */, + 22DADD2D1AE5E8EC002D30E2 /* SQLite.h in Headers */, + 22DADD2E1AE5E8EC002D30E2 /* SQLite-Bridging.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DC3773F019C8CBB3004FCF85 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -376,9 +480,49 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - DC3773F219C8CBB3004FCF85 /* SQLite */ = { + 22DADCFC1AE5E40C002D30E2 /* SQLite iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = 22DADD111AE5E40C002D30E2 /* Build configuration list for PBXNativeTarget "SQLite iOS" */; + buildPhases = ( + 22DADCFF1AE5E40C002D30E2 /* Sources */, + 22DADD0A1AE5E40C002D30E2 /* Frameworks */, + 22DADD0C1AE5E40C002D30E2 /* Headers */, + 22DADD101AE5E40C002D30E2 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 22DADCFD1AE5E40C002D30E2 /* PBXTargetDependency */, + ); + name = "SQLite iOS"; + productName = SQLite; + productReference = 22DADD141AE5E40C002D30E2 /* SQLite.framework */; + productType = "com.apple.product-type.framework"; + }; + 22DADD171AE5E8EC002D30E2 /* SQLiteCipher iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = DC37740919C8CBB3004FCF85 /* Build configuration list for PBXNativeTarget "SQLite" */; + buildConfigurationList = 22DADD321AE5E8EC002D30E2 /* Build configuration list for PBXNativeTarget "SQLiteCipher iOS" */; + buildPhases = ( + 22DADD1C1AE5E8EC002D30E2 /* Sources */, + 22DADD281AE5E8EC002D30E2 /* Frameworks */, + 22DADD2B1AE5E8EC002D30E2 /* Headers */, + 22DADD2F1AE5E8EC002D30E2 /* Resources */, + 22DADD301AE5E8EC002D30E2 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 22DADD181AE5E8EC002D30E2 /* PBXTargetDependency */, + 22DADD1A1AE5E8EC002D30E2 /* PBXTargetDependency */, + ); + name = "SQLiteCipher iOS"; + productName = SQLite; + productReference = 22DADD351AE5E8EC002D30E2 /* SQLiteCipher.framework */; + productType = "com.apple.product-type.framework"; + }; + DC3773F219C8CBB3004FCF85 /* SQLite OSX */ = { + isa = PBXNativeTarget; + buildConfigurationList = DC37740919C8CBB3004FCF85 /* Build configuration list for PBXNativeTarget "SQLite OSX" */; buildPhases = ( DC3773EE19C8CBB3004FCF85 /* Sources */, DC3773EF19C8CBB3004FCF85 /* Frameworks */, @@ -390,7 +534,7 @@ dependencies = ( DCAE4D351ABE0C2800EFCE7A /* PBXTargetDependency */, ); - name = SQLite; + name = "SQLite OSX"; productName = SQLite; productReference = DC3773F319C8CBB3004FCF85 /* SQLite.framework */; productType = "com.apple.product-type.framework"; @@ -431,9 +575,9 @@ productReference = DCAE4D151ABE0B3300EFCE7A /* sqlite3.framework */; productType = "com.apple.product-type.framework"; }; - DCC6B36D1A9191C300734B78 /* SQLiteCipher */ = { + DCC6B36D1A9191C300734B78 /* SQLiteCipher OSX */ = { isa = PBXNativeTarget; - buildConfigurationList = DCC6B37D1A9191C300734B78 /* Build configuration list for PBXNativeTarget "SQLiteCipher" */; + buildConfigurationList = DCC6B37D1A9191C300734B78 /* Build configuration list for PBXNativeTarget "SQLiteCipher OSX" */; buildPhases = ( DCC6B36E1A9191C300734B78 /* Sources */, DCC6B3761A9191C300734B78 /* Frameworks */, @@ -447,9 +591,9 @@ DC2DD6B21ABE438900C2C71A /* PBXTargetDependency */, DC2393D01ABE37A5003FF113 /* PBXTargetDependency */, ); - name = SQLiteCipher; + name = "SQLiteCipher OSX"; productName = SQLite; - productReference = DCC6B3801A9191C300734B78 /* SQLite.framework */; + productReference = DCC6B3801A9191C300734B78 /* SQLiteCipher.framework */; productType = "com.apple.product-type.framework"; }; DCC6B3821A9191D100734B78 /* SQLiteCipher Tests */ = { @@ -508,11 +652,13 @@ ); projectRoot = ""; targets = ( - DC3773F219C8CBB3004FCF85 /* SQLite */, + DC3773F219C8CBB3004FCF85 /* SQLite OSX */, DC3773FD19C8CBB3004FCF85 /* SQLite Tests */, - DCC6B36D1A9191C300734B78 /* SQLiteCipher */, + DCC6B36D1A9191C300734B78 /* SQLiteCipher OSX */, DCC6B3821A9191D100734B78 /* SQLiteCipher Tests */, DCAE4D141ABE0B3300EFCE7A /* sqlite3 */, + 22DADCFC1AE5E40C002D30E2 /* SQLite iOS */, + 22DADD171AE5E8EC002D30E2 /* SQLiteCipher iOS */, ); }; /* End PBXProject section */ @@ -528,6 +674,20 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 22DADD101AE5E40C002D30E2 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 22DADD2F1AE5E8EC002D30E2 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; DC3773F119C8CBB3004FCF85 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -566,6 +726,41 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 22DADCFF1AE5E40C002D30E2 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DADD001AE5E40C002D30E2 /* Database.swift in Sources */, + 22DADD011AE5E40C002D30E2 /* SQLite-Bridging.m in Sources */, + 22DADD021AE5E40C002D30E2 /* FTS.swift in Sources */, + 22DADD031AE5E40C002D30E2 /* Statement.swift in Sources */, + 22DADD041AE5E40C002D30E2 /* Value.swift in Sources */, + 22DADD051AE5E40C002D30E2 /* Expression.swift in Sources */, + 22DADD061AE5E40C002D30E2 /* RTree.swift in Sources */, + 22DADD071AE5E40C002D30E2 /* Query.swift in Sources */, + 22DADD081AE5E40C002D30E2 /* Schema.swift in Sources */, + 22DADD091AE5E40C002D30E2 /* Functions.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 22DADD1C1AE5E8EC002D30E2 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 22DADD1D1AE5E8EC002D30E2 /* Database.swift in Sources */, + 22DADD1E1AE5E8EC002D30E2 /* Statement.swift in Sources */, + 22DADD1F1AE5E8EC002D30E2 /* Value.swift in Sources */, + 22DADD201AE5E8EC002D30E2 /* Expression.swift in Sources */, + 22DADD211AE5E8EC002D30E2 /* Query.swift in Sources */, + 22DADD221AE5E8EC002D30E2 /* Schema.swift in Sources */, + 22DADD231AE5E8EC002D30E2 /* Functions.swift in Sources */, + 22DADD241AE5E8EC002D30E2 /* FTS.swift in Sources */, + 22DADD251AE5E8EC002D30E2 /* RTree.swift in Sources */, + 22DADD261AE5E8EC002D30E2 /* SQLite-Bridging.m in Sources */, + 22DADD271AE5E8EC002D30E2 /* Cipher.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; DC3773EE19C8CBB3004FCF85 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -636,6 +831,21 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 22DADCFD1AE5E40C002D30E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DCAE4D141ABE0B3300EFCE7A /* sqlite3 */; + targetProxy = 22DADCFE1AE5E40C002D30E2 /* PBXContainerItemProxy */; + }; + 22DADD181AE5E8EC002D30E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = sqlcipher; + targetProxy = 22DADD191AE5E8EC002D30E2 /* PBXContainerItemProxy */; + }; + 22DADD1A1AE5E8EC002D30E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = DCAE4D141ABE0B3300EFCE7A /* sqlite3 */; + targetProxy = 22DADD1B1AE5E8EC002D30E2 /* PBXContainerItemProxy */; + }; DC2393D01ABE37A5003FF113 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = DCAE4D141ABE0B3300EFCE7A /* sqlite3 */; @@ -648,7 +858,7 @@ }; DC37740119C8CBB3004FCF85 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DC3773F219C8CBB3004FCF85 /* SQLite */; + target = DC3773F219C8CBB3004FCF85 /* SQLite OSX */; targetProxy = DC37740019C8CBB3004FCF85 /* PBXContainerItemProxy */; }; DCAE4D351ABE0C2800EFCE7A /* PBXTargetDependency */ = { @@ -658,12 +868,98 @@ }; DCC6B3AB1A91979100734B78 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = DCC6B36D1A9191C300734B78 /* SQLiteCipher */; + target = DCC6B36D1A9191C300734B78 /* SQLiteCipher OSX */; targetProxy = DCC6B3AA1A91979100734B78 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 22DADD121AE5E40C002D30E2 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = SQLite; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 22DADD131AE5E40C002D30E2 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = SQLite; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 22DADD331AE5E8EC002D30E2 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SQLITE_HAS_CODEC=1", + ); + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = SQLiteCipher; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 22DADD341AE5E8EC002D30E2 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = DC37742E19C8CE67004FCF85 /* SQLite.xcconfig */; + buildSettings = { + CLANG_ENABLE_MODULES = YES; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "SQLITE_HAS_CODEC=1", + ); + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + PRODUCT_NAME = SQLiteCipher; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + }; + name = Release; + }; DC37740719C8CBB3004FCF85 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -751,11 +1047,14 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = SQLite/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_NAME = SQLite; + SDKROOT = macosx; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; @@ -769,11 +1068,14 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = SQLite/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = "$(TARGET_NAME)"; + MACOSX_DEPLOYMENT_TARGET = 10.9; + PRODUCT_NAME = SQLite; + SDKROOT = macosx; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = macosx; }; name = Release; }; @@ -818,7 +1120,7 @@ ); INFOPLIST_FILE = sqlite3/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -840,7 +1142,7 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = sqlite3/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = iphoneos; @@ -862,10 +1164,11 @@ "$(inherited)", "SQLITE_HAS_CODEC=1", ); - INFOPLIST_FILE = SQLite/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = SQLite; + PRODUCT_NAME = SQLiteCipher; + SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; @@ -884,10 +1187,11 @@ "$(inherited)", "SQLITE_HAS_CODEC=1", ); - INFOPLIST_FILE = SQLite/Info.plist; + INFOPLIST_FILE = "$(SRCROOT)/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_NAME = SQLite; + PRODUCT_NAME = SQLiteCipher; + SDKROOT = macosx; SKIP_INSTALL = YES; }; name = Release; @@ -919,6 +1223,24 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 22DADD111AE5E40C002D30E2 /* Build configuration list for PBXNativeTarget "SQLite iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 22DADD121AE5E40C002D30E2 /* Debug */, + 22DADD131AE5E40C002D30E2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 22DADD321AE5E8EC002D30E2 /* Build configuration list for PBXNativeTarget "SQLiteCipher iOS" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 22DADD331AE5E8EC002D30E2 /* Debug */, + 22DADD341AE5E8EC002D30E2 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; DC3773ED19C8CBB3004FCF85 /* Build configuration list for PBXProject "SQLite" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -928,7 +1250,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DC37740919C8CBB3004FCF85 /* Build configuration list for PBXNativeTarget "SQLite" */ = { + DC37740919C8CBB3004FCF85 /* Build configuration list for PBXNativeTarget "SQLite OSX" */ = { isa = XCConfigurationList; buildConfigurations = ( DC37740A19C8CBB3004FCF85 /* Debug */, @@ -955,7 +1277,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DCC6B37D1A9191C300734B78 /* Build configuration list for PBXNativeTarget "SQLiteCipher" */ = { + DCC6B37D1A9191C300734B78 /* Build configuration list for PBXNativeTarget "SQLiteCipher OSX" */ = { isa = XCConfigurationList; buildConfigurations = ( DCC6B37E1A9191C300734B78 /* Debug */, diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite OSX.xcscheme similarity index 68% rename from SQLite.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme rename to SQLite.xcodeproj/xcshareddata/xcschemes/SQLite OSX.xcscheme index b54befa3..088255a6 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLiteCipher.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite OSX.xcscheme @@ -14,9 +14,9 @@ buildForAnalyzing = "YES"> @@ -28,26 +28,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" buildConfiguration = "Debug"> - - - - - - - - @@ -79,9 +60,9 @@ diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme similarity index 59% rename from SQLite.xcodeproj/xcshareddata/xcschemes/SQLite.xcscheme rename to SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme index 0e27d856..4a057019 100644 --- a/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite.xcscheme +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/SQLite iOS.xcscheme @@ -14,23 +14,9 @@ buildForAnalyzing = "YES"> - - - - @@ -42,26 +28,7 @@ shouldUseLaunchSchemeArgsEnv = "YES" buildConfiguration = "Debug"> - - - - - - - - @@ -93,9 +60,9 @@ diff --git a/SQLite.xcodeproj/xcshareddata/xcschemes/sqlite3.xcscheme b/SQLite.xcodeproj/xcshareddata/xcschemes/sqlite3.xcscheme new file mode 100644 index 00000000..d6b4012c --- /dev/null +++ b/SQLite.xcodeproj/xcshareddata/xcschemes/sqlite3.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +