Skip to content

Commit 2b4d017

Browse files
stevensJourneystevensJourney
committed
Merge branch 'grdb' into grdb-csqlite
2 parents 41aafe1 + fa38d31 commit 2b4d017

File tree

4 files changed

+0
-317
lines changed

4 files changed

+0
-317
lines changed

‎Demo/GRDB Demo/GRDB Demo.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 252 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,6 @@
1313
BE1EAC4F2E7C461800D0A0A7 /* Supabase in Frameworks */ = {isa = PBXBuildFile; productRef = BE1EAC4E2E7C461800D0A0A7 /* Supabase */; };
1414
/* End PBXBuildFile section */
1515

16-
/* Begin PBXContainerItemProxy section */
17-
BE1EABB32E7B075E00D0A0A7 /* PBXContainerItemProxy */ = {
18-
isa = PBXContainerItemProxy;
19-
containerPortal = BE1EAB9D2E7B075D00D0A0A7 /* Project object */;
20-
proxyType = 1;
21-
remoteGlobalIDString = BE1EABA42E7B075D00D0A0A7;
22-
remoteInfo = "GRDB Demo";
23-
};
24-
BE1EABBD2E7B075E00D0A0A7 /* PBXContainerItemProxy */ = {
25-
isa = PBXContainerItemProxy;
26-
containerPortal = BE1EAB9D2E7B075D00D0A0A7 /* Project object */;
27-
proxyType = 1;
28-
remoteGlobalIDString = BE1EABA42E7B075D00D0A0A7;
29-
remoteInfo = "GRDB Demo";
30-
};
31-
/* End PBXContainerItemProxy section */
32-
3316
/* Begin PBXCopyFilesBuildPhase section */
3417
BE1EABEE2E7C26DD00D0A0A7 /* Embed Frameworks */ = {
3518
isa = PBXCopyFilesBuildPhase;
@@ -55,8 +38,6 @@
5538

5639
/* Begin PBXFileReference section */
5740
BE1EABA52E7B075D00D0A0A7 /* GRDB Demo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "GRDB Demo.app"; sourceTree = BUILT_PRODUCTS_DIR; };
58-
BE1EABB22E7B075E00D0A0A7 /* GRDB DemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "GRDB DemoTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
59-
BE1EABBC2E7B075E00D0A0A7 /* GRDB DemoUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "GRDB DemoUITests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
6041
/* End PBXFileReference section */
6142

6243
/* Begin PBXFileSystemSynchronizedRootGroup section */
@@ -89,20 +70,6 @@
8970
);
9071
runOnlyForDeploymentPostprocessing = 0;
9172
};
92-
BE1EABAF2E7B075E00D0A0A7 /* Frameworks */ = {
93-
isa = PBXFrameworksBuildPhase;
94-
buildActionMask = 2147483647;
95-
files = (
96-
);
97-
runOnlyForDeploymentPostprocessing = 0;
98-
};
99-
BE1EABB92E7B075E00D0A0A7 /* Frameworks */ = {
100-
isa = PBXFrameworksBuildPhase;
101-
buildActionMask = 2147483647;
102-
files = (
103-
);
104-
runOnlyForDeploymentPostprocessing = 0;
105-
};
10673
/* End PBXFrameworksBuildPhase section */
10774

