Rename iOS project and structure

.github/workflows/check.yml

@@ -91,19 +91,19 @@ jobs:
         uses: mikehardy/buildcache-action@v2
       - name: Compile iOS app
         run: |
-          cd appIos &&
+          cd ios &&
           set -o pipefail && 
-          xcodebuild ${{ env.XCODE_CACHE }} -workspace appIos.xcworkspace -scheme "appIos" -sdk iphonesimulator -destination '${{ env.IOS_SIMULATOR }}' build | tee xcodebuild.log | xcpretty &&
+          xcodebuild ${{ env.XCODE_CACHE }} -workspace app.xcworkspace -scheme "app" -sdk iphonesimulator -destination '${{ env.IOS_SIMULATOR }}' build | tee xcodebuild.log | xcpretty &&
           cd ..
       - name: Artifacts
         uses: actions/upload-artifact@v4
         if: always() # Ensure all artifacts are collected, even after errors
         with:
           name: iOS Build
           path: |
-            appIos/xcodebuild.log
-            ~/Library/Developer/Xcode/DerivedData/**/Build/Products/**/appIos.app
-            ~/Library/Developer/Xcode/DerivedData/**/Build/Products/**/appIos.app.dSYM
+            ios/xcodebuild.log
+            ~/Library/**/app.app
+            ~/Library/**/app.app.dSYM
             **/build
             **/secrets.properties
 
@@ -137,17 +137,17 @@ jobs:
         uses: mikehardy/buildcache-action@v2
       - name: iOS tests
         run: |
-          cd appIos &&
+          cd ios &&
           set -o pipefail && 
-          xcodebuild ${{ env.XCODE_CACHE }} -workspace appIos.xcworkspace -scheme "appIos" -sdk iphonesimulator -destination '${{ env.IOS_SIMULATOR }}' test | tee xcodebuild.log | xcpretty &&
+          xcodebuild ${{ env.XCODE_CACHE }} -workspace app.xcworkspace -scheme "app" -sdk iphonesimulator -destination '${{ env.IOS_SIMULATOR }}' test | tee xcodebuild.log | xcpretty &&
           cd ..
       - name: Artifacts
         uses: actions/upload-artifact@v4
         if: always() # Ensure all artifacts are collected, even after errors
         with:
           name: iOS Tests
           path: |
-            appIos/xcodebuild.log
+            ios/xcodebuild.log
 
   android-check-build:
     runs-on: ubuntu-20.04

.gitignore

@@ -10,14 +10,14 @@ build
 .externalNativeBuild
 .cxx
 local.properties
-appIos/appIos.xcodeproj/project.xcworkspace/xcuserdata
-appIos/appIos.xcodeproj/xcuserdata
-appIos/appIos.xcworkspace/xcuserdata
-appIos/feed/feed.xcodeproj/xcuserdata
-appIos/post/post.xcodeproj/xcuserdata
-appIos/common-swiftui/common-swiftui.xcodeproj/xcuserdata
-appIos/common-design/common-design.xcodeproj/xcuserdata
-appIos/common-swiftui-test/common-swiftui-test.xcodeproj/xcuserdata
-appIos/feed-test-fixtures/feed-test-fixtures.xcodeproj/xcuserdata
-appIos/post-test-fixtures/post-test-fixtures.xcodeproj/xcuserdata
+ios/app.xcodeproj/project.xcworkspace/xcuserdata
+ios/app.xcodeproj/xcuserdata
+ios/app.xcworkspace/xcuserdata
+ios/feed/feed.xcodeproj/xcuserdata
+ios/post/post.xcodeproj/xcuserdata
+ios/common-swiftui/common-swiftui.xcodeproj/xcuserdata
+ios/common-design/common-design.xcodeproj/xcuserdata
+ios/common-swiftui-test/common-swiftui-test.xcodeproj/xcuserdata
+ios/feed-test-fixtures/feed-test-fixtures.xcodeproj/xcuserdata
+ios/post-test-fixtures/post-test-fixtures.xcodeproj/xcuserdata
 secrets.properties

appIos/appIos.xcodeproj/project.pbxproj → ios/app.xcodeproj/project.pbxproj

