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.

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

Add defaultConfiguration generation option to Config.swift #6255

Merged
merged 1 commit into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions Sources/ProjectDescription/ConfigGenerationOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,25 @@ extension Config {
/// dependencies won't build until all dependencies are declared explicitly.
public let enforceExplicitDependencies: Bool

/// The default configuration to be used when generating the project.
/// If not specified, Tuist generates for the first (when alphabetically sorted) debug configuration.
public var defaultConfiguration: String?

public static func options(
resolveDependenciesWithSystemScm: Bool = false,
disablePackageVersionLocking: Bool = false,
clonedSourcePackagesDirPath: Path? = nil,
staticSideEffectsWarningTargets: StaticSideEffectsWarningTargets = .all,
enforceExplicitDependencies: Bool = false
enforceExplicitDependencies: Bool = false,
defaultConfiguration: String? = nil
) -> Self {
self.init(
resolveDependenciesWithSystemScm: resolveDependenciesWithSystemScm,
disablePackageVersionLocking: disablePackageVersionLocking,
clonedSourcePackagesDirPath: clonedSourcePackagesDirPath,
staticSideEffectsWarningTargets: staticSideEffectsWarningTargets,
enforceExplicitDependencies: enforceExplicitDependencies
enforceExplicitDependencies: enforceExplicitDependencies,
defaultConfiguration: defaultConfiguration
)
}
}
Expand Down
3 changes: 3 additions & 0 deletions Sources/TuistAcceptanceTesting/TuistAcceptanceFixtures.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Foundation

public enum TuistAcceptanceFixtures {
case appWithBuildRules
case appWithCustomDefaultConfiguration
case appWithFrameworkAndTests
case appWithPlugins
case appWithPreviews
Expand Down Expand Up @@ -72,6 +73,8 @@ public enum TuistAcceptanceFixtures {
switch self {
case .appWithBuildRules:
return "app_with_build_rules"
case .appWithCustomDefaultConfiguration:
return "app_with_custom_default_configuration"
case .appWithFrameworkAndTests:
return "app_with_framework_and_tests"
case .appWithPlugins:
Expand Down
5 changes: 4 additions & 1 deletion Sources/TuistGraph/Models/ConfigGenerationOptions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@ extension Config {
public let clonedSourcePackagesDirPath: AbsolutePath?
public let staticSideEffectsWarningTargets: StaticSideEffectsWarningTargets
public let enforceExplicitDependencies: Bool
public let defaultConfiguration: String?

public init(
resolveDependenciesWithSystemScm: Bool,
disablePackageVersionLocking: Bool,
clonedSourcePackagesDirPath: AbsolutePath? = nil,
staticSideEffectsWarningTargets: StaticSideEffectsWarningTargets = .all,
enforceExplicitDependencies: Bool = false
enforceExplicitDependencies: Bool = false,
defaultConfiguration: String? = nil
) {
self.resolveDependenciesWithSystemScm = resolveDependenciesWithSystemScm
self.disablePackageVersionLocking = disablePackageVersionLocking
self.clonedSourcePackagesDirPath = clonedSourcePackagesDirPath
self.staticSideEffectsWarningTargets = staticSideEffectsWarningTargets
self.enforceExplicitDependencies = enforceExplicitDependencies
self.defaultConfiguration = defaultConfiguration
}
}
}
6 changes: 4 additions & 2 deletions Sources/TuistGraphTesting/Models/Config+TestData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,16 @@ extension Config.GenerationOptions {
disablePackageVersionLocking: Bool = false,
clonedSourcePackagesDirPath: AbsolutePath? = nil,
staticSideEffectsWarningTargets: TuistGraph.Config.GenerationOptions.StaticSideEffectsWarningTargets = .all,
enforceExplicitDependencies: Bool = false
enforceExplicitDependencies: Bool = false,
defaultConfiguration: String? = nil
) -> Self {
.init(
resolveDependenciesWithSystemScm: resolveDependenciesWithSystemScm,
disablePackageVersionLocking: disablePackageVersionLocking,
clonedSourcePackagesDirPath: clonedSourcePackagesDirPath,
staticSideEffectsWarningTargets: staticSideEffectsWarningTargets,
enforceExplicitDependencies: enforceExplicitDependencies
enforceExplicitDependencies: enforceExplicitDependencies,
defaultConfiguration: defaultConfiguration
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ extension TuistGraph.Config.GenerationOptions {
clonedSourcePackagesDirPath: clonedSourcePackagesDirPath,
staticSideEffectsWarningTargets: TuistGraph.Config.GenerationOptions.StaticSideEffectsWarningTargets
.from(manifest: manifest.staticSideEffectsWarningTargets),
enforceExplicitDependencies: manifest.enforceExplicitDependencies
enforceExplicitDependencies: manifest.enforceExplicitDependencies,
defaultConfiguration: manifest.defaultConfiguration
)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,14 @@ final class GenerateAcceptanceTestSPMPackage: TuistAcceptanceTestCase {
}
}

final class GenerateAcceptanceTestAppWithDefaultConfiguration: TuistAcceptanceTestCase {
func test_app_with_custom_default_configuration() async throws {
try setUpFixture(.appWithCustomDefaultConfiguration)
try await run(GenerateCommand.self)
try await run(BuildCommand.self)
}
}

extension TuistAcceptanceTestCase {
private func resourcePath(
for productName: String,
Expand Down
70 changes: 70 additions & 0 deletions fixtures/app_with_custom_default_configuration/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Xcode ###
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## User settings
xcuserdata/

## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout

## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/
DerivedData/
*.moved-aside
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3

### Xcode Patch ###
*.xcodeproj/*
!*.xcodeproj/project.pbxproj
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno

### Projects ###
*.xcodeproj
*.xcworkspace

### Tuist derived files ###
graph.dot
Derived/

### Tuist managed dependencies ###
Tuist/.build
2 changes: 2 additions & 0 deletions fixtures/app_with_custom_default_configuration/.mise.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[tools]
tuist = "4.11.0"
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"colors" : [
{
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
{
"images" : [
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "ipad",
"scale" : "1x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "76x76"
},
{
"idiom" : "ipad",
"scale" : "2x",
"size" : "83.5x83.5"
},
{
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" xcode11CocoaTouchSystemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import SwiftUI

@main
struct AppApp: App {
var body: some Scene {
WindowGroup {
ContentView()
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import SwiftUI

public struct ContentView: View {
public init() {}

public var body: some View {
Text("Hello, World!")
.padding()
}
}

struct ContentView_Previews: PreviewProvider {
static var previews: some View {
ContentView()
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import Foundation
import XCTest

final class AppTests: XCTestCase {
func test_twoPlusTwo_isFour() {
XCTAssertEqual(2 + 2, 4)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Foundation

public enum Framework {
public static func hello() -> String {
"Hello from Framework!"
}
}