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

Switched to 1.3.60-dev-2755 Kotlin

Browse Source
This commit is contained in:
Alexander Gorshenev
2019-10-01 19:53:02 +03:00
committed by alexander-gorshenev
parent 445eedd378
commit 9b10ed4fea
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/BenchmarkingPlugin.kt
+4 -4
View File
@@ -10,7 +10,7 @@ import org.gradle.util.ConfigureUtil
import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
import org.jetbrains.kotlin.konan.target.HostManager
import javax.inject.Inject
import kotlin.reflect.KClass
@@ -107,10 +107,10 @@ abstract class BenchmarkingPlugin: Plugin<Project> {
protected val mingwPath: String = System.getenv("MINGW64_DIR") ?: "c:/msys64/mingw64"
protected open fun Project.determinePreset(): KotlinNativeTargetPreset =
protected open fun Project.determinePreset(): AbstractKotlinNativeTargetPreset<*> =
defaultHostPreset(this).also { preset ->
logger.quiet("$project has been configured for ${preset.name} platform.")
} as KotlinNativeTargetPreset
} as AbstractKotlinNativeTargetPreset<*>
protected abstract fun NamedDomainObjectContainer<KotlinSourceSet>.configureSources(project: Project)
@@ -158,7 +158,7 @@ abstract class BenchmarkingPlugin: Plugin<Project> {
}
}
protected open fun Project.configureNativeTarget(hostPreset: KotlinNativeTargetPreset) {
protected fun Project.configureNativeTarget(hostPreset: AbstractKotlinNativeTargetPreset<*>) {
kotlin.targetFromPreset(hostPreset, NATIVE_TARGET_NAME) {
compilations.getByName("main").kotlinOptions.freeCompilerArgs = project.compilerArgs
compilations.getByName("main").enableEndorsedLibs = true
build-tools/src/main/kotlin/org/jetbrains/kotlin/benchmark/SwiftBenchmarkingPlugin.kt
+2 -2
View File
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.*
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import org.jetbrains.kotlin.gradle.plugin.mpp.Framework
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.AbstractKotlinNativeTargetPreset
import org.jetbrains.kotlin.gradle.plugin.mpp.NativeBuildType
import java.io.File
import javax.inject.Inject
@@ -64,7 +64,7 @@ open class SwiftBenchmarkingPlugin : BenchmarkingPlugin() {
}
}
override fun Project.determinePreset(): KotlinNativeTargetPreset = kotlin.presets.macosX64 as KotlinNativeTargetPreset
override fun Project.determinePreset(): AbstractKotlinNativeTargetPreset<*> = kotlin.presets.macosX64 as AbstractKotlinNativeTargetPreset<*>
override fun KotlinNativeTarget.configureNativeOutput(project: Project) {
binaries.framework(nativeFrameworkName, listOf(RELEASE)) {
gradle.properties
+8 -9
View File
@@ -15,19 +15,18 @@
#
# A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
buildKotlinVersion=1.3.60-dev-1210
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-1210,branch:default:any,pinned:true/artifacts/content/maven
buildKotlinVersion=1.3.60-dev-2755
buildKotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven
remoteRoot=konan_tests
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2497,branch:default:any,pinned:true/artifacts/content/maven
kotlinVersion=1.3.60-dev-2497
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2497,branch:default:any,pinned:true/artifacts/content/maven
kotlinStdlibVersion=1.3.60-dev-2497
kotlinStdlibTestsVersion=1.3.60-dev-2497
testKotlinCompilerVersion=1.3.60-dev-1210
kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven
kotlinVersion=1.3.60-dev-2755
kotlinStdlibRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.3.60-dev-2755,branch:default:any,pinned:true/artifacts/content/maven
kotlinStdlibVersion=1.3.60-dev-2755
kotlinStdlibTestsVersion=1.3.60-dev-2755
testKotlinCompilerVersion=1.3.60-dev-2755
konanVersion=1.3.60
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
org.gradle.workers.max=4
# Uncomment to enable composite build
#kotlinProjectPath=<insert the path to Kotlin project root here>
kotlinProjectPath=/Users/jetbrains/kotlin-native/kotlin