azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update XCode version. (#1691)

Browse Source
This commit is contained in:
Nikolay Igotti
2018-06-14 16:57:21 +03:00
committed by GitHub
parent 369d2a4565
commit f5741c475b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/KonanProperties.kt
+4 -2
View File
@@ -31,7 +31,9 @@ interface TargetableExternalStorage {
fun downloadDependencies() fun downloadDependencies()
} }
abstract class KonanPropertiesLoader(override val target: KonanTarget, val properties: Properties, val baseDir: String? = null) : Configurables { abstract class KonanPropertiesLoader(override val target: KonanTarget,
val properties: Properties,
val baseDir: String? = null) : Configurables {
open val dependencies get() = hostTargetList("dependencies") open val dependencies get() = hostTargetList("dependencies")
override fun downloadDependencies() { override fun downloadDependencies() {
@@ -67,7 +69,7 @@ fun Properties.keepOnlyDefaultProfiles() {
// Force build to use only 'default' profile: // Force build to use only 'default' profile:
this.setProperty(DEPENDENCY_PROFILES_KEY, "default") this.setProperty(DEPENDENCY_PROFILES_KEY, "default")
// Force build to use fixed Xcode version: // Force build to use fixed Xcode version:
this.setProperty("useFixedXcodeVersion", "9.4") this.setProperty("useFixedXcodeVersion", "9.4.1")
// TODO: it actually affects only resolution made in :dependencies, // TODO: it actually affects only resolution made in :dependencies,
// that's why we assume that 'default' profile comes first (and check this above). // that's why we assume that 'default' profile comes first (and check this above).
} }