Skip to content

Commit

Permalink
Merge pull request tuist#2828 from ferologics/test-project-regeneration
Browse files Browse the repository at this point in the history
Avoid project re-opening after re-generation
  • Loading branch information
Luis Padron authored Apr 28, 2021
2 parents 5fc6555 + 2f8f66b commit 700d2a2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Please, check out guidelines: https://keepachangelog.com/en/1.0.0/

## Next
## Next

### Added
- Add support for `runPostActionsOnFailure` for post build actions. [#2752](https://github.com/tuist/tuist/pull/2752) by [@FranzBusch](https://github.com/FranzBusch)
Expand All @@ -15,7 +15,7 @@ Please, check out guidelines: https://keepachangelog.com/en/1.0.0/
- Speed up frameworks metadata reading using Mach-o parsing instead of `file`, `lipo` and `dwarfdump` external processes. [#2814](https://github.com/tuist/tuist/pull/2814) by [@adellibovi](https://github.com/adellibovi)

### Fixed

- `tuist generate` your projects without having to re-open them! 🧑‍💻 [#2828] by [@ferologics](https://github.com/ferologics)
- Fix a bug for which when generating a `Resources` target from a `staticLibrary` or `staticFramework`, the parent's deployment target isn't passed to the new target. [#2830](https://github.com/tuist/tuist/pull/2830) by [@fila95](https://github.com/fila95)
- Fix `.messagesExtension` default settings to include the appropriate `LD_RUNPATH_SEARCH_PATHS` [#2824](https://github.com/tuist/tuist/pull/2824) by [@kwridan](https://github.com/kwridan)
- Fix the link to documented guidelines in pull request template [#2833](https://github.com/tuist/tuist/pull/2833) by [@mollyIV](https://github.com/mollyIV).
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@
"repositoryURL": "https://github.com/tuist/XcodeProj.git",
"state": {
"branch": null,
"revision": "0c889906136b7cba277b9327e9a8217669bb4eb3",
"version": "7.21.0"
"revision": "94e55232d227f9d78b811c98cb2e5d0cbd08987b",
"version": "7.22.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ let package = Package(
),
],
dependencies: [
.package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "7.21.0")),
.package(url: "https://github.com/tuist/XcodeProj.git", .upToNextMajor(from: "7.22.0")),
.package(name: "Signals", url: "https://github.com/tuist/BlueSignals.git", .upToNextMajor(from: "1.0.21")),
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1")),
.package(url: "https://github.com/rnine/Checksum.git", .upToNextMajor(from: "1.0.2")),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,9 @@ final class ProjectDescriptorGenerator: ProjectDescriptorGenerating {
{
logger.notice("Generating project \(project.name)")

let workspaceData = XCWorkspaceData(children: [])
let selfRef = XCWorkspaceDataFileRef(location: .`self`(""))
let selfRefFile = XCWorkspaceDataElement.file(selfRef)
let workspaceData = XCWorkspaceData(children: [selfRefFile])
let workspace = XCWorkspace(data: workspaceData)
let projectConstants = try determineProjectConstants(graphTraverser: graphTraverser)
let pbxproj = PBXProj(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ final class DefaultSettingsProvider_iOSTests: TuistUnitTestCase {
// Then

XCTAssertSettings(got, containsAll: projectEssentialDebugSettings)
XCTAssertEqual(got.count, 47)
XCTAssertEqual(got.count, 48)
}

func testProjectSettings_whenRecommendedRelease() throws {
Expand All @@ -296,7 +296,7 @@ final class DefaultSettingsProvider_iOSTests: TuistUnitTestCase {

// Then
XCTAssertSettings(got, containsAll: projectEssentialReleaseSettings)
XCTAssertEqual(got.count, 44)
XCTAssertEqual(got.count, 45)
}

func testProjectSettings_whenNoneDebug() throws {
Expand Down

0 comments on commit 700d2a2

Please sign in to comment.