10875
/* Begin PBXGroup section */
@@ -121,8 +88,6 @@
12188
isa = PBXGroup;
12289
children = (
12390
BE1EABA52E7B075D00D0A0A7 /* GRDB Demo.app */,
124-
BE1EABB22E7B075E00D0A0A7 /* GRDB DemoTests.xctest */,
125-
BE1EABBC2E7B075E00D0A0A7 /* GRDB DemoUITests.xctest */,
12691
);
12792
name = Products;
12893
sourceTree = "<group>";
@@ -165,52 +130,6 @@
165130
productReference = BE1EABA52E7B075D00D0A0A7 /* GRDB Demo.app */;
166131
productType = "com.apple.product-type.application";
167132
};
168-
BE1EABB12E7B075E00D0A0A7 /* GRDB DemoTests */ = {
169-
isa = PBXNativeTarget;
170-
buildConfigurationList = BE1EABC92E7B075E00D0A0A7 /* Build configuration list for PBXNativeTarget "GRDB DemoTests" */;
171-
buildPhases = (
172-
BE1EABAE2E7B075E00D0A0A7 /* Sources */,
173-
BE1EABAF2E7B075E00D0A0A7 /* Frameworks */,
174-
BE1EABB02E7B075E00D0A0A7 /* Resources */,
175-
);
176-
buildRules = (
177-
);
178-
dependencies = (
179-
BE1EABB42E7B075E00D0A0A7 /* PBXTargetDependency */,
180-
);
181-
fileSystemSynchronizedGroups = (
182-
BE1EABB52E7B075E00D0A0A7 /* GRDB DemoTests */,
183-
);
184-
name = "GRDB DemoTests";
185-
packageProductDependencies = (
186-
);
187-
productName = "GRDB DemoTests";
188-
productReference = BE1EABB22E7B075E00D0A0A7 /* GRDB DemoTests.xctest */;
189-
productType = "com.apple.product-type.bundle.unit-test";
190-
};
191-
BE1EABBB2E7B075E00D0A0A7 /* GRDB DemoUITests */ = {
192-
isa = PBXNativeTarget;
193-
buildConfigurationList = BE1EABCC2E7B075E00D0A0A7 /* Build configuration list for PBXNativeTarget "GRDB DemoUITests" */;
194-
buildPhases = (
195-
BE1EABB82E7B075E00D0A0A7 /* Sources */,
196-
BE1EABB92E7B075E00D0A0A7 /* Frameworks */,
197-
BE1EABBA2E7B075E00D0A0A7 /* Resources */,
198-
);
199-
buildRules = (
200-
);
201-
dependencies = (
202-
BE1EABBE2E7B075E00D0A0A7 /* PBXTargetDependency */,
203-
);
204-
fileSystemSynchronizedGroups = (
205-
BE1EABBF2E7B075E00D0A0A7 /* GRDB DemoUITests */,
206-
);
207-
name = "GRDB DemoUITests";
208-
packageProductDependencies = (
209-
);
210-
productName = "GRDB DemoUITests";
211-
productReference = BE1EABBC2E7B075E00D0A0A7 /* GRDB DemoUITests.xctest */;
212-
productType = "com.apple.product-type.bundle.ui-testing";
213-
};
214133
/* End PBXNativeTarget section */
215134

216135
/* Begin PBXProject section */
@@ -224,14 +143,6 @@
224143
BE1EABA42E7B075D00D0A0A7 = {
225144
CreatedOnToolsVersion = 26.0;
226145
};
227-
BE1EABB12E7B075E00D0A0A7 = {
228-
CreatedOnToolsVersion = 26.0;
229-
TestTargetID = BE1EABA42E7B075D00D0A0A7;
230-
};
231-
BE1EABBB2E7B075E00D0A0A7 = {
232-
CreatedOnToolsVersion = 26.0;
233-
TestTargetID = BE1EABA42E7B075D00D0A0A7;
234-
};
235146
};
236147
};
237148
buildConfigurationList = BE1EABA02E7B075D00D0A0A7 /* Build configuration list for PBXProject "GRDB Demo" */;
@@ -254,8 +165,6 @@
254165
projectRoot = "";
255166
targets = (
256167
BE1EABA42E7B075D00D0A0A7 /* GRDB Demo */,
257-
BE1EABB12E7B075E00D0A0A7 /* GRDB DemoTests */,
258-
BE1EABBB2E7B075E00D0A0A7 /* GRDB DemoUITests */,
259168
);
260169
};
261170
/* End PBXProject section */
@@ -268,20 +177,6 @@
268177
);
269178
runOnlyForDeploymentPostprocessing = 0;
270179
};
271-
BE1EABB02E7B075E00D0A0A7 /* Resources */ = {
272-
isa = PBXResourcesBuildPhase;
273-
buildActionMask = 2147483647;
274-
files = (
275-
);
276-
runOnlyForDeploymentPostprocessing = 0;
277-
};
278-
BE1EABBA2E7B075E00D0A0A7 /* Resources */ = {
279-
isa = PBXResourcesBuildPhase;
280-
buildActionMask = 2147483647;
281-
files = (
282-
);
283-
runOnlyForDeploymentPostprocessing = 0;
284-
};
285180
/* End PBXResourcesBuildPhase section */
286181

