Skip to content

Commit 067c639

Browse files
thebluepotatothebluepotato
committed
More cleanup
1 parent 9b4c257 commit 067c639

File tree

2 files changed

+26
-101
lines changed

2 files changed

+26
-101
lines changed

‎.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 25 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
03A65E641C6BB0F60062603F /* SQLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03A65E5A1C6BB0F50062603F /* SQLite.framework */; };
11-
03A65E711C6BB2CD0062603F /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
1211
03A65E721C6BB2D30062603F /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
1312
03A65E731C6BB2D80062603F /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
1413
03A65E741C6BB2DA0062603F /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
@@ -88,7 +87,6 @@
8887
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
8988
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
9089
3D67B3F91DB246E700A4F4C6 /* SQLite-Bridging.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLite-Bridging.m */; };
91-
3D67B3FA1DB2470600A4F4C6 /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
9290
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
9391
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
9492
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
@@ -164,10 +162,8 @@
164162
EE247B731C3F3FEC00AE3E12 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B001C3F06E900AE3E12 /* Query.swift */; };
165163
EE247B741C3F3FEC00AE3E12 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B011C3F06E900AE3E12 /* Schema.swift */; };
166164
EE247B751C3F3FEC00AE3E12 /* Setter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B021C3F06E900AE3E12 /* Setter.swift */; };
167-
EE91808C1C46E34A0038162A /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
168165
EE91808E1C46E5230038162A /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
169166
EE91808F1C46E76D0038162A /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
170-
EE9180901C46E8980038162A /* usr/include/sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; };
171167
EE9180941C46EA210038162A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9180931C46EA210038162A /* libsqlite3.tbd */; };
172168
EE9180951C46EBCC0038162A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9180911C46E9D30038162A /* libsqlite3.tbd */; };
173169
/* End PBXBuildFile section */
@@ -207,13 +203,6 @@
207203
19A1794CC4D7827E997E32A7 /* FoundationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FoundationTests.swift; sourceTree = "<group>"; };
208204
19A17B93B48B5560E6E51791 /* Fixtures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Fixtures.swift; sourceTree = "<group>"; };
209205
19A17E2695737FAB5D6086E3 /* fixtures */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; path = fixtures; sourceTree = "<group>"; };
210-
39548A631CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
211-
39548A651CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
212-
39548A671CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
213-
39548A691CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
214-
39548A6B1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
215-
39548A6D1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
216-
39548A6F1CA63C740003E3B5 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
217206
3D67B3E51DB2469200A4F4C6 /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/WatchOS.platform/Developer/SDKs/WatchOS3.0.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
218207
A121AC451CA35C79005A31D1 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
219208
EE247AD31C3F04ED00AE3E12 /* SQLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SQLite.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -265,7 +254,6 @@
265254
EE247B911C3F822500AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
266255
EE247B921C3F822600AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
267256
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = SQLite.swift.podspec; sourceTree = "<group>"; };
268-
EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = usr/include/sqlite3.h; sourceTree = SDKROOT; };
269257
EE91808D1C46E5230038162A /* SQLite-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SQLite-Bridging.h"; path = "../../SQLiteObjc/include/SQLite-Bridging.h"; sourceTree = "<group>"; };
270258
EE9180911C46E9D30038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/usr/lib/libsqlite3.tbd; sourceTree = DEVELOPER_DIR; };
271259
EE9180931C46EA210038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
@@ -331,76 +319,6 @@
331319
/* End PBXFrameworksBuildPhase section */
332320

