Skip to content
This repository has been archived by the owner on Aug 19, 2020. It is now read-only.

Upgrade to Kotlin 1.3 #1125

Merged
merged 25 commits into from
Sep 21, 2018
Merged

Upgrade to Kotlin 1.3 #1125

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
40d3192
Upgrade Kotlin to 1.3-rc-51
bamboo Sep 20, 2018
5d9d054
Ignore tests for the Kotlin version used in the samples
bamboo Sep 20, 2018
1d2583d
Update wrappers to latest snapshot distro
bamboo Sep 20, 2018
bf30fcf
Add dependency on `kotlin-script-runtime`
bamboo Sep 20, 2018
3bef205
Bump plugins version
bamboo Sep 20, 2018
45e6de4
Update wrappers to latest snapshot distro
bamboo Sep 20, 2018
73e0e0d
Revert "Ignore tests for the Kotlin version used in the samples"
bamboo Sep 20, 2018
5063a41
Update test expectation to newly added Kotlin configurations
bamboo Sep 20, 2018
d25f0a4
Migrate to the official coroutines API
bamboo Sep 20, 2018
c00f0fb
Update samples to Kotlin 1.3.0-rc-51
bamboo Sep 20, 2018
bcee143
Add Kotlin stdlib dependency to `:tooling-models`
bamboo Sep 20, 2018
a54a2d1
Ignore failing `HelloKaptSampleTest`
bamboo Sep 20, 2018
a56edf9
Ignore kapt sample
bamboo Sep 20, 2018
ff28f70
Don't benchmark failing kapt sample
bamboo Sep 20, 2018
211e1b8
Remove unused `tapi` function
bamboo Sep 21, 2018
b89a056
Upgrade Kotlin to 1.3.0-rc-57
bamboo Sep 21, 2018
997ba56
Replace custom `Either<L, R>` type by builtin type `Result<T>`
bamboo Sep 21, 2018
3b15994
Bump plugins version
bamboo Sep 21, 2018
109cda3
Merge branch 'develop' into bamboo/kotlin-1.3
bamboo Sep 21, 2018
0125d35
Update samples to Kotlin 1.3.0-rc-57
bamboo Sep 21, 2018
850ae2d
Update wrappers to latest snapshot distro
bamboo Sep 21, 2018
63ded50
Ignore tests relying on `ProjectBuilder`
bamboo Sep 21, 2018
1a3bc4c
Fix indentation
bamboo Sep 21, 2018
c8e1441
Always add `kotlinEap()` to the list of plugin repositories
bamboo Sep 21, 2018
bbd4763
Re-enable `hello-kapt` sample tests
bamboo Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ allprojects {
version = "1.0-SNAPSHOT"
}

val publishedPluginsVersion by extra { "1.0-rc-6" }
val futurePluginsVersion = "1.0-rc-7"
val publishedPluginsVersion by extra { "1.0-rc-8" }
val futurePluginsVersion = "1.0-rc-9"
project(":plugins") {
group = "org.gradle.kotlin"
version = futurePluginsVersion
Expand Down Expand Up @@ -100,7 +100,8 @@ val customInstallation by task<Copy> {
val benchmark by task<integration.Benchmark> {
excludingSamplesMatching(
"android",
"source-control"
"source-control",
"hello-kapt"
)
latestInstallation = customInstallationDir
dependsOn(customInstallation)
Expand Down
9 changes: 1 addition & 8 deletions buildSrc/src/main/kotlin/plugins/kotlin-library.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
* limitations under the License.
*/

import accessors.kotlin

import org.jetbrains.kotlin.gradle.dsl.Coroutines
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

import org.gradle.api.internal.initialization.DefaultClassLoaderScope
Expand All @@ -27,18 +24,14 @@ plugins {
id("org.gradle.kotlin.ktlint-convention")
}

kotlin {
experimental.coroutines = Coroutines.ENABLE
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\o/

tasks {

withType<KotlinCompile>().configureEach {
kotlinOptions {
freeCompilerArgs += listOf(
"-java-parameters",
"-Xjsr305=strict",
"-Xprogressive",
"-progressive",
"-Xskip-runtime-version-check")
}
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion kotlin-version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.70
1.3.0-rc-57
2 changes: 1 addition & 1 deletion samples/ant/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/build-cache/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/build-scan/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/buildSrc-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/code-quality/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/composite-builds/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/copy/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/domain-objects/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/extra-properties/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/gradle-plugin/plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/groovy-interop/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/hello-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("com.android.tools.build:gradle:3.1.3")
classpath(kotlin("gradle-plugin", version = "1.2.70"))
classpath(kotlin("gradle-plugin", version = "1.3.0-rc-57"))

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle.kts files
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
6 changes: 1 addition & 5 deletions samples/hello-coroutines/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ import org.jetbrains.kotlin.gradle.dsl.Coroutines

plugins {
application
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "1.3.0-rc-57"
}

application {
mainClassName = "samples.HelloCoroutinesKt"
}

kotlin { // configure<org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension>
experimental.coroutines = Coroutines.ENABLE
}

dependencies {
compile(kotlin("stdlib"))
}
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-coroutines/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
4 changes: 1 addition & 3 deletions samples/hello-coroutines/src/main/kotlin/samples/HelloCoroutines.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package samples

import kotlin.coroutines.experimental.*

val fibonacci = buildSequence {
val fibonacci = sequence {

var a = 0
var b = 1
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-js/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile

plugins {
id("kotlin2js") version "1.2.70"
id("kotlin2js") version "1.3.0-rc-57"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-js/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
4 changes: 2 additions & 2 deletions samples/hello-kapt/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
application
kotlin("jvm") version "1.2.70"
kotlin("kapt") version "1.2.70"
kotlin("jvm") version "1.3.0-rc-57"
kotlin("kapt") version "1.3.0-rc-57"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-kapt/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/hello-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
application
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "1.3.0-rc-57"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion samples/hello-kotlin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/hello-world/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/kotlin-friendly-groovy-plugin/consumer/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/kotlin-friendly-groovy-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/kotlin-friendly-groovy-plugin/plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/maven-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/maven-publish/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.gradle.api.tasks.bundling.Jar

plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "1.3.0-rc-57"
`maven-publish`
}

Expand Down
2 changes: 1 addition & 1 deletion samples/maven-publish/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/model-rules/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/modularity/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/multi-kotlin-project-config-injection/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
base
kotlin("jvm") version "1.2.70" apply false
kotlin("jvm") version "1.3.0-rc-57" apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion samples/multi-kotlin-project-config-injection/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/multi-kotlin-project-with-buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
base
kotlin("jvm") version "1.2.70" apply false
kotlin("jvm") version "1.3.0-rc-57" apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion samples/multi-kotlin-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/multi-kotlin-project/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
base
kotlin("jvm") version "1.2.70" apply false
kotlin("jvm") version "1.3.0-rc-57" apply false
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion samples/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/multi-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/precompiled-script-plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/precompiled-script-plugin/plugin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/project-properties/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/provider-properties/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/source-control/external/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/source-control/sample/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/task-dependencies/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
2 changes: 1 addition & 1 deletion samples/testkit/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180913184642+0000-all.zip
distributionUrl=https\://repo.gradle.org/gradle/kotlin-dsl-snapshots-local/gradle-kotlin-dsl-5.0-20180921135258+0000-all.zip
Loading