287182
/* Begin PBXSourcesBuildPhase section */
@@ -292,35 +187,8 @@
292187
);
293188
runOnlyForDeploymentPostprocessing = 0;
294189
};
295-
BE1EABAE2E7B075E00D0A0A7 /* Sources */ = {
296-
isa = PBXSourcesBuildPhase;
297-
buildActionMask = 2147483647;
298-
files = (
299-
);
300-
runOnlyForDeploymentPostprocessing = 0;
301-
};
302-
BE1EABB82E7B075E00D0A0A7 /* Sources */ = {
303-
isa = PBXSourcesBuildPhase;
304-
buildActionMask = 2147483647;
305-
files = (
306-
);
307-
runOnlyForDeploymentPostprocessing = 0;
308-
};
309190
/* End PBXSourcesBuildPhase section */
310191

311-
/* Begin PBXTargetDependency section */
312-
BE1EABB42E7B075E00D0A0A7 /* PBXTargetDependency */ = {
313-
isa = PBXTargetDependency;
314-
target = BE1EABA42E7B075D00D0A0A7 /* GRDB Demo */;
315-
targetProxy = BE1EABB32E7B075E00D0A0A7 /* PBXContainerItemProxy */;
316-
};
317-
BE1EABBE2E7B075E00D0A0A7 /* PBXTargetDependency */ = {
318-
isa = PBXTargetDependency;
319-
target = BE1EABA42E7B075D00D0A0A7 /* GRDB Demo */;
320-
targetProxy = BE1EABBD2E7B075E00D0A0A7 /* PBXContainerItemProxy */;
321-
};
322-
/* End PBXTargetDependency section */
323-
324192
/* Begin XCBuildConfiguration section */
325193
BE1EABC42E7B075E00D0A0A7 /* Debug */ = {
326194
isa = XCBuildConfiguration;
@@ -546,108 +414,6 @@
546414
};
547415
name = Release;
548416
};
549-
BE1EABCA2E7B075E00D0A0A7 /* Debug */ = {
550-
isa = XCBuildConfiguration;
551-
buildSettings = {
552-
BUNDLE_LOADER = "$(TEST_HOST)";
553-
CODE_SIGN_STYLE = Automatic;
554-
CURRENT_PROJECT_VERSION = 1;
555-
DEVELOPMENT_TEAM = ZGT7463CVJ;
556-
GENERATE_INFOPLIST_FILE = YES;
557-
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
558-
MACOSX_DEPLOYMENT_TARGET = 15.6;
559-
MARKETING_VERSION = 1.0;
560-
PRODUCT_BUNDLE_IDENTIFIER = "JourneyApps.GRDB-DemoTests";
561-
PRODUCT_NAME = "$(TARGET_NAME)";
562-
SDKROOT = auto;
563-
STRING_CATALOG_GENERATE_SYMBOLS = NO;
564-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
565-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
566-
SWIFT_EMIT_LOC_STRINGS = NO;
567-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
568-
SWIFT_VERSION = 5.0;
569-
TARGETED_DEVICE_FAMILY = "1,2,7";
570-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GRDB Demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/GRDB Demo";
571-
XROS_DEPLOYMENT_TARGET = 26.0;
572-
};
573-
name = Debug;
574-
};
575-
BE1EABCB2E7B075E00D0A0A7 /* Release */ = {
576-
isa = XCBuildConfiguration;
577-
buildSettings = {
578-
BUNDLE_LOADER = "$(TEST_HOST)";
579-
CODE_SIGN_STYLE = Automatic;
580-
CURRENT_PROJECT_VERSION = 1;
581-
DEVELOPMENT_TEAM = ZGT7463CVJ;
582-
GENERATE_INFOPLIST_FILE = YES;
583-
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
584-
MACOSX_DEPLOYMENT_TARGET = 15.6;
585-
MARKETING_VERSION = 1.0;
586-
PRODUCT_BUNDLE_IDENTIFIER = "JourneyApps.GRDB-DemoTests";
587-
PRODUCT_NAME = "$(TARGET_NAME)";
588-
SDKROOT = auto;
589-
STRING_CATALOG_GENERATE_SYMBOLS = NO;
590-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
591-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
592-
SWIFT_EMIT_LOC_STRINGS = NO;
593-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
594-
SWIFT_VERSION = 5.0;
595-
TARGETED_DEVICE_FAMILY = "1,2,7";
596-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/GRDB Demo.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/GRDB Demo";
597-
XROS_DEPLOYMENT_TARGET = 26.0;
598-
};
599-
name = Release;
600-
};
601-
BE1EABCD2E7B075E00D0A0A7 /* Debug */ = {
602-
isa = XCBuildConfiguration;
603-
buildSettings = {
604-
CODE_SIGN_STYLE = Automatic;
605-
CURRENT_PROJECT_VERSION = 1;
606-
DEVELOPMENT_TEAM = ZGT7463CVJ;
607-
GENERATE_INFOPLIST_FILE = YES;
608-
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
609-
MACOSX_DEPLOYMENT_TARGET = 15.6;
610-
MARKETING_VERSION = 1.0;
611-
PRODUCT_BUNDLE_IDENTIFIER = "JourneyApps.GRDB-DemoUITests";
612-
PRODUCT_NAME = "$(TARGET_NAME)";
613-
SDKROOT = auto;
614-
STRING_CATALOG_GENERATE_SYMBOLS = NO;
615-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
616-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
617-
SWIFT_EMIT_LOC_STRINGS = NO;
618-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
619-
SWIFT_VERSION = 5.0;
620-
TARGETED_DEVICE_FAMILY = "1,2,7";
621-
TEST_TARGET_NAME = "GRDB Demo";
622-
XROS_DEPLOYMENT_TARGET = 26.0;
623-
};
624-
name = Debug;
625-
};
626-
BE1EABCE2E7B075E00D0A0A7 /* Release */ = {
627-
isa = XCBuildConfiguration;
628-
buildSettings = {
629-
CODE_SIGN_STYLE = Automatic;
630-
CURRENT_PROJECT_VERSION = 1;
631-
DEVELOPMENT_TEAM = ZGT7463CVJ;
632-
GENERATE_INFOPLIST_FILE = YES;
633-
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
634-
MACOSX_DEPLOYMENT_TARGET = 15.6;
635-
MARKETING_VERSION = 1.0;
636-
PRODUCT_BUNDLE_IDENTIFIER = "JourneyApps.GRDB-DemoUITests";
637-
PRODUCT_NAME = "$(TARGET_NAME)";
638-
SDKROOT = auto;
639-
STRING_CATALOG_GENERATE_SYMBOLS = NO;
640-
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator";
641-
SWIFT_APPROACHABLE_CONCURRENCY = YES;
642-
SWIFT_EMIT_LOC_STRINGS = NO;
643-
SWIFT_UPCOMING_FEATURE_MEMBER_IMPORT_VISIBILITY = YES;
644-
SWIFT_VERSION = 5.0;
645-
TARGETED_DEVICE_FAMILY = "1,2,7";
646-
TEST_TARGET_NAME = "GRDB Demo";
647-
XROS_DEPLOYMENT_TARGET = 26.0;
648-
};
649-
name = Release;
650-
};
651417
/* End XCBuildConfiguration section */
652418

