Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ladislas/feature/tuist update config #568

Merged
merged 20 commits into from
Jan 8, 2024
Merged

ladislas/feature/tuist update config #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9732e85
:technologist: (swiftformat): Disable acronyms for tuist related files
ladislas Jan 7, 2024
c9ede43
:recycle: (tuist): Move dependencies to Package.swift/.resolved
ladislas Jan 8, 2024
3af862f
:recycle: (tuist): Replace InfoPlist.Value w/ Plist.Value
ladislas Jan 8, 2024
61d550a
:technologist: (tuist): InfoPlist - add bundle localization to base +…
ladislas Jan 8, 2024
b142014
:technologist: (tuist): Add default settings + extending method
ladislas Jan 8, 2024
fed66da
:technologist: (tuist): Add new app project compatible w/ mutliple de…
ladislas Jan 8, 2024
b77aaab
:technologist: (tuist): InfoPlist - add default BLE plist entries
ladislas Jan 8, 2024
d340d39
:technologist: (tuist): InfoPlist - add audio to background modes
ladislas Jan 8, 2024
83a6b31
:technologist: (tuist): InfoPlist - add full screen, orientation support
ladislas Jan 8, 2024
0139f16
:technologist: (tuist): InfoPlist - set default app category to utili…
ladislas Jan 8, 2024
59ce6ca
:recycle: (tuist): Move all iOS projects to app(...)
ladislas Jan 8, 2024
626095f
:fire: (tuist ): Remove unused iOSApp(...)
ladislas Jan 8, 2024
ede709a
:recycle: (tuist): Move all macOS projects to app(...)
ladislas Jan 8, 2024
41e20e2
:fire: (tuist ): Remove unused macOSApp(...)
ladislas Jan 8, 2024
c2b3b49
:recycle: (tuist): Project Module - refactor to follow app(...) API
ladislas Jan 8, 2024
985241e
:recycle: (tuist): Project Cli - refactor to fix warnings
ladislas Jan 8, 2024
3a60d76
:truck: (tuist): Remove redundant middlefix template
ladislas Jan 8, 2024
857dad4
:technologist: (tuist): Add l10n schemes by default for apps
ladislas Jan 8, 2024
b10e63f
:bulb: (tuist): Remove deprecated comments
ladislas Jan 8, 2024
b605d09
:coffin: (tuist): InfoPlist - Remove AccentColor
ladislas Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Apps/BLEKitExample/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
]
)
36 changes: 4 additions & 32 deletions Apps/LekaActivityUIExplorer/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
Expand All @@ -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",
]
)
33 changes: 10 additions & 23 deletions Apps/LekaApp/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"),
]
)
48 changes: 10 additions & 38 deletions Apps/LekaUpdater/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"),
]
)
10 changes: 5 additions & 5 deletions Examples/Module/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -20,5 +17,8 @@ let project = Project.module(
"APP_NAME": "ModuleExampleAppTwo from InfoPlist",
]
),
],
dependencies: [
// no deps
]
)
6 changes: 3 additions & 3 deletions Examples/iOSApp/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
]
Expand Down
7 changes: 4 additions & 3 deletions Examples/macOSApp/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
]
Expand Down
3 changes: 2 additions & 1 deletion Examples/macOSCli/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 7 additions & 10 deletions Modules/AccountKit/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")),
]
)
19 changes: 6 additions & 13 deletions Modules/BLEKit/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]
)
17 changes: 7 additions & 10 deletions Modules/ContentKit/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]
)
4 changes: 2 additions & 2 deletions Modules/DesignKit/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
]
Expand Down
Loading
Loading