333321
/* Begin PBXGroup section */
334-
39548A611CA63C740003E3B5 /* CocoaPods */ = {
335-
isa = PBXGroup;
336-
children = (
337-
39548A621CA63C740003E3B5 /* appletvos */,
338-
39548A641CA63C740003E3B5 /* appletvsimulator */,
339-
39548A661CA63C740003E3B5 /* iphoneos */,
340-
39548A681CA63C740003E3B5 /* iphonesimulator */,
341-
39548A6A1CA63C740003E3B5 /* macosx */,
342-
39548A6C1CA63C740003E3B5 /* watchos */,
343-
39548A6E1CA63C740003E3B5 /* watchsimulator */,
344-
);
345-
path = CocoaPods;
346-
sourceTree = "<group>";
347-
};
348-
39548A621CA63C740003E3B5 /* appletvos */ = {
349-
isa = PBXGroup;
350-
children = (
351-
39548A631CA63C740003E3B5 /* module.modulemap */,
352-
);
353-
path = appletvos;
354-
sourceTree = "<group>";
355-
};
356-
39548A641CA63C740003E3B5 /* appletvsimulator */ = {
357-
isa = PBXGroup;
358-
children = (
359-
39548A651CA63C740003E3B5 /* module.modulemap */,
360-
);
361-
path = appletvsimulator;
362-
sourceTree = "<group>";
363-
};
364-
39548A661CA63C740003E3B5 /* iphoneos */ = {
365-
isa = PBXGroup;
366-
children = (
367-
39548A671CA63C740003E3B5 /* module.modulemap */,
368-
);
369-
path = iphoneos;
370-
sourceTree = "<group>";
371-
};
372-
39548A681CA63C740003E3B5 /* iphonesimulator */ = {
373-
isa = PBXGroup;
374-
children = (
375-
39548A691CA63C740003E3B5 /* module.modulemap */,
376-
);
377-
path = iphonesimulator;
378-
sourceTree = "<group>";
379-
};
380-
39548A6A1CA63C740003E3B5 /* macosx */ = {
381-
isa = PBXGroup;
382-
children = (
383-
39548A6B1CA63C740003E3B5 /* module.modulemap */,
384-
);
385-
path = macosx;
386-
sourceTree = "<group>";
387-
};
388-
39548A6C1CA63C740003E3B5 /* watchos */ = {
389-
isa = PBXGroup;
390-
children = (
391-
39548A6D1CA63C740003E3B5 /* module.modulemap */,
392-
);
393-
path = watchos;
394-
sourceTree = "<group>";
395-
};
396-
39548A6E1CA63C740003E3B5 /* watchsimulator */ = {
397-
isa = PBXGroup;
398-
children = (
399-
39548A6F1CA63C740003E3B5 /* module.modulemap */,
400-
);
401-
path = watchsimulator;
402-
sourceTree = "<group>";
403-
};
404322
3D67B3E41DB2469200A4F4C6 /* Frameworks */ = {
405323
isa = PBXGroup;
406324
children = (
@@ -439,7 +357,6 @@
439357
EE247AD51C3F04ED00AE3E12 /* SQLite */ = {
440358
isa = PBXGroup;
441359
children = (
442-
EE91808B1C46E34A0038162A /* usr/include/sqlite3.h */,
443360
EE247AD61C3F04ED00AE3E12 /* SQLite.h */,
444361
EE247AF71C3F06E900AE3E12 /* Foundation.swift */,
445362
EE247AF81C3F06E900AE3E12 /* Helpers.swift */,
@@ -525,7 +442,6 @@
525442
EE247B8A1C3F81D000AE3E12 /* Metadata */ = {
526443
isa = PBXGroup;
527444
children = (
528-
39548A611CA63C740003E3B5 /* CocoaPods */,
529445
EE247B771C3F40D700AE3E12 /* README.md */,
530446
EE247B8B1C3F820300AE3E12 /* CONTRIBUTING.md */,
531447
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */,
@@ -566,7 +482,6 @@
566482
files = (
567483
03A65E781C6BB2EA0062603F /* fts3_tokenizer.h in Headers */,
568484
03A65E751C6BB2DF0062603F /* SQLite-Bridging.h in Headers */,
569-
03A65E711C6BB2CD0062603F /* usr/include/sqlite3.h in Headers */,
570485
03A65E721C6BB2D30062603F /* SQLite.h in Headers */,
571486
);
572487
runOnlyForDeploymentPostprocessing = 0;
@@ -575,7 +490,6 @@
575490
isa = PBXHeadersBuildPhase;
576491
buildActionMask = 2147483647;
577492
files = (
578-
3D67B3FA1DB2470600A4F4C6 /* usr/include/sqlite3.h in Headers */,
579493
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */,
580494
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */,
581495
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */,
@@ -588,7 +502,6 @@
588502
files = (
589503
EE91808E1C46E5230038162A /* SQLite-Bridging.h in Headers */,
590504
EE247B051C3F06E900AE3E12 /* fts3_tokenizer.h in Headers */,
591-
EE91808C1C46E34A0038162A /* usr/include/sqlite3.h in Headers */,
592505
EE247AD71C3F04ED00AE3E12 /* SQLite.h in Headers */,
593506
);
594507
runOnlyForDeploymentPostprocessing = 0;
@@ -597,7 +510,6 @@
597510
isa = PBXHeadersBuildPhase;
598511
buildActionMask = 2147483647;
599512
files = (
600-
EE9180901C46E8980038162A /* usr/include/sqlite3.h in Headers */,
601513
EE247B671C3F3FEC00AE3E12 /* fts3_tokenizer.h in Headers */,
602514
EE247B621C3F3FDB00AE3E12 /* SQLite.h in Headers */,
603515
EE91808F1C46E76D0038162A /* SQLite-Bridging.h in Headers */,
@@ -744,12 +656,15 @@
744656
TargetAttributes = {
745657
03A65E591C6BB0F50062603F = {
746658
CreatedOnToolsVersion = 7.2;
659+
LastSwiftMigration = 0900;
747660
};
748661
03A65E621C6BB0F60062603F = {
749662
CreatedOnToolsVersion = 7.2;
663+
LastSwiftMigration = 0900;
750664
};
751665
A121AC441CA35C79005A31D1 = {
752666
CreatedOnToolsVersion = 7.3;
667+
LastSwiftMigration = 0900;
753668
};
754669
EE247AD21C3F04ED00AE3E12 = {
755670
CreatedOnToolsVersion = 7.2;
@@ -761,11 +676,11 @@
761676
};
762677
EE247B3B1C3F3ED000AE3E12 = {
763678
CreatedOnToolsVersion = 7.2;
764-
LastSwiftMigration = 0800;
679+
LastSwiftMigration = 0900;
765680
};
766681
EE247B441C3F3ED000AE3E12 = {
767682
CreatedOnToolsVersion = 7.2;
768-
LastSwiftMigration = 0800;
683+
LastSwiftMigration = 0900;
769684
};
770685
};
771686
};
@@ -1073,7 +988,8 @@
1073988
SKIP_INSTALL = YES;
1074989
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
1075990
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
1076-
SWIFT_VERSION = 3.0;
991+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
992+
SWIFT_VERSION = 4.0;
1077993
TVOS_DEPLOYMENT_TARGET = 9.1;
1078994
};
1079995
name = Debug;
@@ -1096,7 +1012,8 @@
10961012
SKIP_INSTALL = YES;
10971013
"SWIFT_INCLUDE_PATHS[sdk=appletvos*]" = "$(SRCROOT)/CocoaPods/appletvos";
10981014
"SWIFT_INCLUDE_PATHS[sdk=appletvsimulator*]" = "$(SRCROOT)/CocoaPods/appletvsimulator";
1099-
SWIFT_VERSION = 3.0;
1015+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1016+
SWIFT_VERSION = 4.0;
11001017
TVOS_DEPLOYMENT_TARGET = 9.1;
11011018
};
11021019
name = Release;
@@ -1109,7 +1026,8 @@
11091026
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
11101027
PRODUCT_NAME = "$(TARGET_NAME)";
11111028
SDKROOT = appletvos;
1112-
SWIFT_VERSION = 3.0;
1029+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1030+
SWIFT_VERSION = 4.0;
11131031
TVOS_DEPLOYMENT_TARGET = 9.1;
11141032
};
11151033
name = Debug;
@@ -1122,7 +1040,8 @@
11221040
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
11231041
PRODUCT_NAME = "$(TARGET_NAME)";
11241042
SDKROOT = appletvos;
1125-
SWIFT_VERSION = 3.0;
1043+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1044+
SWIFT_VERSION = 4.0;
11261045
TVOS_DEPLOYMENT_TARGET = 9.1;
11271046
};
11281047
name = Release;
@@ -1146,7 +1065,8 @@
11461065
SKIP_INSTALL = YES;
11471066
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
11481067
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
1149-
SWIFT_VERSION = 3.0;
1068+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1069+
SWIFT_VERSION = 4.0;
11501070
TARGETED_DEVICE_FAMILY = 4;
11511071
WATCHOS_DEPLOYMENT_TARGET = 2.2;
11521072
};
@@ -1171,7 +1091,8 @@
11711091
SKIP_INSTALL = YES;
11721092
"SWIFT_INCLUDE_PATHS[sdk=watchos*]" = "$(SRCROOT)/CocoaPods/watchos";
11731093
"SWIFT_INCLUDE_PATHS[sdk=watchsimulator*]" = "$(SRCROOT)/CocoaPods/watchsimulator";
1174-
SWIFT_VERSION = 3.0;
1094+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1095+
SWIFT_VERSION = 4.0;
11751096
TARGETED_DEVICE_FAMILY = 4;
11761097
WATCHOS_DEPLOYMENT_TARGET = 2.2;
11771098
};
@@ -1389,7 +1310,8 @@
13891310
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
13901311
"SWIFT_INCLUDE_PATHS[sdk=macosx10.11]" = "$(SRCROOT)/CocoaPods/macosx-10.11";
13911312
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1392-
SWIFT_VERSION = 3.0;
1313+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1314+
SWIFT_VERSION = 4.0;
13931315
};
13941316
name = Debug;
13951317
};
@@ -1416,7 +1338,8 @@
14161338
"SWIFT_INCLUDE_PATHS[sdk=macosx*]" = "$(SRCROOT)/CocoaPods/macosx";
14171339
"SWIFT_INCLUDE_PATHS[sdk=macosx10.11]" = "$(SRCROOT)/CocoaPods/macosx-10.11";
14181340
"SWIFT_INCLUDE_PATHS[sdk=macosx10.12]" = "$(SRCROOT)/CocoaPods/macosx-10.12";
1419-
SWIFT_VERSION = 3.0;
1341+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1342+
SWIFT_VERSION = 4.0;
14201343
};
14211344
name = Release;
14221345
};
@@ -1431,7 +1354,8 @@
14311354
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
14321355
PRODUCT_NAME = "$(TARGET_NAME)";
14331356
SDKROOT = macosx;
1434-
SWIFT_VERSION = 3.0;
1357+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1358+
SWIFT_VERSION = 4.0;
14351359
};
14361360
name = Debug;
14371361
};
@@ -1446,7 +1370,8 @@
14461370
PRODUCT_BUNDLE_IDENTIFIER = com.stephencelis.SQLiteTests;
14471371
PRODUCT_NAME = "$(TARGET_NAME)";
14481372
SDKROOT = macosx;
1449-
SWIFT_VERSION = 3.0;
1373+
SWIFT_SWIFT3_OBJC_INFERENCE = On;
1374+
SWIFT_VERSION = 4.0;
14501375
};
14511376
name = Release;
14521377
};

0 commit comments

Comments
 (0)