gradle · bamboo · Dec 13, 2017 · Oct 10, 2017 · Oct 10, 2017 · Oct 10, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -10,11 +10,7 @@ matrix:
       jdk: openjdk8
     - os: linux
       sudo: false
-      jdk: oraclejdk9 # JDK 9+175 or newer
-      addons:
-        apt:
-          packages:
-            - oracle-java9-installer # Forces use of even newer JDK 9 build
+      jdk: oraclejdk9
 
 script: ./gradlew :provider:check --info --stacktrace --console=plain --max-workers=1 --no-daemon -Dkotlin.compiler.execution.strategy="in-process" -Dkotlin.colors.enabled=false
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -26,11 +26,11 @@ plugins {
 
 allprojects {
     group = "org.gradle"
-    version = "0.12.3"
+    version = "0.13.1"
 }
 
-val publishedPluginsVersion by extra { "0.12.0" }
-val futurePluginsVersion = "0.12.1"
+val publishedPluginsVersion by extra { "0.13.1" }
+val futurePluginsVersion = "0.13.2"
 project(":plugins") {
     group = "org.gradle.kotlin"
     version = futurePluginsVersion

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -23,11 +23,11 @@ gradlePlugin {
         }
         kotlinDslModule {
             id = "kotlin-dsl-module"
-            implementationClass = "plugins.GskModule"
+            implementationClass = "plugins.KotlinDslModule"
         }
-        kotlinDslPublishedModule {
-            id = "kotlin-dsl-published-module"
-            implementationClass = "plugins.GskPublishedModule"
+        publicKotlinDslModule {
+            id = "public-kotlin-dsl-module"
+            implementationClass = "plugins.PublicKotlinDslModule"
         }
     }
 }
@@ -44,7 +44,7 @@ tasks.withType(KotlinCompile) {
 dependencies {
     compile gradleApi()
     compile "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlinVersion"
     compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
     compile 'org.ow2.asm:asm-all:5.1'
     testCompile 'junit:junit:4.12'

diff --git a/buildSrc/src/main/kotlin/build/Testing.kt b/buildSrc/src/main/kotlin/build/Testing.kt
@@ -1,10 +1,18 @@
 package build
 
 import org.gradle.api.Project
+import org.gradle.api.internal.initialization.DefaultClassLoaderScope
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
 
+fun Project.withTestStrictClassLoading() {
+    tasks.withType(Test::class.java) { test ->
+        test.systemProperty(DefaultClassLoaderScope.STRICT_MODE_PROPERTY, true)
+    }
+}
+
+
 fun Project.withTestWorkersMemoryLimits(min: String = "64m", max: String = "128m") {
     tasks.withType(Test::class.java) { test ->
         test.jvmArgs("-Xms$min", "-Xmx$max")

diff --git a/...dSrc/src/main/kotlin/plugins/GskModule.kt → ...rc/main/kotlin/plugins/KotlinDslModule.kt b/...dSrc/src/main/kotlin/plugins/GskModule.kt → ...rc/main/kotlin/plugins/KotlinDslModule.kt
@@ -1,6 +1,7 @@
 package plugins
 
 import build.kotlinDslDebugPropertyName
+import build.withTestStrictClassLoading
 import build.withTestWorkersMemoryLimits
 
 import org.gradle.api.Plugin
@@ -21,7 +22,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
  *  - be named after `base.archivesBaseName`
  *  - include all sources
  */
-open class GskModule : Plugin<Project> {
+open class KotlinDslModule : Plugin<Project> {
 
     override fun apply(project: Project) {
 
@@ -52,6 +53,7 @@ open class GskModule : Plugin<Project> {
                 }
             }
 
+            withTestStrictClassLoading()
             withTestWorkersMemoryLimits()
         }
     }

diff --git a/...main/kotlin/plugins/GskPublishedModule.kt → ...n/kotlin/plugins/PublicKotlinDslModule.kt b/...main/kotlin/plugins/GskPublishedModule.kt → ...n/kotlin/plugins/PublicKotlinDslModule.kt
@@ -19,13 +19,13 @@ import org.gradle.api.publish.maven.MavenPublication
  *  - include all sources
  *  - contain a classpath manifest
  */
-open class GskPublishedModule : Plugin<Project> {
+open class PublicKotlinDslModule : Plugin<Project> {
 
     override fun apply(project: Project) {
 
         project.run {
 
-            plugins.apply(GskModule::class.java)
+            plugins.apply(KotlinDslModule::class.java)
             plugins.apply("maven-publish")
             plugins.apply("com.jfrog.artifactory")
 

diff --git a/doc/getting-started/Configuring-Plugins.md b/doc/getting-started/Configuring-Plugins.md
@@ -60,7 +60,7 @@ with the `plugins {}` block depending on how they have been published. If you're
 the Gradle built-in [`java-gradle-plugin`](https://docs.gradle.org/current/userguide/javaGradle_plugin.html) plugin
 that automates publication of supplementary data to make your plugins usable with the `plugins {}` block.
 
-For example, the Android Gradle Plugin 2.x plugins are not published to the Gradle Plugin Portal and the metadata
+For example, the Android Gradle Plugin plugins are not published to the Gradle Plugin Portal and the metadata
 required to resolve plugin identifiers to resolvable artifacts
 [is not published](https://issuetracker.google.com/issues/64551265).
 The following snippets will use the Android Gradle Plugin to demonstrate how to enable the use of the `plugins {}` block
@@ -70,19 +70,19 @@ The goal here is to instruct your build how to map the `com.android.application`
 artifact.
 This is done in two steps.
 
-First add a plugin repository in your `settings.gradle` file for the whole build: 
-```groovy
+First add a plugin repository in your `settings.gradle.kts` file for the whole build: 
+```kotlin
 pluginManagement {
     repositories {
         gradlePluginPortal()
-        maven { url "https://jcenter.bintray.com/" }
+        google()
     }
 }
 ```
 
-Then, map the plugin `id` to the corresponding artifact coordinates, still in your `settings.gradle` file:
+Then, map the plugin `id` to the corresponding artifact coordinates, still in your `settings.gradle.kts` file:
 
-```groovy
+```kotlin
 pluginManagement {
     // ...
     resolutionStrategy {
@@ -100,20 +100,22 @@ plugin extension accessors, in your `build.gradle.kts` file:
 
 ```kotlin
 plugins {
-    id("com.android.application") version "2.3.3"
+    id("com.android.application") version "3.0.0"
 }
 
 android {
-    buildToolsVersion("25.0.0")
-    compileSdkVersion(23)    
+    buildToolsVersion("27.0.0")
+    compileSdkVersion(27)
 }
 ```
 
 See the [Plugin Management](https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_management) section of
 the Gradle documentation for more information.
 
-However, it is not yet possible to use the `plugins {}` block to request
-[plugins from composite builds](https://github.com/gradle/gradle/issues/2528)
+The same can be applied to resolving plugins from composite builds.
+Composite builds [do not expose plugin markers](https://github.com/gradle/gradle/issues/2528) yet.
+This can be worked around by mapping the plugin `id` to the corresponding artifact coordinates using a plugin
+resolution strategy, just like above.
 
 If you can't use the `plugins {}` block, you need to apply the plugin imperatively (using the `buildscript` block and
 `apply { from("") }`) and to know the type of the extension.

diff --git a/fixtures/build.gradle.kts b/fixtures/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.gradle.api.tasks.GradleBuild
 
 fun isProjectDir(candidate: File) =
-    candidate.isDirectory && File(candidate, "settings.gradle").exists()
+    File(candidate, "settings.gradle.kts").isFile
 
 fun isCompatibleWithJDK(candidate: File) =
     candidate.name.endsWith("kotlin-1.0") && JavaVersion.current() < JavaVersion.VERSION_1_9
@@ -12,8 +12,8 @@ val subProjectTasks = rootDir
     .filter { isCompatibleWithJDK(it) }
     .map { subProjectDir ->
         task<GradleBuild>("prepare-${subProjectDir.name}") {
-            setDir(subProjectDir)
+            dir = subProjectDir
         }
     }
 
-setDefaultTasks(subProjectTasks.map { it.name })
+defaultTasks = subProjectTasks.map { it.name }
diff --git a/...mpiled-against-kotlin-1.0/settings.gradle → ...ed-against-kotlin-1.0/settings.gradle.kts b/...mpiled-against-kotlin-1.0/settings.gradle → ...ed-against-kotlin-1.0/settings.gradle.kts
diff --git a/fixtures/settings.gradle → fixtures/settings.gradle.kts b/fixtures/settings.gradle → fixtures/settings.gradle.kts
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     id("kotlin-dsl-module")
     `maven-publish`
     `java-gradle-plugin`
-    id("com.gradle.plugin-publish") version "0.9.7"
+    id("com.gradle.plugin-publish") version "0.9.9"
 }
 
 base {
@@ -14,9 +14,9 @@ base {
 dependencies {
     compileOnly(gradleKotlinDsl())
 
-    compile(futureKotlin("stdlib"))
-    compile(futureKotlin("gradle-plugin"))
-    compile(futureKotlin("sam-with-receiver"))
+    implementation(futureKotlin("stdlib-jre8"))
+    implementation(futureKotlin("gradle-plugin"))
+    implementation(futureKotlin("sam-with-receiver"))
 
     testImplementation(project(":test-fixtures"))
 }

diff --git a/plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/embedded/EmbeddedKotlinPlugin.kt b/plugins/src/main/kotlin/org/gradle/kotlin/dsl/plugins/embedded/EmbeddedKotlinPlugin.kt
@@ -47,14 +47,14 @@ open class EmbeddedKotlinPlugin @Inject internal constructor(
             embeddedKotlin.addDependenciesTo(
                 dependencies,
                 embeddedKotlinConfiguration.name,
-                "stdlib", "reflect")
+                "stdlib-jre8", "reflect")
 
             listOf("compileOnly", "testCompileOnly").forEach {
                 configurations.getByName(it).extendsFrom(embeddedKotlinConfiguration)
             }
 
             configurations.all {
-                embeddedKotlin.pinDependenciesOn(it, "stdlib", "reflect", "compiler-embeddable")
+                embeddedKotlin.pinDependenciesOn(it, "stdlib-jre8", "reflect", "compiler-embeddable")
             }
         }
     }

diff --git a/plugins/src/test/kotlin/org/gradle/kotlin/dsl/plugins/AbstractPluginTest.kt b/plugins/src/test/kotlin/org/gradle/kotlin/dsl/plugins/AbstractPluginTest.kt
@@ -15,11 +15,11 @@ open class AbstractPluginTest : AbstractIntegrationTest() {
     fun setUpTestPluginRepository() {
         val testRepository = normaliseFileSeparators(absolutePathOf("build/repository"))
         val futureVersion = loadTestProperties()["version"]
-        withFile("settings.gradle", """
+        withSettings("""
             pluginManagement {
                 repositories {
                     maven { url = uri("$testRepository") }
-                    maven { url = uri("https://jcenter.bintray.com/") }
+                    jcenter()
                 }
                 resolutionStrategy {
                     eachPlugin {

diff --git a/plugins/src/test/kotlin/org/gradle/kotlin/dsl/plugins/embedded/EmbeddedKotlinPluginTest.kt b/plugins/src/test/kotlin/org/gradle/kotlin/dsl/plugins/embedded/EmbeddedKotlinPluginTest.kt
@@ -56,7 +56,7 @@ class EmbeddedKotlinPluginTest : AbstractPluginTest() {
             tasks {
                 "assertions" {
                     doLast {
-                        val requiredLibs = listOf("kotlin-stdlib-$embeddedKotlinVersion.jar", "kotlin-reflect-$embeddedKotlinVersion.jar")
+                        val requiredLibs = listOf("kotlin-stdlib-jre8-$embeddedKotlinVersion.jar", "kotlin-reflect-$embeddedKotlinVersion.jar")
                         listOf("compileOnly", "testCompileOnly").forEach { configuration ->
                             require(configurations[configuration].files.map { it.name }.containsAll(requiredLibs), {
                                 "Embedded Kotlin libraries not found in ${'$'}configuration"

diff --git a/provider/build.gradle.kts b/provider/build.gradle.kts
@@ -3,7 +3,7 @@ import build.*
 import codegen.GenerateKotlinDependencyExtensions
 
 plugins {
-    id("kotlin-dsl-published-module")
+    id("public-kotlin-dsl-module")
 }
 
 base {
@@ -14,7 +14,7 @@ dependencies {
     compileOnly(gradleApi())
 
     compile(project(":tooling-models"))
-    compile(futureKotlin("stdlib"))
+    compile(futureKotlin("stdlib-jre8"))
     compile(futureKotlin("reflect"))
     compile(futureKotlin("compiler-embeddable"))
     compile(futureKotlin("sam-with-receiver-compiler-plugin")) {