Skip to content

Commit 8985f97

Browse files
alicerunsonfedoraalicerunsonfedora
committed
Relocate modules
1 parent 1cab298 commit 8985f97

File tree

104 files changed

+71
-26
lines changed

Some content is hidden

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

104 files changed

+71
-26
lines changed

‎Alidade.xcworkspace/contents.xcworkspacedata‎

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

‎AlidadeUI Playground/AlidadeUI Playground.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
9507C3782F1C30BB00134A94 /* AlidadeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 9507C3772F1C30BB00134A94 /* AlidadeUI */; };
1011
95FB76262DE39CBB0003CC61 /* AlidadeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 95FB76252DE39CBB0003CC61 /* AlidadeUI */; };
1112
95FB76322DE3B53C0003CC61 /* AlidadeUI Tests.xctestplan in Resources */ = {isa = PBXBuildFile; fileRef = 95FB76312DE3B53C0003CC61 /* AlidadeUI Tests.xctestplan */; };
1213
/* End PBXBuildFile section */
@@ -30,6 +31,7 @@
3031
buildActionMask = 2147483647;
3132
files = (
3233
95FB76262DE39CBB0003CC61 /* AlidadeUI in Frameworks */,
34+
9507C3782F1C30BB00134A94 /* AlidadeUI in Frameworks */,
3335
);
3436
runOnlyForDeploymentPostprocessing = 0;
3537
};
@@ -74,6 +76,7 @@
7476
name = "AlidadeUI Playground";
7577
packageProductDependencies = (
7678
95FB76252DE39CBB0003CC61 /* AlidadeUI */,
79+
9507C3772F1C30BB00134A94 /* AlidadeUI */,
7780
);
7881
productName = "AlidadeUI Playground";
7982
productReference = 95FB75F62DE39A470003CC61 /* AlidadeUI Playground.app */;
@@ -104,7 +107,7 @@
104107
mainGroup = 95FB75ED2DE39A470003CC61;
105108
minimizedProjectReferenceProxies = 1;
106109
packageReferences = (
107-
95FB76242DE39CBB0003CC61 /* XCLocalSwiftPackageReference "../AlidadeUI" */,
110+
9507C3762F1C30BB00134A94 /* XCLocalSwiftPackageReference "../Modules/AlidadeUI" */,
108111
);
109112
preferredProjectObjectVersion = 77;
110113
productRefGroup = 95FB75F72DE39A470003CC61 /* Products */;
@@ -366,13 +369,17 @@
366369
/* End XCConfigurationList section */
367370