@@ -41,7 +41,7 @@
 		464126B02722FC960094BF9B /* Feed.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Feed.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4644B9162785234A0067B224 /* CommonDesign.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CommonDesign.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4652716D2764E86E0025EA10 /* CommonSwiftUi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CommonSwiftUi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		7555FF7B242A565900829871 /* appIos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = appIos.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF7B242A565900829871 /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = app.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -63,7 +63,7 @@
 		7555FF72242A565900829871 = {
 			isa = PBXGroup;
 			children = (
-				7555FF7D242A565900829871 /* appIos */,
+				7555FF7D242A565900829871 /* app */,
 				7555FF7C242A565900829871 /* Products */,
 				7555FFB0242A642200829871 /* Frameworks */,
 			);
@@ -72,18 +72,18 @@
 		7555FF7C242A565900829871 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				7555FF7B242A565900829871 /* appIos.app */,
+				7555FF7B242A565900829871 /* app.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		7555FF7D242A565900829871 /* appIos */ = {
+		7555FF7D242A565900829871 /* app */ = {
 			isa = PBXGroup;
 			children = (
 				7555FF8C242A565B00829871 /* Info.plist */,
 				2152FB032600AC8F00CF470E /* NewsfeedApp.swift */,
 			);
-			path = appIos;
+			path = app;
 			sourceTree = "<group>";
 		};
 		7555FFB0242A642200829871 /* Frameworks */ = {
@@ -100,9 +100,9 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		7555FF7A242A565900829871 /* appIos */ = {
+		7555FF7A242A565900829871 /* app */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "appIos" */;
+			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "app" */;
 			buildPhases = (
 				4680F45927A5E5D5007DA70E /* ShellScript */,
 				7555FF77242A565900829871 /* Sources */,
@@ -114,11 +114,11 @@
 			);
 			dependencies = (
 			);
-			name = appIos;
+			name = app;
 			packageProductDependencies = (
 			);
-			productName = appIos;
-			productReference = 7555FF7B242A565900829871 /* appIos.app */;
+			productName = app;
+			productReference = 7555FF7B242A565900829871 /* app.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -136,7 +136,7 @@
 					};
 				};
 			};
-			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "appIos" */;
+			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "app" */;
 			compatibilityVersion = "Xcode 9.3";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
@@ -152,7 +152,7 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				7555FF7A242A565900829871 /* appIos */,
+				7555FF7A242A565900829871 /* app */,
 			);
 		};
 /* End PBXProject section */
@@ -323,7 +323,7 @@
 				DEVELOPMENT_TEAM = 5G893F5HW7;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../multiplatform/umbrella/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-				INFOPLIST_FILE = appIos/Info.plist;
+				INFOPLIST_FILE = app/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -345,7 +345,7 @@
 				DEVELOPMENT_TEAM = 5G893F5HW7;
 				ENABLE_PREVIEWS = YES;
 				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../multiplatform/umbrella/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
-				INFOPLIST_FILE = appIos/Info.plist;
+				INFOPLIST_FILE = app/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -362,7 +362,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		7555FF76242A565900829871 /* Build configuration list for PBXProject "appIos" */ = {
+		7555FF76242A565900829871 /* Build configuration list for PBXProject "app" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				7555FFA3242A565B00829871 /* Debug */,
@@ -371,7 +371,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "appIos" */ = {
+		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "app" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				7555FFA6242A565B00829871 /* Debug */,

appIos/appIos.xcodeproj/xcshareddata/xcschemes/appIos.xcscheme → ios/app.xcodeproj/xcshareddata/xcschemes/app.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "7555FF7A242A565900829871"
-               BuildableName = "appIos.app"
-               BlueprintName = "appIos"
-               ReferencedContainer = "container:appIos.xcodeproj">
+               BuildableName = "app.app"
+               BlueprintName = "app"
+               ReferencedContainer = "container:app.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -65,9 +65,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7555FF7A242A565900829871"
-            BuildableName = "appIos.app"
-            BlueprintName = "appIos"
-            ReferencedContainer = "container:appIos.xcodeproj">
+            BuildableName = "app.app"
+            BlueprintName = "app"
+            ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </LaunchAction>
@@ -82,9 +82,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "7555FF7A242A565900829871"
-            BuildableName = "appIos.app"
-            BlueprintName = "appIos"
-            ReferencedContainer = "container:appIos.xcodeproj">
+            BuildableName = "app.app"
+            BlueprintName = "app"
+            ReferencedContainer = "container:app.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
    </ProfileAction>