Merge branch 'Compositional-layout-support' into Fix-main-actor-warnings

# Conflicts: # SectionKit.xcodeproj/project.pbxproj
traderepublic · Apr 16, 2024 · b6b8378 · b6b8378
2 parents 07edee9 + 8fb4b8f
commit b6b8378
Show file tree

Hide file tree

Showing 14 changed files with 10,260 additions and 7 deletions.
diff --git a/Example/Examples/Sources/Examples/ExampleList/ExampleListCoordinator+Presentable.swift b/Example/Examples/Sources/Examples/ExampleList/ExampleListCoordinator+Presentable.swift
@@ -36,7 +36,15 @@ extension ExampleListCoordinator: Presentable {
                             navigationController: navigationController,
                             presentable: VanillaSwiftExamples.EmojisCoordinator(navigationController: navigationController)
                         )
-                    )
+                    ),
+                    ExampleViewModel(
+                        name: "Names",
+                        description: "An MVVM-C architecture with compositional layout example by using a ListCompositionalLayoutCollectionViewAdapter that shows multiple ListCompositionalLayoutSectionController.",
+                        navigation: ExampleCoordinator(
+                            navigationController: navigationController,
+                            presentable: NamesCoordinator(navigationController: navigationController)
+                        )
+                    ),
                 ]
             ),
             ExampleSectionViewModel(

diff --git a/Example/SectionKitExample.xcodeproj/project.pbxproj b/Example/SectionKitExample.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -12,6 +12,7 @@
 		5AFBBE14264BEF2B008C095D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AFBBE13264BEF2B008C095D /* SceneDelegate.swift */; };
 		5AFBBE18264BEF2C008C095D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5AFBBE17264BEF2C008C095D /* Assets.xcassets */; };
 		5AFBBE1E264BEF2C008C095D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5AFBBE1C264BEF2C008C095D /* LaunchScreen.storyboard */; };
+		D91425612BB478D90005E8CD /* first-names.json in Resources */ = {isa = PBXBuildFile; fileRef = D91425602BB478D90005E8CD /* first-names.json */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,6 +28,7 @@
 		5AFBBE1F264BEF2C008C095D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		5AFBBE25264BEF34008C095D /* tr-sectionkit */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tr-sectionkit"; path = ..; sourceTree = "<group>"; };
 		5AFBBE26264BEF41008C095D /* SectionKitExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SectionKitExample.entitlements; sourceTree = "<group>"; };
+		D91425602BB478D90005E8CD /* first-names.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "first-names.json"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -66,6 +68,7 @@
 		5AFBBE10264BEF2B008C095D /* SectionKitExample */ = {
 			isa = PBXGroup;
 			children = (
+				D914255F2BB478B60005E8CD /* Resources */,
 				5AFBBE11264BEF2B008C095D /* AppDelegate.swift */,
 				5AFBBE13264BEF2B008C095D /* SceneDelegate.swift */,
 				5AFBBE17264BEF2C008C095D /* Assets.xcassets */,
@@ -83,6 +86,14 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		D914255F2BB478B60005E8CD /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				D91425602BB478D90005E8CD /* first-names.json */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -146,6 +157,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5AFBBE1E264BEF2C008C095D /* LaunchScreen.storyboard in Resources */,
+				D91425612BB478D90005E8CD /* first-names.json in Resources */,
 				5AFBBE18264BEF2C008C095D /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;