Skip to content

Commit 811c41a

Browse files
grouegroue
committed
1 parent a9036a4 commit 811c41a

File tree

45 files changed

+92
-2070
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+92
-2070
lines changed

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
56026CAC25B8A7EF00D1DF3F /* PlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56026CAA25B8A7EF00D1DF3F /* PlayerTests.swift */; };
1111
56026CAD25B8A7EF00D1DF3F /* AppDatabaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56026CAB25B8A7EF00D1DF3F /* AppDatabaseTests.swift */; };
12+
56519DCA274FC8E900ED16D8 /* GRDBQuery in Frameworks */ = {isa = PBXBuildFile; productRef = 56519DC9274FC8E900ED16D8 /* GRDBQuery */; };
1213
5671723A261B23C800423B6F /* PlayerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56717239261B23C800423B6F /* PlayerList.swift */; };
1314
56717252261B334D00423B6F /* PlayerRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56717251261B334D00423B6F /* PlayerRequestTests.swift */; };
1415
567C3E1A2520B6DE0011F6E9 /* GRDBAsyncDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567C3E192520B6DE0011F6E9 /* GRDBAsyncDemoApp.swift */; };
@@ -25,7 +26,6 @@
2526
567C3E7A2520BB650011F6E9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 567C3E772520BB650011F6E9 /* LaunchScreen.storyboard */; };
2627
56B6D1092619EC1B003CC455 /* PlayerRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B6D1082619EC1B003CC455 /* PlayerRequest.swift */; };
2728
56F8A13527359A5A0011ACBE /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 56F8A13427359A5A0011ACBE /* GRDB */; };
28-
56F8A13727359A5A0011ACBE /* Query in Frameworks */ = {isa = PBXBuildFile; productRef = 56F8A13627359A5A0011ACBE /* Query */; };
2929
78E2F9E6261EEC22005D1F7F /* GRDBAsyncDemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E2F9E5261EEC22005D1F7F /* GRDBAsyncDemoUITests.swift */; };
3030
/* End PBXBuildFile section */
3131

@@ -82,7 +82,6 @@
8282
567C3E782520BB650011F6E9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
8383
56B6D1082619EC1B003CC455 /* PlayerRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerRequest.swift; sourceTree = "<group>"; };
8484
56F8A12E27359A350011ACBE /* GRDB.swift */ = {isa = PBXFileReference; lastKnownFileType = folder; name = GRDB.swift; path = ../../..; sourceTree = "<group>"; };
85-
56F8A12F27359A3B0011ACBE /* Query */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Query; path = ../Query; sourceTree = "<group>"; };
8685
78E2F9E3261EEC22005D1F7F /* GRDBAsyncDemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBAsyncDemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8786
78E2F9E5261EEC22005D1F7F /* GRDBAsyncDemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRDBAsyncDemoUITests.swift; sourceTree = "<group>"; };
8887
78E2F9E7261EEC22005D1F7F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -100,8 +99,8 @@
10099
isa = PBXFrameworksBuildPhase;
101100
buildActionMask = 2147483647;
102101
files = (
102+
56519DCA274FC8E900ED16D8 /* GRDBQuery in Frameworks */,
103103
56F8A13527359A5A0011ACBE /* GRDB in Frameworks */,
104-
56F8A13727359A5A0011ACBE /* Query in Frameworks */,
105104
);
106105
runOnlyForDeploymentPostprocessing = 0;
107106
};
@@ -145,7 +144,6 @@
145144
567C3E172520B6DE0011F6E9 /* Products */,
146145
567C3E4D2520B70E0011F6E9 /* Frameworks */,
147146
56F8A12E27359A350011ACBE /* GRDB.swift */,
148-
56F8A12F27359A3B0011ACBE /* Query */,
149147
);
150148
sourceTree = "<group>";
151149
};
@@ -245,12 +243,11 @@
245243
);
246244
dependencies = (
247245
56F8A13127359A540011ACBE /* PBXTargetDependency */,
248-
56F8A13327359A540011ACBE /* PBXTargetDependency */,
249246
);
250247
name = GRDBAsyncDemo;
251248
packageProductDependencies = (
252249
56F8A13427359A5A0011ACBE /* GRDB */,
253-
56F8A13627359A5A0011ACBE /* Query */,
250+
56519DC9274FC8E900ED16D8 /* GRDBQuery */,
254251
);
255252
productName = GRBCombineDemo;
256253
productReference = 567C3E162520B6DE0011F6E9 /* GRDBAsyncDemo.app */;
@@ -305,6 +302,9 @@
305302
Base,
306303
);
307304
mainGroup = 567C3E0D2520B6DE0011F6E9;
305+
packageReferences = (
306+
56519DC8274FC8E900ED16D8 /* XCRemoteSwiftPackageReference "GRDBQuery" */,
307+
);
308308
productRefGroup = 567C3E172520B6DE0011F6E9 /* Products */;
309309
projectDirPath = "";
310310
projectRoot = "";
@@ -392,10 +392,6 @@
392392
isa = PBXTargetDependency;
393393
productRef = 56F8A13027359A540011ACBE /* GRDB */;
394394
};
395-
56F8A13327359A540011ACBE /* PBXTargetDependency */ = {
396-
isa = PBXTargetDependency;
397-
productRef = 56F8A13227359A540011ACBE /* Query */;
398-
};
399395
78E2F9E9261EEC22005D1F7F /* PBXTargetDependency */ = {
400396
isa = PBXTargetDependency;
401397
target = 567C3E152520B6DE0011F6E9 /* GRDBAsyncDemo */;
@@ -700,23 +696,31 @@
700696
};
701697
/* End XCConfigurationList section */
702698

