Skip to content

Commit 9af4ec8

Browse files
brentleyjonesbrentleyjones
committed
Add support for Core Data model files
1 parent 7d49be4 commit 9af4ec8

File tree

27 files changed

+507
-46
lines changed

27 files changed

+507
-46
lines changed

‎.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# To update these lines, execute
22
# `bazel run @cgrindel_rules_bazel_integration_test//tools:update_deleted_packages`
3-
build --deleted_packages=examples/cc/external,examples/command_line/external,examples/ios_app,examples/ios_app/CoreUtilsObjC,examples/ios_app/Example,examples/ios_app/ExampleObjcTests,examples/ios_app/ExampleResources,examples/ios_app/ExampleTests,examples/ios_app/ExampleUITests,examples/ios_app/TestingUtils,examples/ios_app/Utils,examples/ios_app/external,examples/ios_app/test/fixtures,examples/ios_app/third_party
4-
query --deleted_packages=examples/cc/external,examples/command_line/external,examples/ios_app,examples/ios_app/CoreUtilsObjC,examples/ios_app/Example,examples/ios_app/ExampleObjcTests,examples/ios_app/ExampleResources,examples/ios_app/ExampleTests,examples/ios_app/ExampleUITests,examples/ios_app/TestingUtils,examples/ios_app/Utils,examples/ios_app/external,examples/ios_app/test/fixtures,examples/ios_app/third_party
3+
build --deleted_packages=examples/cc/external,examples/ios_app,examples/ios_app/CoreUtilsObjC,examples/ios_app/Example,examples/ios_app/ExampleObjcTests,examples/ios_app/ExampleResources,examples/ios_app/ExampleTests,examples/ios_app/ExampleUITests,examples/ios_app/TestingUtils,examples/ios_app/Utils,examples/ios_app/external,examples/ios_app/test/fixtures,examples/ios_app/third_party
4+
query --deleted_packages=examples/cc/external,examples/ios_app,examples/ios_app/CoreUtilsObjC,examples/ios_app/Example,examples/ios_app/ExampleObjcTests,examples/ios_app/ExampleResources,examples/ios_app/ExampleTests,examples/ios_app/ExampleUITests,examples/ios_app/TestingUtils,examples/ios_app/Utils,examples/ios_app/external,examples/ios_app/test/fixtures,examples/ios_app/third_party
55

66
# Import Shared settings
77
import %workspace%/shared.bazelrc

‎BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ filegroup(
5454
"//tools:all_files",
5555
"//tools/generator:all_files",
5656
"//tools/generator/test:all_files",
57+
"//tools/xccurrentversions_parser:all_files",
5758
"//xcodeproj:all_files",
5859
"//xcodeproj/internal:all_files",
5960
],

