Merge branch 'master' into min/no_codegen

This commit is contained in:
Min Kim
2019-06-13 21:38:52 -07:00
committed by GitHub
26 changed files with 822 additions and 53 deletions
+1 -1
View File
@@ -87,7 +87,7 @@ public class PBXProjGenerator {
PBXProject(
name: project.name,
buildConfigurationList: buildConfigList,
compatibilityVersion: project.compatabilityVersion,
compatibilityVersion: project.compatibilityVersion,
mainGroup: mainGroup,
developmentRegion: project.options.developmentLanguage ?? "en"
)
+2 -1
View File
@@ -133,7 +133,8 @@ public class SchemeGenerator {
skipped: false,
parallelizable: testTarget.parallelizable,
randomExecutionOrdering: testTarget.randomExecutionOrder,
buildableReference: testBuilEntries.buildableReference
buildableReference: testBuilEntries.buildableReference,
skippedTests: testTarget.skippedTests.map(XCScheme.SkippedTest.init)
)
}
+2 -1
View File
@@ -224,7 +224,8 @@ class SourceGenerator {
"gpx",
"lproj",
"xcfilelist",
"apns":
"apns",
"pch":
return nil
default:
return .resources
+2 -2
View File
@@ -11,8 +11,8 @@ extension Project {
return "1.3"
}
var compatabilityVersion: String {
return "Xcode 9.3"
var compatibilityVersion: String {
return "Xcode 10.0"
}
var objectVersion: UInt {