mirror of
https://github.com/yonaskolb/XcodeGen.git
synced 2026-03-18 20:02:25 +00:00
update xcodeproj
This commit is contained in:
1 parent
a26b2d382a
commit
e17bf7d0f2
6 files changed
+13
-17
No files matched your search
+7
-7
@@ -56,21 +56,21 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "SwiftPM",
|
||||
"repositoryURL": "https://github.com/apple/swift-package-manager",
|
||||
"package": "SwiftShell",
|
||||
"repositoryURL": "https://github.com/kareman/SwiftShell",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "235aacc514cb81a6881364b0fedcb3dd083228f3",
|
||||
"version": "0.3.0"
|
||||
"revision": "beebe43c986d89ea5359ac3adcb42dac94e5e08a",
|
||||
"version": "4.1.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "xcodeproj",
|
||||
"repositoryURL": "https://github.com/tuist/xcodeproj.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "ed33abf5f983232d5a27ada48d120ad7564a3087",
|
||||
"version": "6.1.0"
|
||||
"branch": "master",
|
||||
"revision": "7a32fa0ebf0c6120ed8a7de03a632c2a10bbe243",
|
||||
"version": null
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@ let package = Package(
|
||||
.package(url: "https://github.com/yonaskolb/JSONUtilities.git", from: "4.0.0"),
|
||||
.package(url: "https://github.com/kylef/Spectre.git", from: "0.9.0"),
|
||||
.package(url: "https://github.com/onevcat/Rainbow.git", from: "3.0.0"),
|
||||
.package(url: "https://github.com/tuist/xcodeproj.git", from: "6.1.0"),
|
||||
.package(url: "https://github.com/tuist/xcodeproj.git", .branch("master")),
|
||||
],
|
||||
targets: [
|
||||
.target(name: "XcodeGen", dependencies: [
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import Basic
|
||||
import Commander
|
||||
import Foundation
|
||||
import JSONUtilities
|
||||
@@ -55,7 +54,7 @@ func generate(spec: String, project: String, isQuiet: Bool, justVersion: Bool) {
|
||||
if projectFile.exists {
|
||||
try projectFile.copy(tempPath)
|
||||
}
|
||||
try xcodeProject.write(path: AbsolutePath(tempPath.absolute().string), override: true)
|
||||
try xcodeProject.write(path: tempPath, override: true)
|
||||
try? projectFile.delete()
|
||||
try tempPath.copy(projectFile)
|
||||
try? tempPath.delete()
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import Basic
|
||||
import Foundation
|
||||
import JSONUtilities
|
||||
import PathKit
|
||||
@@ -126,7 +125,7 @@ extension Project {
|
||||
if let cached = configFileSettings[configFilePath.string] {
|
||||
return cached.value
|
||||
} else {
|
||||
guard let configFile = try? XCConfig(path: AbsolutePath(configFilePath.absolute().string)) else {
|
||||
guard let configFile = try? XCConfig(path: configFilePath) else {
|
||||
configFileSettings[configFilePath.string] = .nothing
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -4,7 +4,6 @@ import Foundation
|
||||
import XCTest
|
||||
import ProjectSpec
|
||||
import PathKit
|
||||
import Basic
|
||||
|
||||
class GeneratedPerformanceTests: XCTestCase {
|
||||
|
||||
@@ -23,7 +22,7 @@ class GeneratedPerformanceTests: XCTestCase {
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeProject = try generator.generateXcodeProject()
|
||||
self.measure {
|
||||
try! xcodeProject.write(path: AbsolutePath(project.projectPath.absolute().string))
|
||||
try! xcodeProject.write(path: project.projectPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -51,7 +50,7 @@ class FixturePerformanceTests: XCTestCase {
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeProject = try generator.generateXcodeProject()
|
||||
self.measure {
|
||||
try! xcodeProject.write(path: AbsolutePath(project.projectPath.absolute().string))
|
||||
try! xcodeProject.write(path: project.projectPath)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,6 @@ import Spectre
|
||||
import XcodeGenKit
|
||||
import xcodeproj
|
||||
import XCTest
|
||||
import Basic
|
||||
|
||||
class ProjectFixtureTests: XCTestCase {
|
||||
|
||||
@@ -63,7 +62,7 @@ fileprivate func generateXcodeProject(specPath: Path, file: String = #file, line
|
||||
let project = try Project(path: specPath)
|
||||
let generator = ProjectGenerator(project: project)
|
||||
let xcodeProject = try generator.generateXcodeProject()
|
||||
try xcodeProject.write(path: AbsolutePath(project.projectPath.absolute().string), override: true)
|
||||
try xcodeProject.write(path: project.projectPath, override: true)
|
||||
|
||||
return xcodeProject
|
||||
}
|
||||
Reference in new issue
Block a user