‎examples/ios_app/Example/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ apple_resource_group(
2727
resources = glob(
2828
[
2929
"Assets.xcassets/**",
30+
"Model.xcdatamodeld/**",
3031
"*.lproj/**",
3132
],
3233
exclude = ["Assets.xcassets/AppIcon.appiconset/**"],

‎examples/ios_app/Example/Model.xcdatamodeld/.xccurrentversion

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>_XCCurrentVersionName</key>
6+
<string>Model2.xcdatamodel</string>
7+
</dict>
8+
</plist>

‎examples/ios_app/Example/Model.xcdatamodeld/Model.xcdatamodel/contents

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21C52" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
3+
<elements/>
4+
</model>

‎examples/ios_app/Example/Model.xcdatamodeld/Model2.xcdatamodel/contents

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="20086" systemVersion="21C52" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
3+
<elements/>
4+
</model>

‎examples/ios_app/test/fixtures/project.xcodeproj/project.pbxproj

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
9194957C11E639A47F6F9B3C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C3C4594509740C3A3C0835CC /* Assets.xcassets */; };
5353
A20F9915BC31FA63002163E7 /* ExampleObjcTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A0B3DE95D17EDB4EEF586E35 /* ExampleObjcTests.m */; };
5454
A3ADDDD00B8798D8C12477BC /* Utils.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0D71BEB41FFFA97C5AAF35CE /* Utils.bundle */; };
55+
A57C8D9E2594C26ABB39104A /* Model.xcdatamodeld in Resources */ = {isa = PBXBuildFile; fileRef = 7F286E0ADC62AF7C5E37A9AC /* Model.xcdatamodeld */; };
5556
AE2C4E59A2F6A848808F8249 /* ExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D699DE3520D61FDC19A909EF /* ExampleApp.swift */; };
5657
C6CB5A5FD193CCABCF030A1E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0E848F62EC3EA16CB8AADB58 /* Assets.xcassets */; };
5758
D318A1B20B60B1F886937BD6 /* ExampleFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EFF54836943E040ACDFCB9FD /* ExampleFramework.framework */; };
@@ -245,6 +246,7 @@
245246
1971CA49644537C181D152F9 /* TestingUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestingUtils.swift; sourceTree = "<group>"; };
246247
1F24BE1ED66E73DF86D94C30 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
247248
2668B72F031658C7424A69C7 /* Greeting.swift.stencil */ = {isa = PBXFileReference; path = Greeting.swift.stencil; sourceTree = "<group>"; };
249+
2E37CBB2D478B38AFA3AD697 /* Model.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model.xcdatamodel; sourceTree = "<group>"; };
248250
332DA7D905FE78395F8B49AB /* ExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
249251
37E1ED3F12607BB25B281B60 /* Utils.swift.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Utils.swift.modulemap; sourceTree = "<group>"; };
250252
3ACA8C2DDE68CE9047B965F6 /* ExampleResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExampleResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -256,6 +258,7 @@
256258
60D06A659C114CE403EAD6BF /* ExternalResources.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ExternalResources.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
257259
68EB39D379DB575C1992811C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
258260
7126B3B29F2941E2615E8B45 /* Utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
261+
72308D2D8DC0FA924558EC0A /* Model2.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model2.xcdatamodel; sourceTree = "<group>"; };
259262
7458A79A895427FF2B5EF451 /* Answers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Answers.h; sourceTree = "<group>"; };
260263
772995ACCC05420BD8295F13 /* libCoreUtilsObjC.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCoreUtilsObjC.a; sourceTree = BUILT_PRODUCTS_DIR; };
261264
7EC6E4D4A0027B9BAE7E7354 /* CoreUtilsObjC.swift.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = CoreUtilsObjC.swift.modulemap; sourceTree = "<group>"; };
@@ -430,6 +433,7 @@
430433
D699DE3520D61FDC19A909EF /* ExampleApp.swift */,
431434
D1F93F75DA88677B3EB84499 /* Info.plist */,
432435
145CCA829262D9783A1B847F /* Localizable.strings */,
436+
7F286E0ADC62AF7C5E37A9AC /* Model.xcdatamodeld */,
433437
);
434438
path = Example;
435439
sourceTree = "<group>";
@@ -937,6 +941,7 @@
937941
C6CB5A5FD193CCABCF030A1E /* Assets.xcassets in Resources */,
938942
EC88DC4B02D420A9A1624A7D /* ExampleResources.bundle in Resources */,
939943
0F959A1FFBE84ABD123A3308 /* Localizable.strings in Resources */,
944+
A57C8D9E2594C26ABB39104A /* Model.xcdatamodeld in Resources */,
940945
31A46C94AAC7DB9BE3E89E4B /* nested in Resources */,
941946
7DAED6E1B30628461B9AC852 /* PreviewAssets.xcassets in Resources */,
942947
03CDFE00832A6AB6DBC242FE /* Utils.bundle in Resources */,
@@ -1936,6 +1941,20 @@
19361941
defaultConfigurationName = Debug;
19371942
};
19381943
/* End XCConfigurationList section */
1944+
1945+
/* Begin XCVersionGroup section */
1946+
7F286E0ADC62AF7C5E37A9AC /* Model.xcdatamodeld */ = {
1947+
isa = XCVersionGroup;
1948+
children = (
1949+
2E37CBB2D478B38AFA3AD697 /* Model.xcdatamodel */,
1950+
72308D2D8DC0FA924558EC0A /* Model2.xcdatamodel */,
1951+
);
1952+
currentVersion = 72308D2D8DC0FA924558EC0A /* Model2.xcdatamodel */;
1953+
path = Model.xcdatamodeld;
1954+
sourceTree = "<group>";
1955+
versionGroupType = wrapper.xcdatamodel;
1956+
};
1957+
/* End XCVersionGroup section */
19391958
};
19401959
rootObject = 90B40B411875CA87718F15D6 /* Project object */;
19411960
}