368371
/* Begin XCLocalSwiftPackageReference section */
369-
95FB76242DE39CBB0003CC61 /* XCLocalSwiftPackageReference "../AlidadeUI" */ = {
372+
9507C3762F1C30BB00134A94 /* XCLocalSwiftPackageReference "../Modules/AlidadeUI" */ = {
370373
isa = XCLocalSwiftPackageReference;
371-
relativePath = ../AlidadeUI;
374+
relativePath = ../Modules/AlidadeUI;
372375
};
373376
/* End XCLocalSwiftPackageReference section */
374377

375378
/* Begin XCSwiftPackageProductDependency section */
379+
9507C3772F1C30BB00134A94 /* AlidadeUI */ = {
380+
isa = XCSwiftPackageProductDependency;
381+
productName = AlidadeUI;
382+
};
376383
95FB76252DE39CBB0003CC61 /* AlidadeUI */ = {
377384
isa = XCSwiftPackageProductDependency;
378385
productName = AlidadeUI;

‎AllTests.xctestplan‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,30 @@
3838
"testTargets" : [
3939
{
4040
"target" : {
41-
"containerPath" : "container:MCMapFormat",
42-
"identifier" : "MCMapFormatTests",
43-
"name" : "MCMapFormatTests"
41+
"containerPath" : "container:Modules\/DesignLibrary",
42+
"identifier" : "DesignLibraryTests",
43+
"name" : "DesignLibraryTests"
4444
}
4545
},
4646
{
4747
"target" : {
48-
"containerPath" : "container:AlidadeUI",
48+
"containerPath" : "container:MCMaps.xcodeproj",
49+
"identifier" : "950402DF2D4D522200F51903",
50+
"name" : "AlidadeTests"
51+
}
52+
},
53+
{
54+
"target" : {
55+
"containerPath" : "container:Modules\/AlidadeUI",
4956
"identifier" : "AlidadeUITests",
5057
"name" : "AlidadeUITests"
5158
}
5259
},
5360
{
5461
"target" : {
55-
"containerPath" : "container:MCMaps.xcodeproj",
56-
"identifier" : "950402DF2D4D522200F51903",
57-
"name" : "AlidadeTests"
62+
"containerPath" : "container:Modules\/FeatureFlags",
63+
"identifier" : "FeatureFlagsTests",
64+
"name" : "FeatureFlagsTests"
5865
}
5966
}
6067
],

‎MCMaps.xcodeproj/project.pbxproj‎

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
9500D89C2F1229FA00B4A633 /* Bedrock in Frameworks */ = {isa = PBXBuildFile; productRef = 9500D89B2F1229FA00B4A633 /* Bedrock */; };
1111
9500D89E2F1229FA00B4A633 /* BedrockUI in Frameworks */ = {isa = PBXBuildFile; productRef = 9500D89D2F1229FA00B4A633 /* BedrockUI */; };
1212
9504030F2D4D7E0A00F51903 /* CubiomesKit in Frameworks */ = {isa = PBXBuildFile; productRef = 9504030E2D4D7E0A00F51903 /* CubiomesKit */; };
13+
9507C37B2F1C30D500134A94 /* AlidadeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 9507C37A2F1C30D500134A94 /* AlidadeUI */; };
14+
9507C37E2F1C30E200134A94 /* DesignLibrary in Frameworks */ = {isa = PBXBuildFile; productRef = 9507C37D2F1C30E200134A94 /* DesignLibrary */; };
15+
9507C3812F1C30F400134A94 /* FeatureFlags in Frameworks */ = {isa = PBXBuildFile; productRef = 9507C3802F1C30F400134A94 /* FeatureFlags */; };
16+
9507C3842F1C310A00134A94 /* Testchamber in Frameworks */ = {isa = PBXBuildFile; productRef = 9507C3832F1C310A00134A94 /* Testchamber */; };
1317
95141F562F0874D200DAF47D /* DocumentKit in Frameworks */ = {isa = PBXBuildFile; productRef = 95141F552F0874D200DAF47D /* DocumentKit */; };
1418
951FE2BC2D5937630091BE11 /* ViewInspector in Frameworks */ = {isa = PBXBuildFile; productRef = 951FE2BB2D5937630091BE11 /* ViewInspector */; };
1519
95317F2E2F0B0FB9007BCDA0 /* ImageProcessing in Frameworks */ = {isa = PBXBuildFile; productRef = 95317F2D2F0B0FB9007BCDA0 /* ImageProcessing */; };
@@ -68,13 +72,16 @@
6872
isa = PBXFrameworksBuildPhase;
6973
buildActionMask = 2147483647;
7074
files = (
75+
9507C3812F1C30F400134A94 /* FeatureFlags in Frameworks */,
7176
9504030F2D4D7E0A00F51903 /* CubiomesKit in Frameworks */,
7277
9500D89E2F1229FA00B4A633 /* BedrockUI in Frameworks */,
7378
95FB72D02DE255630003CC61 /* AlidadeUI in Frameworks */,
7479
956603732EA588CC0049C15D /* AlidadeSearchEngine in Frameworks */,
80+
9507C37B2F1C30D500134A94 /* AlidadeUI in Frameworks */,
7581
955CD1652DAAE1BE007F6FA1 /* CubiomesKit in Frameworks */,
7682
9500D89C2F1229FA00B4A633 /* Bedrock in Frameworks */,
7783
955A4D682D932A6500262A6D /* DesignLibrary in Frameworks */,
84+
9507C37E2F1C30E200134A94 /* DesignLibrary in Frameworks */,
7885
95141F562F0874D200DAF47D /* DocumentKit in Frameworks */,
7986
954489A82E2D66BD0088B879 /* MCMap in Frameworks */,
8087
95317F2E2F0B0FB9007BCDA0 /* ImageProcessing in Frameworks */,
@@ -87,6 +94,7 @@
8794
files = (
8895
951FE2BC2D5937630091BE11 /* ViewInspector in Frameworks */,
8996
953CBB1D2E12FBD400C54DFD /* Testchamber in Frameworks */,
97+
9507C3842F1C310A00134A94 /* Testchamber in Frameworks */,
9098
);
9199
runOnlyForDeploymentPostprocessing = 0;
92100
};
@@ -143,6 +151,9 @@
143151
95317F2D2F0B0FB9007BCDA0 /* ImageProcessing */,
144152
9500D89B2F1229FA00B4A633 /* Bedrock */,
145153
9500D89D2F1229FA00B4A633 /* BedrockUI */,
154+
9507C37A2F1C30D500134A94 /* AlidadeUI */,
155+
9507C37D2F1C30E200134A94 /* DesignLibrary */,
156+
9507C3802F1C30F400134A94 /* FeatureFlags */,
146157
);
147158
productName = MCMaps;
148159
productReference = 950402CF2D4D522100F51903 /* Alidade.app */;
@@ -168,6 +179,7 @@
168179
packageProductDependencies = (
169180
951FE2BB2D5937630091BE11 /* ViewInspector */,
170181
953CBB1C2E12FBD400C54DFD /* Testchamber */,
182+
9507C3832F1C310A00134A94 /* Testchamber */,
171183
);
172184
productName = MCMapsTests;
173185
productReference = 950402E02D4D522200F51903 /* AlidadeTests.xctest */;
@@ -204,15 +216,16 @@
204216
packageReferences = (
205217
95DDE9652D57D0E1002B29D9 /* XCRemoteSwiftPackageReference "SwiftLintPlugins" */,
206218
951FE2BA2D5937630091BE11 /* XCRemoteSwiftPackageReference "ViewInspector" */,
207-
955A4D662D932A6500262A6D /* XCLocalSwiftPackageReference "DesignLibrary" */,
208219
955CD1632DAAE1BE007F6FA1 /* XCRemoteSwiftPackageReference "CubiomesKit" */,
209-
95FB72CE2DE255630003CC61 /* XCLocalSwiftPackageReference "AlidadeUI" */,
210-
953CBB1B2E12FBD400C54DFD /* XCLocalSwiftPackageReference "Testchamber" */,
211220
954489A62E2D66BD0088B879 /* XCRemoteSwiftPackageReference "mcmap" */,
212221
956603712EA588CC0049C15D /* XCRemoteSwiftPackageReference "searchengine" */,
213222
95141F542F0874D200DAF47D /* XCRemoteSwiftPackageReference "DocumentKit" */,
214223
95317F2C2F0B0FB9007BCDA0 /* XCRemoteSwiftPackageReference "imageprocessing" */,
215224
9500D89A2F1229FA00B4A633 /* XCRemoteSwiftPackageReference "bedrock" */,
225+
9507C3792F1C30D500134A94 /* XCLocalSwiftPackageReference "Modules/AlidadeUI" */,
226+
9507C37C2F1C30E200134A94 /* XCLocalSwiftPackageReference "Modules/DesignLibrary" */,
227+
9507C37F2F1C30F300134A94 /* XCLocalSwiftPackageReference "Modules/FeatureFlags" */,
228+
9507C3822F1C310A00134A94 /* XCLocalSwiftPackageReference "Modules/Testchamber" */,
216229
);
217230
preferredProjectObjectVersion = 77;
218231
productRefGroup = 950402D02D4D522100F51903 /* Products */;
@@ -619,17 +632,21 @@
619632
/* End XCConfigurationList section */
620633

