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

Set 1.2-SNAPSHOT in gradle build

Browse Source
This commit is contained in:
Ilya Gorbunov
2017-04-26 21:38:40 +03:00
parent 968c9c2034
commit cffab8d3ef
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+2 -2
View File
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
buildscript { buildscript {
extra["defaultSnapshotVersion"] = "1.1-SNAPSHOT" extra["defaultSnapshotVersion"] = "1.2-SNAPSHOT"
kotlinBootstrapFrom(BootstrapOption.BintrayDev("1.1.60-dev-277")) kotlinBootstrapFrom(BootstrapOption.BintrayDev("1.1.60-dev-277"))
@@ -54,7 +54,7 @@ val defaultSnapshotVersion: String by extra
val buildNumber by extra(findProperty("build.number")?.toString() ?: defaultSnapshotVersion) val buildNumber by extra(findProperty("build.number")?.toString() ?: defaultSnapshotVersion)
val kotlinVersion by extra(findProperty("deployVersion")?.toString() ?: buildNumber) val kotlinVersion by extra(findProperty("deployVersion")?.toString() ?: buildNumber)
val kotlinLanguageVersion by extra("1.1") val kotlinLanguageVersion by extra("1.2")
allprojects { allprojects {
group = "org.jetbrains.kotlin" group = "org.jetbrains.kotlin"
libraries/tools/kotlin-stdlib-gen/build.gradle
+5 -1
View File
@@ -10,7 +10,11 @@ dependencies {
compileKotlin { compileKotlin {
compilerJarFile = null compilerJarFile = null
kotlinOptions.freeCompilerArgs = ["-version"] kotlinOptions {
languageVersion = "1.1"
apiVersion = "1.1"
freeCompilerArgs = ["-version"]
}
} }
task run(type: JavaExec) { task run(type: JavaExec) {