‎examples/ios_app/test/fixtures/project.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1320"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "EAB95A4512529D4CB8BE5D4E"
18+
BuildableName = "Example.app"
19+
BlueprintName = "Example"
20+
ReferencedContainer = "container:test/fixtures/project.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
</TestAction>
33+
<LaunchAction
34+
buildConfiguration = "Debug"
35+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
36+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
37+
launchStyle = "0"
38+
useCustomWorkingDirectory = "NO"
39+
ignoresPersistentStateOnLaunch = "NO"
40+
debugDocumentVersioning = "YES"
41+
debugServiceExtension = "internal"
42+
allowLocationSimulation = "YES">
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
45+
<BuildableReference
46+
BuildableIdentifier = "primary"
47+
BlueprintIdentifier = "EAB95A4512529D4CB8BE5D4E"
48+
BuildableName = "Example.app"
49+
BlueprintName = "Example"
50+
ReferencedContainer = "container:test/fixtures/project.xcodeproj">
51+
</BuildableReference>
52+
</BuildableProductRunnable>
53+
</LaunchAction>
54+
<ProfileAction
55+
buildConfiguration = "Debug"
56+
shouldUseLaunchSchemeArgsEnv = "YES"
57+
savedToolIdentifier = ""
58+
useCustomWorkingDirectory = "NO"
59+
debugDocumentVersioning = "YES">
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
62+
<BuildableReference
63+
BuildableIdentifier = "primary"
64+
BlueprintIdentifier = "EAB95A4512529D4CB8BE5D4E"
65+
BuildableName = "Example.app"
66+
BlueprintName = "Example"
67+
ReferencedContainer = "container:test/fixtures/project.xcodeproj">
68+
</BuildableReference>
69+
</BuildableProductRunnable>
70+
</ProfileAction>
71+
<AnalyzeAction
72+
buildConfiguration = "Debug">
73+
</AnalyzeAction>
74+
<ArchiveAction
75+
buildConfiguration = "Debug"
76+
revealArchiveInOrganizer = "YES">
77+
</ArchiveAction>
78+
</Scheme>

‎examples/ios_app/test/fixtures/spec.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,8 @@
368368
"Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/Contents.json",
369369
"Example/PreviewContent/PreviewAssets.xcassets/rules_xcodeproj.imageset/rules_xcodeproj.png",
370370
"Example/Assets.xcassets/Contents.json",
371+
"Example/Model.xcdatamodeld/Model.xcdatamodel/contents",
372+
"Example/Model.xcdatamodeld/Model2.xcdatamodel/contents",
371373
"Example/en.lproj/Localizable.strings",
372374
"Example/es.lproj/Localizable.strings",
373375
{

‎test/fixtures/generator/project.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
/* End PBXAggregateTarget section */
2222

2323
/* Begin PBXBuildFile section */
24+
0090755015065AEBA26437C3 /* XCCurrentVersion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EBF1884D691118C23B26109 /* XCCurrentVersion.swift */; };
2425
02182EDE6FDB241C2434DF8A /* XCScheme+TestItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = D351EBF697F74A32355EC048 /* XCScheme+TestItem.swift */; };
2526
073D09171A88A0A4D802AA1E /* XcodeProj+CustomDump.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84AD628C1B10FBFD1555866 /* XcodeProj+CustomDump.swift */; };
2627
078322183A4AFB303A3DDCAD /* PBXBuildFile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5E76521DC3E6D3C6586C892B /* PBXBuildFile.swift */; };
@@ -372,6 +373,7 @@
372373
5CC0EED86D851236527F38E4 /* PBXProductType+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PBXProductType+Extensions.swift"; sourceTree = "<group>"; };
373374
5E008F1EF5278A359CB3B73D /* CoreMotion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreMotion.swift; sourceTree = "<group>"; };
374375
5E76521DC3E6D3C6586C892B /* PBXBuildFile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PBXBuildFile.swift; sourceTree = "<group>"; };
376+
5EBF1884D691118C23B26109 /* XCCurrentVersion.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XCCurrentVersion.swift; sourceTree = "<group>"; };
375377
5F4938CB5948C8AEC7B07294 /* Generator+AddTargets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Generator+AddTargets.swift"; sourceTree = "<group>"; };
376378
5F527636CB48F7FEEE90DCEC /* libgenerator.library.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libgenerator.library.a; sourceTree = BUILT_PRODUCTS_DIR; };
377379
604AF9360C7EE4DFD42DE623 /* XCScheme+TestAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCScheme+TestAction.swift"; sourceTree = "<group>"; };
@@ -868,6 +870,7 @@
868870
58DB2DF8B6A725C450EDD5D2 /* SearchPaths.swift */,
869871
8F977F1096269625AD5B34E8 /* Sorting.swift */,
870872
CF6A6EBB69226658CE2407FD /* TargetID.swift */,
873+
5EBF1884D691118C23B26109 /* XCCurrentVersion.swift */,
871874
);
872875
path = src;
873876
sourceTree = "<group>";
@@ -1251,6 +1254,7 @@
12511254
C6A8DCD8AC6A837E0FEE42BC /* SearchPaths.swift in Sources */,
12521255
32262343DCD6777FE421D2EF /* Sorting.swift in Sources */,
12531256
2EE32463686199A91F099FD5 /* TargetID.swift in Sources */,
1257+
0090755015065AEBA26437C3 /* XCCurrentVersion.swift in Sources */,
12541258
);
12551259
runOnlyForDeploymentPostprocessing = 0;
12561260
};

0 commit comments

Comments
 (0)