653419
/* Begin XCConfigurationList section */
@@ -669,24 +435,6 @@
669435
defaultConfigurationIsVisible = 0;
670436
defaultConfigurationName = Release;
671437
};
672-
BE1EABC92E7B075E00D0A0A7 /* Build configuration list for PBXNativeTarget "GRDB DemoTests" */ = {
673-
isa = XCConfigurationList;
674-
buildConfigurations = (
675-
BE1EABCA2E7B075E00D0A0A7 /* Debug */,
676-
BE1EABCB2E7B075E00D0A0A7 /* Release */,
677-
);
678-
defaultConfigurationIsVisible = 0;
679-
defaultConfigurationName = Release;
680-
};
681-
BE1EABCC2E7B075E00D0A0A7 /* Build configuration list for PBXNativeTarget "GRDB DemoUITests" */ = {
682-
isa = XCConfigurationList;
683-
buildConfigurations = (
684-
BE1EABCD2E7B075E00D0A0A7 /* Debug */,
685-
BE1EABCE2E7B075E00D0A0A7 /* Release */,
686-
);
687-
defaultConfigurationIsVisible = 0;
688-
defaultConfigurationName = Release;
689-
};
690438
/* End XCConfigurationList section */
691439

692440
/* Begin XCLocalSwiftPackageReference section */

‎Demo/GRDB Demo/GRDB DemoTests/GRDB_DemoTests.swift‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Demo/GRDB Demo/GRDB DemoUITests/GRDB_DemoUITests.swift‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎Demo/GRDB Demo/GRDB DemoUITests/GRDB_DemoUITestsLaunchTests.swift‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)