🔀 Merge branch 'ladislas/feature/tuist-update-config'

leka · Jan 8, 2024 · c57f239 · c57f239
2 parents 232828e + b605d09
commit c57f239
Show file tree

Hide file tree

Showing 31 changed files with 444 additions and 477 deletions.
diff --git a/Apps/BLEKitExample/Project.swift b/Apps/BLEKitExample/Project.swift
@@ -2,21 +2,15 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
-let project = Project.iOSApp(
+let project = Project.app(
     name: "BLEKitExample",
     dependencies: [
         .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
         .project(target: "BLEKit", path: Path("../../Modules/BLEKit")),
-    ],
-    infoPlist: [
-        "NSBluetoothAlwaysUsageDescription":
-            "The LekaBLE app needs to use Bluetooth to connect to the Leka robot.",
-        "UIBackgroundModes": [
-            "bluetooth-central",
-        ],
     ]
 )
diff --git a/Apps/LekaActivityUIExplorer/Project.swift b/Apps/LekaActivityUIExplorer/Project.swift
@@ -2,13 +2,14 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
-let project = Project.iOSApp(
+let project = Project.app(
     name: "LekaActivityUIExplorer",
-    deploymentTarget: .iOS(targetVersion: "17.0", devices: .ipad),
+    deploymentTargets: .iOS("17.0"),
     dependencies: [
         .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
         .project(target: "GameEngineKit", path: Path("../../Modules/GameEngineKit")),
@@ -17,34 +18,5 @@ let project = Project.iOSApp(
         .external(name: "Yams"),
         .external(name: "Lottie"),
         .external(name: "SwiftUIJoystick"),
-    ],
-    infoPlist: [
-        "CFBundleShortVersionString": "1.0.0",
-        "CFBundleDocumentTypes": [
-            [
-                "CFBundleTypeName": "Sequencing Card Item",
-                "LSHandlerRank": "Default",
-                "CFBundleTypeRole": "Viewer",
-                "LSItemContentTypes": [
-                    "io.leka.apf.app.uiexplorer.sequencing.card_item",
-                ],
-            ],
-        ],
-        "NSBluetoothAlwaysUsageDescription":
-            "The Leka App needs to use Bluetooth to connect to the Leka robot.",
-        "UIBackgroundModes": [
-            "bluetooth-central",
-            "audio",
-        ],
-        "UIRequiresFullScreen": "true",
-        "UISupportedInterfaceOrientations": [
-            "UIInterfaceOrientationLandscapeRight",
-            "UIInterfaceOrientationLandscapeLeft",
-        ],
-        "UISupportedInterfaceOrientations~ipad": [
-            "UIInterfaceOrientationLandscapeRight",
-            "UIInterfaceOrientationLandscapeLeft",
-        ],
-        "NSAccentColorName": "AccentColor",
     ]
 )
diff --git a/Apps/LekaApp/Project.swift b/Apps/LekaApp/Project.swift
@@ -2,35 +2,16 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
-let project = Project.iOSApp(
+let project = Project.app(
     name: "LekaApp",
     version: "1.0.0",
-    dependencies: [
-        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
-        .project(target: "RobotKit", path: Path("../../Modules/RobotKit")),
-        .external(name: "Yams"),
-        .external(name: "Lottie"),
-    ],
     infoPlist: [
-        "NSBluetoothAlwaysUsageDescription":
-            "The Leka App needs to use Bluetooth to connect to the Leka robot.",
-        "UIBackgroundModes": [
-            "bluetooth-central",
-        ],
-        "UIRequiresFullScreen": "true",
-        "UISupportedInterfaceOrientations": [
-            "UIInterfaceOrientationLandscapeRight",
-            "UIInterfaceOrientationLandscapeLeft",
-        ],
-        "UISupportedInterfaceOrientations~ipad": [
-            "UIInterfaceOrientationLandscapeRight",
-            "UIInterfaceOrientationLandscapeLeft",
-        ],
-        "NSAccentColorName": "AccentColor",
+        "LSApplicationCategoryType": "public.app-category.education",
         "CFBundleURLTypes": [
             [
                 "CFBundleTypeRole": "Editor",
@@ -39,5 +20,11 @@ let project = Project.iOSApp(
             ],
         ],
         "LSApplicationQueriesSchemes": ["LekaUpdater"],
+    ],
+    dependencies: [
+        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
+        .project(target: "RobotKit", path: Path("../../Modules/RobotKit")),
+        .external(name: "Yams"),
+        .external(name: "Lottie"),
     ]
 )
diff --git a/Apps/LekaUpdater/Project.swift b/Apps/LekaUpdater/Project.swift
@@ -2,50 +2,16 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-private var schemes: [Scheme] {
-    var schemeList: [Scheme] = []
-
-    if Environment.createLocalizationSchemes.getBoolean(
-        default: false)
-    {
-        schemeList.append(contentsOf: [
-            SchemeList.l10nFR(name: "LekaUpdater"),
-            SchemeList.l10nEN(name: "LekaUpdater"),
-        ])
-    }
-
-    return schemeList
-}
-
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
-let project = Project.iOSApp(
+let project = Project.app(
     name: "LekaUpdater",
     version: "1.4.0",
-    dependencies: [
-        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
-        .project(target: "BLEKit", path: Path("../../Modules/BLEKit")),
-        .project(target: "RobotKit", path: Path("../../Modules/RobotKit")),
-        .project(target: "LocalizationKit", path: Path("../../Modules/LocalizationKit")),
-        .external(name: "Version"),
-    ],
     infoPlist: [
         "LEKA_OS_VERSION": "1.4.0",
-        "NSBluetoothAlwaysUsageDescription":
-            "The Leka Updater app needs to use Bluetooth to connect to the Leka robot.",
-        "UIBackgroundModes": [
-            "bluetooth-central",
-        ],
-        "UIRequiresFullScreen": "true",
-        "UISupportedInterfaceOrientations": ["UIInterfaceOrientationPortrait"],
-        "UISupportedInterfaceOrientations~ipad": [
-            "UIInterfaceOrientationPortrait",
-            "UIInterfaceOrientationPortraitUpsideDown",
-        ],
-        "LSApplicationCategoryType": "public.app-category.utilities",
-        "NSAccentColorName": "AccentColor",
         "CFBundleURLTypes": [
             [
                 "CFBundleTypeRole": "Editor",
@@ -57,5 +23,11 @@ let project = Project.iOSApp(
             "LekaApp", "com.googleusercontent.apps.224911845933-mv4tp4rstgjtvdqvbv5dl7defii1a7ic",
         ],
     ],
-    schemes: schemes
+    dependencies: [
+        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
+        .project(target: "BLEKit", path: Path("../../Modules/BLEKit")),
+        .project(target: "RobotKit", path: Path("../../Modules/RobotKit")),
+        .project(target: "LocalizationKit", path: Path("../../Modules/LocalizationKit")),
+        .external(name: "Version"),
+    ]
 )
diff --git a/Examples/Module/Project.swift b/Examples/Module/Project.swift
@@ -2,16 +2,13 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
 let project = Project.module(
     name: "Module",
-    platform: .iOS,
-    dependencies: [
-        // no deps
-    ],
     examples: [
         ModuleExample(name: "ModuleExampleAppOne"),
         ModuleExample(
@@ -20,5 +17,8 @@ let project = Project.module(
                 "APP_NAME": "ModuleExampleAppTwo from InfoPlist",
             ]
         ),
+    ],
+    dependencies: [
+        // no deps
     ]
 )
diff --git a/Examples/iOSApp/Project.swift b/Examples/iOSApp/Project.swift
@@ -2,13 +2,13 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
-let project = Project.iOSApp(
+let project = Project.app(
     name: "iOSApp",
-    version: "1.0.0",
     dependencies: [
         .project(target: "Module", path: Path("../../Examples/Module")),
     ]

diff --git a/Examples/macOSApp/Project.swift b/Examples/macOSApp/Project.swift
@@ -2,13 +2,14 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
-let project = Project.macOSApp(
+let project = Project.app(
     name: "macOSApp",
-    version: "1.0.0",
+    deploymentTargets: .macOS("13.0"),
     dependencies: [
         .project(target: "Module", path: Path("../../Examples/Module")),
     ]

diff --git a/Examples/macOSCli/Project.swift b/Examples/macOSCli/Project.swift
@@ -2,10 +2,11 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
 let project = Project.cli(
     name: "macOSCli",
     version: "1.0.0",

diff --git a/Modules/AccountKit/Project.swift b/Modules/AccountKit/Project.swift
@@ -2,23 +2,20 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
 let project = Project.module(
     name: "AccountKit",
-    platform: .iOS,
-    dependencies: [
-        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
-        .project(target: "LogKit", path: Path("../../Modules/LogKit")),
-    ],
     examples: [
         ModuleExample(
-            name: "AccountKitExample",
-            infoPlist: [
-                "NSAccentColorName": "AccentColor",
-            ]
+            name: "AccountKitExample"
         ),
+    ],
+    dependencies: [
+        .project(target: "DesignKit", path: Path("../../Modules/DesignKit")),
+        .project(target: "LogKit", path: Path("../../Modules/LogKit")),
     ]
 )
diff --git a/Modules/BLEKit/Project.swift b/Modules/BLEKit/Project.swift
@@ -2,26 +2,19 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
 let project = Project.module(
     name: "BLEKit",
-    platform: .iOS,
-    dependencies: [
-        .external(name: "CombineCoreBluetooth"),
-    ],
     examples: [
         ModuleExample(
-            name: "BLEKitExample",
-            infoPlist: [
-                "NSBluetoothAlwaysUsageDescription":
-                    "The Leka Updater app needs to use Bluetooth to connect to the Leka robot.",
-                "UIBackgroundModes": [
-                    "bluetooth-central",
-                ],
-            ]
+            name: "BLEKitExample"
         ),
+    ],
+    dependencies: [
+        .external(name: "CombineCoreBluetooth"),
     ]
 )
diff --git a/Modules/ContentKit/Project.swift b/Modules/ContentKit/Project.swift
@@ -2,23 +2,20 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
 let project = Project.module(
     name: "ContentKit",
-    platform: .iOS,
-    dependencies: [
-        .project(target: "LogKit", path: Path("../../Modules/LogKit")),
-        .external(name: "Yams"),
-    ],
     examples: [
         ModuleExample(
-            name: "ContentKitExample",
-            infoPlist: [
-                "NSAccentColorName": "AccentColor",
-            ]
+            name: "ContentKitExample"
         ),
+    ],
+    dependencies: [
+        .project(target: "LogKit", path: Path("../../Modules/LogKit")),
+        .external(name: "Yams"),
     ]
 )
diff --git a/Modules/DesignKit/Project.swift b/Modules/DesignKit/Project.swift
@@ -2,13 +2,13 @@
 // Copyright APF France handicap
 // SPDX-License-Identifier: Apache-2.0
 
+// swiftformat:disable acronyms
+
 import ProjectDescription
 import ProjectDescriptionHelpers
 
-// Creates our project using a helper function defined in ProjectDescriptionHelpers
 let project = Project.module(
     name: "DesignKit",
-    platform: .iOS,
     dependencies: [
         .external(name: "Lottie"),
     ]