mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2024-10-26 14:01:24 +03:00
Merge branch 'master' into katei/add-bundle-dependency
This commit is contained in:
commit
6abca395bc
@ -14,6 +14,8 @@
|
||||
- Fixed missing headers for static framework targets [#705](https://github.com/yonaskolb/XcodeGen/pull/705) @wag-miles
|
||||
- Using more file types from XcodeProj for PBXFileReferences resulting in less project diffs [#715](https://github.com/yonaskolb/XcodeGen/pull/715) @yonaskolb
|
||||
- Fixed localized `*.intentdefinition` not being added to build source phases [#720](https://github.com/yonaskolb/XcodeGen/pull/720) @giginet
|
||||
- Fixed `selectedLauncherIdentifier` not being set `Xcode.IDEFoundation.Launcher.PosixSpawn` when `debugEnabled: false` is defined in test action [#725](https://github.com/yonaskolb/XcodeGen/pull/725) @ken0nek
|
||||
- Fixed unnecessary dependencies related to SwiftPM [#726](https://github.com/yonaskolb/XcodeGen/pull/726) @tid-kijyun
|
||||
|
||||
#### Changed
|
||||
- Deprecated `$old_form` variables in favor of `${new_form}` variables [#704](https://github.com/yonaskolb/XcodeGen/pull/704) @rcari
|
||||
|
@ -49,7 +49,7 @@ You can also use environment variables in your configuration file, by using `${S
|
||||
- [ ] **schemes**: **[Scheme](#scheme)** - A list of schemes by name. This allows more control over what is found in [Target Scheme](#target-scheme)
|
||||
- [ ] **targetTemplates**: **[String: [Target Template](#target-template)]** - a list of targets that can be used as templates for actual targets which reference them via a `template` property. They can be used to extract common target settings. Works great in combination with `include`.
|
||||
- [ ] **packages**: **[String: [Swift Package](#swift-package)]** - a map of Swift packages by name
|
||||
- [ ] **localPackages**: **[String]** - A list of paths to local Swift Packages. The paths must be directories with a `Package.swift` file in them. This is used to override `packages` with a local version for development purposes.
|
||||
- [ ] **localPackages**: **[String]** - A list of paths to local Swift Packages. The paths must be directories with a `Package.swift` file in them. This is used to override `packages` with a local version for development purposes. For now local packages that don't mirror remote packages aren't able to be linked to
|
||||
- [ ] **projectReferences**: **[String: [Project Reference](#project-reference)]** - a map of project references by name
|
||||
|
||||
### Include
|
||||
|
@ -654,12 +654,12 @@ public class PBXProjGenerator {
|
||||
PBXBuildFile(product: packageDependency)
|
||||
)
|
||||
targetFrameworkBuildFiles.append(buildFile)
|
||||
} else {
|
||||
let targetDependency = addObject(
|
||||
PBXTargetDependency(product: packageDependency)
|
||||
)
|
||||
dependencies.append(targetDependency)
|
||||
}
|
||||
|
||||
let targetDependency = addObject(
|
||||
PBXTargetDependency(product: packageDependency)
|
||||
)
|
||||
dependencies.append(targetDependency)
|
||||
case .bundle:
|
||||
// Static and dynamic libraries can't copy resources
|
||||
guard target.type != .staticLibrary && target.type != .dynamicLibrary else { break }
|
||||
|
@ -201,6 +201,7 @@ public class SchemeGenerator {
|
||||
preActions: scheme.test?.preActions.map(getExecutionAction) ?? [],
|
||||
postActions: scheme.test?.postActions.map(getExecutionAction) ?? [],
|
||||
selectedDebuggerIdentifier: (scheme.test?.debugEnabled ?? Scheme.Test.debugEnabledDefault) ? XCScheme.defaultDebugger : "",
|
||||
selectedLauncherIdentifier: (scheme.test?.debugEnabled ?? Scheme.Test.debugEnabledDefault) ? XCScheme.defaultLauncher : "Xcode.IDEFoundation.Launcher.PosixSpawn",
|
||||
shouldUseLaunchSchemeArgsEnv: scheme.test?.shouldUseLaunchSchemeArgsEnv ?? true,
|
||||
codeCoverageEnabled: scheme.test?.gatherCoverageData ?? Scheme.Test.gatherCoverageDataDefault,
|
||||
codeCoverageTargets: coverageBuildableTargets,
|
||||
|
@ -129,7 +129,6 @@
|
||||
buildRules = (
|
||||
);
|
||||
dependencies = (
|
||||
E157C6348B8AD6A28C706801 /* PBXTargetDependency */,
|
||||
078202CF7B08B66ACF7FEC23 /* PBXTargetDependency */,
|
||||
);
|
||||
name = App;
|
||||
@ -229,10 +228,6 @@
|
||||
isa = PBXTargetDependency;
|
||||
productRef = AF233B61592982A7F6431FC6 /* Codability */;
|
||||
};
|
||||
E157C6348B8AD6A28C706801 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
productRef = 16E6FE01D5BD99F78D4A17E2 /* Codability */;
|
||||
};
|
||||
/* End PBXTargetDependency section */
|
||||
|
||||
/* Begin XCBuildConfiguration section */
|
||||
|
@ -198,7 +198,7 @@ class SchemeGeneratorTests: XCTestCase {
|
||||
try expect(xcscheme.profileAction?.environmentVariables) == variables
|
||||
}
|
||||
|
||||
$0.it("generate scheme without debugger") {
|
||||
$0.it("generate scheme without debugger - run") {
|
||||
let scheme = Scheme(
|
||||
name: "TestScheme",
|
||||
build: Scheme.Build(targets: [buildTarget]),
|
||||
@ -217,6 +217,25 @@ class SchemeGeneratorTests: XCTestCase {
|
||||
try expect(xcscheme.launchAction?.selectedLauncherIdentifier) == "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
}
|
||||
|
||||
$0.it("generate scheme without debugger - test") {
|
||||
let scheme = Scheme(
|
||||
name: "TestScheme",
|
||||
build: Scheme.Build(targets: [buildTarget]),
|
||||
test: Scheme.Test(config: "Debug", debugEnabled: false)
|
||||
)
|
||||
let project = Project(
|
||||
name: "test",
|
||||
targets: [app, framework],
|
||||
schemes: [scheme]
|
||||
)
|
||||
let xcodeProject = try project.generateXcodeProject()
|
||||
|
||||
let xcscheme = try unwrap(xcodeProject.sharedData?.schemes.first)
|
||||
|
||||
try expect(xcscheme.testAction?.selectedDebuggerIdentifier) == ""
|
||||
try expect(xcscheme.testAction?.selectedLauncherIdentifier) == "Xcode.IDEFoundation.Launcher.PosixSpawn"
|
||||
}
|
||||
|
||||
$0.it("generates pre and post actions for target schemes") {
|
||||
var target = app
|
||||
target.scheme = TargetScheme(
|
||||
|
Loading…
Reference in New Issue
Block a user