621634
/* Begin XCLocalSwiftPackageReference section */
622-
953CBB1B2E12FBD400C54DFD /* XCLocalSwiftPackageReference "Testchamber" */ = {
635+
9507C3792F1C30D500134A94 /* XCLocalSwiftPackageReference "Modules/AlidadeUI" */ = {
623636
isa = XCLocalSwiftPackageReference;
624-
relativePath = Testchamber;
637+
relativePath = Modules/AlidadeUI;
625638
};
626-
955A4D662D932A6500262A6D /* XCLocalSwiftPackageReference "DesignLibrary" */ = {
639+
9507C37C2F1C30E200134A94 /* XCLocalSwiftPackageReference "Modules/DesignLibrary" */ = {
627640
isa = XCLocalSwiftPackageReference;
628-
relativePath = DesignLibrary;
641+
relativePath = Modules/DesignLibrary;
629642
};
630-
95FB72CE2DE255630003CC61 /* XCLocalSwiftPackageReference "AlidadeUI" */ = {
643+
9507C37F2F1C30F300134A94 /* XCLocalSwiftPackageReference "Modules/FeatureFlags" */ = {
631644
isa = XCLocalSwiftPackageReference;
632-
relativePath = AlidadeUI;
645+
relativePath = Modules/FeatureFlags;
646+
};
647+
9507C3822F1C310A00134A94 /* XCLocalSwiftPackageReference "Modules/Testchamber" */ = {
648+
isa = XCLocalSwiftPackageReference;
649+
relativePath = Modules/Testchamber;
633650
};
634651
/* End XCLocalSwiftPackageReference section */
635652

@@ -715,6 +732,22 @@
715732
isa = XCSwiftPackageProductDependency;
716733
productName = CubiomesKit;
717734
};
735+
9507C37A2F1C30D500134A94 /* AlidadeUI */ = {
736+
isa = XCSwiftPackageProductDependency;
737+
productName = AlidadeUI;
738+
};
739+
9507C37D2F1C30E200134A94 /* DesignLibrary */ = {
740+
isa = XCSwiftPackageProductDependency;
741+
productName = DesignLibrary;
742+
};
743+
9507C3802F1C30F400134A94 /* FeatureFlags */ = {
744+
isa = XCSwiftPackageProductDependency;
745+
productName = FeatureFlags;
746+
};
747+
9507C3832F1C310A00134A94 /* Testchamber */ = {
748+
isa = XCSwiftPackageProductDependency;
749+
productName = Testchamber;
750+
};
718751
95141F552F0874D200DAF47D /* DocumentKit */ = {
719752
isa = XCSwiftPackageProductDependency;
720753
package = 95141F542F0874D200DAF47D /* XCRemoteSwiftPackageReference "DocumentKit" */;

‎MCMaps/Resources/Credits.md‎

Lines changed: 0 additions & 1 deletion

AlidadeUI/.gitignore renamed to Modules/AlidadeUI/.gitignore

File renamed without changes.

AlidadeUI/Package.swift renamed to Modules/AlidadeUI/Package.swift

File renamed without changes.

AlidadeUI/Sources/AlidadeUI/ChipTextField/ChipTextField.swift renamed to Modules/AlidadeUI/Sources/AlidadeUI/ChipTextField/ChipTextField.swift

File renamed without changes.

AlidadeUI/Sources/AlidadeUI/ChipTextField/ChipView.swift renamed to Modules/AlidadeUI/Sources/AlidadeUI/ChipTextField/ChipView.swift

File renamed without changes.

AlidadeUI/Sources/AlidadeUI/Extensions/CGPoint+ManhattanDistance.swift renamed to Modules/AlidadeUI/Sources/AlidadeUI/Extensions/CGPoint+ManhattanDistance.swift

File renamed without changes.

0 commit comments

Comments
 (0)