format_code

This commit is contained in:
Yonas Kolb
2018-11-04 22:30:34 +11:00
parent f30536a40f
commit 1631236b7a
20 changed files with 98 additions and 113 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
import Foundation
import PathKit
import ProjectSpec
import xcodeproj
import PathKit
public class FileWriter {
+2 -2
View File
@@ -1,6 +1,6 @@
import Foundation
import ProjectSpec
import PathKit
import ProjectSpec
public class InfoPlistGenerator {
@@ -8,7 +8,7 @@ public class InfoPlistGenerator {
Default info plist attributes taken from:
/Applications/Xcode.app/Contents/Developer/Library/Xcode/Templates/Project Templates/Base/Base_DefinitionsInfoPlist.xctemplate/TemplateInfo.plist
*/
var defaultInfoPlist: [String: Any] = {
var defaultInfoPlist: [String: Any] = {
var dictionary: [String: Any] = [:]
dictionary["CFBundleIdentifier"] = "$(PRODUCT_BUNDLE_IDENTIFIER)"
dictionary["CFBundleInfoDictionaryVersion"] = "6.0"
+11 -7
View File
@@ -541,18 +541,22 @@ public class PBXProjGenerator {
fileReference = existingFileReferences
} else {
fileReference = addObject(
PBXFileReference(sourceTree: .sdkRoot,
name: dependencyPath.lastComponent,
lastKnownFileType: Xcode.fileType(path: dependencyPath),
path: dependencyPath.string)
PBXFileReference(
sourceTree: .sdkRoot,
name: dependencyPath.lastComponent,
lastKnownFileType: Xcode.fileType(path: dependencyPath),
path: dependencyPath.string
)
)
sdkFileReferences[dependency.reference] = fileReference
frameworkFiles.append(fileReference)
}
let buildFile = addObject(
PBXBuildFile(file: fileReference,
settings: getDependencyFrameworkSettings(dependency: dependency))
PBXBuildFile(
file: fileReference,
settings: getDependencyFrameworkSettings(dependency: dependency)
)
)
targetFrameworkBuildFiles.append(buildFile)
@@ -634,7 +638,7 @@ public class PBXProjGenerator {
let headersBuildPhaseFiles = getBuildFilesForPhase(.headers)
if !headersBuildPhaseFiles.isEmpty {
if (target.type == .framework || target.type == .dynamicLibrary) {
if target.type == .framework || target.type == .dynamicLibrary {
let headersBuildPhase = addObject(PBXHeadersBuildPhase(files: headersBuildPhaseFiles))
buildPhases.append(headersBuildPhase)
} else {
+9 -7
View File
@@ -1,6 +1,6 @@
import Foundation
import ProjectSpec
import xcodeproj
import Foundation
public class SchemeGenerator {
@@ -83,8 +83,8 @@ public class SchemeGenerator {
guard let buildableName =
project.getTarget(buildTarget.target)?.filename ??
project.getAggregateTarget(buildTarget.target)?.name else {
fatalError("Unable to determinate \"buildableName\" for build target: \(buildTarget.target)")
project.getAggregateTarget(buildTarget.target)?.name else {
fatalError("Unable to determinate \"buildableName\" for build target: \(buildTarget.target)")
}
let buildableReference = XCScheme.BuildableReference(
referencedContainer: "container:\(project.name).xcodeproj",
@@ -129,10 +129,12 @@ public class SchemeGenerator {
)
let testables = zip(testTargets, testBuildTargetEntries).map { testTarget, testBuilEntries in
XCScheme.TestableReference(skipped: false,
parallelizable: testTarget.parallelizable,
randomExecutionOrdering: testTarget.randomExecutionOrder,
buildableReference: testBuilEntries.buildableReference)
XCScheme.TestableReference(
skipped: false,
parallelizable: testTarget.parallelizable,
randomExecutionOrdering: testTarget.randomExecutionOrder,
buildableReference: testBuilEntries.buildableReference
)
}
let testCommandLineArgs = scheme.test.map { XCScheme.CommandLineArguments($0.commandLineArguments) }
+1 -1
View File
@@ -1,6 +1,6 @@
import Foundation
import xcodeproj
import PathKit
import xcodeproj
extension PBXFileElement {