699+
/* Begin XCRemoteSwiftPackageReference section */
700+
56519DC8274FC8E900ED16D8 /* XCRemoteSwiftPackageReference "GRDBQuery" */ = {
701+
isa = XCRemoteSwiftPackageReference;
702+
repositoryURL = "https://github.com/groue/GRDBQuery";
703+
requirement = {
704+
kind = upToNextMajorVersion;
705+
minimumVersion = 0.1.0;
706+
};
707+
};
708+
/* End XCRemoteSwiftPackageReference section */
709+
703710
/* Begin XCSwiftPackageProductDependency section */
704-
56F8A13027359A540011ACBE /* GRDB */ = {
711+
56519DC9274FC8E900ED16D8 /* GRDBQuery */ = {
705712
isa = XCSwiftPackageProductDependency;
706-
productName = GRDB;
713+
package = 56519DC8274FC8E900ED16D8 /* XCRemoteSwiftPackageReference "GRDBQuery" */;
714+
productName = GRDBQuery;
707715
};
708-
56F8A13227359A540011ACBE /* Query */ = {
716+
56F8A13027359A540011ACBE /* GRDB */ = {
709717
isa = XCSwiftPackageProductDependency;
710-
productName = Query;
718+
productName = GRDB;
711719
};
712720
56F8A13427359A5A0011ACBE /* GRDB */ = {
713721
isa = XCSwiftPackageProductDependency;
714722
productName = GRDB;
715723
};
716-
56F8A13627359A5A0011ACBE /* Query */ = {
717-
isa = XCSwiftPackageProductDependency;
718-
productName = Query;
719-
};
720724
/* End XCSwiftPackageProductDependency section */
721725
};
722726
rootObject = 567C3E0E2520B6DE0011F6E9 /* Project object */;

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/GRDBAsyncDemoApp.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Query
1+
import GRDBQuery
22
import SwiftUI
33

44
@main
@@ -29,7 +29,7 @@ extension EnvironmentValues {
2929
}
3030

3131
// In this demo app, views observe the database with the @Query property
32-
// wrapper, defined in the local Query package. Its documentation recommends to
32+
// wrapper, defined in the GRDBQuery package. Its documentation recommends to
3333
// define a dedicated initializer for `appDatabase` access, so we comply:
3434

3535
extension Query where Request.DatabaseContext == AppDatabase {

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/PlayerRequest.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import Combine
22
import GRDB
3-
import Query
3+
import GRDBQuery
44

55
/// A player request can be used with the `@Query` property wrapper in order to
66
/// feed a view with a list of players.

‎Documentation/DemoApps/GRDBAsyncDemo/GRDBAsyncDemo/Views/AppView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Query
1+
import GRDBQuery
22
import SwiftUI
33

44
/// The main application view

‎Documentation/DemoApps/GRDBAsyncDemo/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ The topics covered in this demo are:
3535

3636
`Player` is a [Record](../../../README.md#records) type, able to read and write in the database. It conforms to the standard Codable protocol in order to gain all advantages of [Codable Records](../../../README.md#codable-records).
3737

38-
- [PlayerRequest.swift](GRDBAsyncDemo/PlayerRequest.swift), [Query.swift](GRDBAsyncDemo/Query.swift), [AppView.swift](GRDBAsyncDemo/Views/AppView.swift)
38+
- [PlayerRequest.swift](GRDBAsyncDemo/PlayerRequest.swift), [AppView.swift](GRDBAsyncDemo/Views/AppView.swift)
3939

4040
`PlayerRequest` defines the player requests used by the app (sorted by score, or by name).
4141

42-
`PlayerRequest` feeds the `@Query` property wrapper. `@Query`, inspired by [this article](https://davedelong.com/blog/2021/04/03/core-data-and-swiftui/), allows SwiftUI views to display up-to-date database content thanks to GRDB's [ValueObservation](../../../README.md#valueobservation).
42+
`PlayerRequest` feeds the `@Query` property wrapper (`@Query`, defined in [GRDBQuery](https://github.com/groue/GRDBQuery), allows SwiftUI views to display up-to-date database content).
4343

4444
`AppView` is the SwiftUI view that uses `@Query` in order to feed its player list.
4545

‎Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj/project.pbxproj‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
56026CAC25B8A7EF00D1DF3F /* PlayerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56026CAA25B8A7EF00D1DF3F /* PlayerTests.swift */; };
1111
56026CAD25B8A7EF00D1DF3F /* AppDatabaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56026CAB25B8A7EF00D1DF3F /* AppDatabaseTests.swift */; };
12+
56519DC7274FC85600ED16D8 /* GRDBQuery in Frameworks */ = {isa = PBXBuildFile; productRef = 56519DC6274FC85600ED16D8 /* GRDBQuery */; };
1213
5671723A261B23C800423B6F /* PlayerList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56717239261B23C800423B6F /* PlayerList.swift */; };
1314
56717252261B334D00423B6F /* PlayerRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56717251261B334D00423B6F /* PlayerRequestTests.swift */; };
1415
567C3E1A2520B6DE0011F6E9 /* GRDBCombineDemoApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 567C3E192520B6DE0011F6E9 /* GRDBCombineDemoApp.swift */; };
@@ -25,7 +26,6 @@
2526
567C3E7A2520BB650011F6E9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 567C3E772520BB650011F6E9 /* LaunchScreen.storyboard */; };
2627
56B6D1092619EC1B003CC455 /* PlayerRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 56B6D1082619EC1B003CC455 /* PlayerRequest.swift */; };
2728
56F8A1202735989D0011ACBE /* GRDB in Frameworks */ = {isa = PBXBuildFile; productRef = 56F8A11F2735989D0011ACBE /* GRDB */; };
28-
56F8A125273599D50011ACBE /* Query in Frameworks */ = {isa = PBXBuildFile; productRef = 56F8A124273599D50011ACBE /* Query */; };
2929
78E2F9E6261EEC22005D1F7F /* GRDBCombineDemoUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78E2F9E5261EEC22005D1F7F /* GRDBCombineDemoUITests.swift */; };
3030
/* End PBXBuildFile section */
3131

