Skip to content

Commit c27d53c

Browse files
skagedalskagedal
committed
Rename SQLite-Bridging.h -> SQLiteObjc.h
Fixes #925 and makes SwiftPM-generated Xcode projects that use SQLite.swift compile out of the box.
1 parent b7fa4bc commit c27d53c

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

‎SQLite.xcodeproj/project.pbxproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
03A65E721C6BB2D30062603F /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
1212
03A65E731C6BB2D80062603F /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
1313
03A65E741C6BB2DA0062603F /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
14-
03A65E751C6BB2DF0062603F /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
14+
03A65E751C6BB2DF0062603F /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
1515
03A65E761C6BB2E60062603F /* Blob.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEE1C3F06E900AE3E12 /* Blob.swift */; };
1616
03A65E771C6BB2E60062603F /* Connection.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AEF1C3F06E900AE3E12 /* Connection.swift */; };
1717
03A65E781C6BB2EA0062603F /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
@@ -101,7 +101,7 @@
101101
3D67B3F71DB246D700A4F4C6 /* Foundation.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF71C3F06E900AE3E12 /* Foundation.swift */; };
102102
3D67B3F81DB246D700A4F4C6 /* Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF81C3F06E900AE3E12 /* Helpers.swift */; };
103103
3D67B3F91DB246E700A4F4C6 /* SQLite-Bridging.m in Sources */ = {isa = PBXBuildFile; fileRef = EE247AF11C3F06E900AE3E12 /* SQLite-Bridging.m */; };
104-
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
104+
3D67B3FB1DB2470600A4F4C6 /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
105105
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AD61C3F04ED00AE3E12 /* SQLite.h */; settings = {ATTRIBUTES = (Public, ); }; };
106106
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */; };
107107
49EB68C41F7B3CB400D89D40 /* Coding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 49EB68C31F7B3CB400D89D40 /* Coding.swift */; };
@@ -180,8 +180,8 @@
180180
EE247B731C3F3FEC00AE3E12 /* Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B001C3F06E900AE3E12 /* Query.swift */; };
181181
EE247B741C3F3FEC00AE3E12 /* Schema.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B011C3F06E900AE3E12 /* Schema.swift */; };
182182
EE247B751C3F3FEC00AE3E12 /* Setter.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE247B021C3F06E900AE3E12 /* Setter.swift */; };
183-
EE91808E1C46E5230038162A /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
184-
EE91808F1C46E76D0038162A /* SQLite-Bridging.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLite-Bridging.h */; settings = {ATTRIBUTES = (Public, ); }; };
183+
EE91808E1C46E5230038162A /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
184+
EE91808F1C46E76D0038162A /* SQLiteObjc.h in Headers */ = {isa = PBXBuildFile; fileRef = EE91808D1C46E5230038162A /* SQLiteObjc.h */; settings = {ATTRIBUTES = (Public, ); }; };
185185
EE9180941C46EA210038162A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9180931C46EA210038162A /* libsqlite3.tbd */; };
186186
EE9180951C46EBCC0038162A /* libsqlite3.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = EE9180911C46E9D30038162A /* libsqlite3.tbd */; };
187187
/* End PBXBuildFile section */
@@ -277,7 +277,7 @@
277277
EE247B911C3F822500AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
278278
EE247B921C3F822600AE3E12 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
279279
EE247B931C3F826100AE3E12 /* SQLite.swift.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; path = SQLite.swift.podspec; sourceTree = "<group>"; };
280-
EE91808D1C46E5230038162A /* SQLite-Bridging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "SQLite-Bridging.h"; path = "../../SQLiteObjc/include/SQLite-Bridging.h"; sourceTree = "<group>"; };
280+
EE91808D1C46E5230038162A /* SQLiteObjc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SQLiteObjc.h; path = ../../SQLiteObjc/include/SQLiteObjc.h; sourceTree = "<group>"; };
281281
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; };
282282
EE9180931C46EA210038162A /* libsqlite3.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.tbd; path = usr/lib/libsqlite3.tbd; sourceTree = SDKROOT; };
283283
/* End PBXFileReference section */
@@ -426,7 +426,7 @@
426426
EE247AED1C3F06E900AE3E12 /* Core */ = {
427427
isa = PBXGroup;
428428
children = (
429-
EE91808D1C46E5230038162A /* SQLite-Bridging.h */,
429+
EE91808D1C46E5230038162A /* SQLiteObjc.h */,
430430
EE247AEE1C3F06E900AE3E12 /* Blob.swift */,
431431
EE247AEF1C3F06E900AE3E12 /* Connection.swift */,
432432
EE247AF01C3F06E900AE3E12 /* fts3_tokenizer.h */,
@@ -509,7 +509,7 @@
509509
buildActionMask = 2147483647;
510510
files = (
511511
03A65E781C6BB2EA0062603F /* fts3_tokenizer.h in Headers */,
512-
03A65E751C6BB2DF0062603F /* SQLite-Bridging.h in Headers */,
512+
03A65E751C6BB2DF0062603F /* SQLiteObjc.h in Headers */,
513513
03A65E721C6BB2D30062603F /* SQLite.h in Headers */,
514514
);
515515
runOnlyForDeploymentPostprocessing = 0;
@@ -518,7 +518,7 @@
518518
isa = PBXHeadersBuildPhase;
519519
buildActionMask = 2147483647;
520520
files = (
521-
3D67B3FB1DB2470600A4F4C6 /* SQLite-Bridging.h in Headers */,
521+
3D67B3FB1DB2470600A4F4C6 /* SQLiteObjc.h in Headers */,
522522
3D67B3FC1DB2471B00A4F4C6 /* SQLite.h in Headers */,
523523
3D67B3FD1DB2472D00A4F4C6 /* fts3_tokenizer.h in Headers */,
524524
);
@@ -528,7 +528,7 @@
528528
isa = PBXHeadersBuildPhase;
529529
buildActionMask = 2147483647;
530530
files = (
531-
EE91808E1C46E5230038162A /* SQLite-Bridging.h in Headers */,
531+
EE91808E1C46E5230038162A /* SQLiteObjc.h in Headers */,
532532
EE247B051C3F06E900AE3E12 /* fts3_tokenizer.h in Headers */,
533533
EE247AD71C3F04ED00AE3E12 /* SQLite.h in Headers */,
534534
);
@@ -540,7 +540,7 @@
540540
files = (
541541
EE247B671C3F3FEC00AE3E12 /* fts3_tokenizer.h in Headers */,
542542
EE247B621C3F3FDB00AE3E12 /* SQLite.h in Headers */,
543-
EE91808F1C46E76D0038162A /* SQLite-Bridging.h in Headers */,
543+
EE91808F1C46E76D0038162A /* SQLiteObjc.h in Headers */,
544544
);
545545
runOnlyForDeploymentPostprocessing = 0;
546546
};

‎SQLite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎Sources/SQLite/SQLite.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
FOUNDATION_EXPORT double SQLiteVersionNumber;
44
FOUNDATION_EXPORT const unsigned char SQLiteVersionString[];
55

6-
#import <SQLite/SQLite-Bridging.h>
6+
#import <SQLite/SQLiteObjc.h>

‎Sources/SQLiteObjc/SQLite-Bridging.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// THE SOFTWARE.
2323
//
2424

25-
#import "SQLite-Bridging.h"
25+
#import "SQLiteObjc.h"
2626
#import "fts3_tokenizer.h"
2727

2828
#pragma mark - FTS

‎Sources/SQLiteObjc/include/SQLite-Bridging.h renamed to ‎Sources/SQLiteObjc/include/SQLiteObjc.h

File renamed without changes.

0 commit comments

Comments
 (0)