@@ -82,7 +82,6 @@
8282
567C3E782520BB650011F6E9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
8383
56B6D1082619EC1B003CC455 /* PlayerRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerRequest.swift; sourceTree = "<group>"; };
8484
56F8A11C2735988F0011ACBE /* GRDB.swift */ = {isa = PBXFileReference; lastKnownFileType = folder; name = GRDB.swift; path = ../../..; sourceTree = "<group>"; };
85-
56F8A121273599220011ACBE /* Query */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Query; path = ../Query; sourceTree = "<group>"; };
8685
78E2F9E3261EEC22005D1F7F /* GRDBCombineDemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GRDBCombineDemoUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
8786
78E2F9E5261EEC22005D1F7F /* GRDBCombineDemoUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GRDBCombineDemoUITests.swift; sourceTree = "<group>"; };
8887
78E2F9E7261EEC22005D1F7F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -100,8 +99,8 @@
10099
isa = PBXFrameworksBuildPhase;
101100
buildActionMask = 2147483647;
102101
files = (
102+
56519DC7274FC85600ED16D8 /* GRDBQuery in Frameworks */,
103103
56F8A1202735989D0011ACBE /* GRDB in Frameworks */,
104-
56F8A125273599D50011ACBE /* Query in Frameworks */,
105104
);
106105
runOnlyForDeploymentPostprocessing = 0;
107106
};
@@ -145,7 +144,6 @@
145144
567C3E172520B6DE0011F6E9 /* Products */,
146145
567C3E4D2520B70E0011F6E9 /* Frameworks */,
147146
56F8A11C2735988F0011ACBE /* GRDB.swift */,
148-
56F8A121273599220011ACBE /* Query */,
149147
);
150148
sourceTree = "<group>";
151149
};
@@ -244,13 +242,12 @@
244242
buildRules = (
245243
);
246244
dependencies = (
247-
56F8A123273599D20011ACBE /* PBXTargetDependency */,
248245
56F8A11E273598960011ACBE /* PBXTargetDependency */,
249246
);
250247
name = GRDBCombineDemo;
251248
packageProductDependencies = (
252249
56F8A11F2735989D0011ACBE /* GRDB */,
253-
56F8A124273599D50011ACBE /* Query */,
250+
56519DC6274FC85600ED16D8 /* GRDBQuery */,
254251
);
255252
productName = GRBCombineDemo;
256253
productReference = 567C3E162520B6DE0011F6E9 /* GRDBCombineDemo.app */;
@@ -305,6 +302,9 @@
305302
Base,
306303
);
307304
mainGroup = 567C3E0D2520B6DE0011F6E9;
305+
packageReferences = (
306+
56519DC5274FC85600ED16D8 /* XCRemoteSwiftPackageReference "GRDBQuery" */,
307+
);
308308
productRefGroup = 567C3E172520B6DE0011F6E9 /* Products */;
309309
projectDirPath = "";
310310
projectRoot = "";
@@ -392,10 +392,6 @@
392392
isa = PBXTargetDependency;
393393
productRef = 56F8A11D273598960011ACBE /* GRDB */;
394394
};
395-
56F8A123273599D20011ACBE /* PBXTargetDependency */ = {
396-
isa = PBXTargetDependency;
397-
productRef = 56F8A122273599D20011ACBE /* Query */;
398-
};
399395
78E2F9E9261EEC22005D1F7F /* PBXTargetDependency */ = {
400396
isa = PBXTargetDependency;
401397
target = 567C3E152520B6DE0011F6E9 /* GRDBCombineDemo */;
@@ -698,7 +694,23 @@
698694
};
699695
/* End XCConfigurationList section */
700696

697+
/* Begin XCRemoteSwiftPackageReference section */
698+
56519DC5274FC85600ED16D8 /* XCRemoteSwiftPackageReference "GRDBQuery" */ = {
699+
isa = XCRemoteSwiftPackageReference;
700+
repositoryURL = "https://github.com/groue/GRDBQuery";
701+
requirement = {
702+
kind = upToNextMajorVersion;
703+
minimumVersion = 0.1.0;
704+
};
705+
};
706+
/* End XCRemoteSwiftPackageReference section */
707+
701708
/* Begin XCSwiftPackageProductDependency section */
709+
56519DC6274FC85600ED16D8 /* GRDBQuery */ = {
710+
isa = XCSwiftPackageProductDependency;
711+
package = 56519DC5274FC85600ED16D8 /* XCRemoteSwiftPackageReference "GRDBQuery" */;
712+
productName = GRDBQuery;
713+
};
702714
56F8A11D273598960011ACBE /* GRDB */ = {
703715
isa = XCSwiftPackageProductDependency;
704716
productName = GRDB;
@@ -707,14 +719,6 @@
707719
isa = XCSwiftPackageProductDependency;
708720
productName = GRDB;
709721
};
710-
56F8A122273599D20011ACBE /* Query */ = {
711-
isa = XCSwiftPackageProductDependency;
712-
productName = Query;
713-
};
714-
56F8A124273599D50011ACBE /* Query */ = {
715-
isa = XCSwiftPackageProductDependency;
716-
productName = Query;
717-
};
718722
/* End XCSwiftPackageProductDependency section */
719723
};
720724
rootObject = 567C3E0E2520B6DE0011F6E9 /* Project object */;

‎Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Documentation/DemoApps/GRDBCombineDemo/GRDBCombineDemo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)