diff --git a/build.gradle.kts b/build.gradle.kts index d6050d261..9564643a9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,7 +26,7 @@ plugins { allprojects { group = "org.gradle" - version = "0.12.2" + version = "0.12.3" } val publishedPluginsVersion by extra { "0.12.0" } diff --git a/doc/release-notes/0.12.2.md b/doc/release-notes/0.12.2.md new file mode 100644 index 000000000..e0fea788f --- /dev/null +++ b/doc/release-notes/0.12.2.md @@ -0,0 +1,22 @@ +Gradle Kotlin DSL 0.12.2 Release Notes +============================ + +Gradle Kotlin DSL v0.12.2 is another minor update to the [v0.12.0][v0.12.0] release, this time with a fix for a defect identified during the Gradle RC2 testing phase. + +v0.12.2 is already included in Gradle 4.3 RC3. + +To use it, upgrade your Gradle wrapper in the following fashion: + + $ cd $YOUR_PROJECT_ROOT + $ gradle wrapper --gradle-version 4.3-rc-3 --distribution-type all + +## Breaking changes + +Please check out the [v0.12.0][v0.12.0] release notes for details. + +Fixes since v0.12.1 +---------------------- + + * **Auto-applied build scan plugin not found when used in Kotlin DSL** ([#3250](https://github.com/gradle/gradle/issues/3250)). Executing Gradle with the `--scan` command line option in a project where the main build script contains a `buildscript` block that applies other scripts would cause the build to fail as described in the issue. This has been fixed. + +[v0.12.0]: https://github.com/gradle/kotlin-dsl/releases/tag/v0.12.0 diff --git a/doc/release-notes/0.12.3.md b/doc/release-notes/0.12.3.md new file mode 100644 index 000000000..2bc79c17d --- /dev/null +++ b/doc/release-notes/0.12.3.md @@ -0,0 +1,22 @@ +Gradle Kotlin DSL 0.12.3 Release Notes +============================ + +Gradle Kotlin DSL v0.12.3 is the final update to the [v0.12.0][v0.12.0] release fixing a breaking change to Kotlin build scripts using the `Property` API. + +v0.12.3 is already included in Gradle 4.3 RC4. + +To use it, upgrade your Gradle wrapper in the following fashion: + + $ cd $YOUR_PROJECT_ROOT + $ gradle wrapper --gradle-version 4.3-rc-4 --distribution-type all + +## Breaking changes + +Please check out the [v0.12.0][v0.12.0] release notes for details. + +Fixes since v0.12.2 +---------------------- + + * **Rename of org.gradle.api.provider.PropertyState to org.gradle.api.provider.Property caused a loss in DSL extension function** ([#574](https://github.com/gradle/kotlin-dsl/issues/574)). The extension members previously only available to `org.gradle.api.provider.PropertyState` are now also available to `org.gradle.api.provider.Property`. + +[v0.12.0]: https://github.com/gradle/kotlin-dsl/releases/tag/v0.12.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- 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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/provider/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt b/provider/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt index 1464c5e09..d6fd6dff4 100644 --- a/provider/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt +++ b/provider/src/main/kotlin/org/gradle/kotlin/dsl/ProjectExtensions.kt @@ -21,6 +21,7 @@ import org.gradle.api.Incubating import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.Task +import org.gradle.api.model.ObjectFactory import org.gradle.api.artifacts.Dependency import org.gradle.api.artifacts.dsl.RepositoryHandler @@ -37,6 +38,7 @@ import org.gradle.api.plugins.Convention import org.gradle.api.plugins.ObjectConfigurationAction import org.gradle.api.plugins.PluginManager +import org.gradle.api.provider.Property import org.gradle.api.provider.PropertyState import org.gradle.api.tasks.TaskContainer @@ -184,12 +186,24 @@ operator fun Project.getValue(any: Any, property: KProperty<*>): Any? = findProperty(property.name) +/** + * Creates a [Property] that holds values of the given type [T]. + * + * @see [ObjectFactory.property] + */ +@Incubating +inline +fun ObjectFactory.property(): Property = + property(T::class.java) + + /** * Creates a [PropertyState] that holds values of the given type [T]. * * @see [Project.property] */ @Incubating +@Deprecated("Will be removed in 1.0", replaceWith = ReplaceWith("objects.property()")) inline fun Project.property(): PropertyState = property(T::class.java) diff --git a/provider/src/main/kotlin/org/gradle/kotlin/dsl/PropertyStateExtensions.kt b/provider/src/main/kotlin/org/gradle/kotlin/dsl/PropertyStateExtensions.kt index 0073a0628..2592976f2 100644 --- a/provider/src/main/kotlin/org/gradle/kotlin/dsl/PropertyStateExtensions.kt +++ b/provider/src/main/kotlin/org/gradle/kotlin/dsl/PropertyStateExtensions.kt @@ -16,16 +16,34 @@ package org.gradle.kotlin.dsl +import org.gradle.api.provider.Property import org.gradle.api.provider.PropertyState import kotlin.reflect.KProperty +/** + * Property delegate for [Property] instances. + * + * Example: `val someProperty by somePropertyState` + */ +operator fun Property.getValue(receiver: Any?, property: KProperty<*>): T = get() + + +/** + * Property delegate for [Property] instances. + * + * Example: `var someProperty by somePropertyState` + */ +operator fun Property.setValue(receiver: Any?, property: KProperty<*>, value: T) = set(value) + + /** * Property delegate for [PropertyState] instances. * * Example: `val someProperty by somePropertyState` */ +@Deprecated("Will be removed in 1.0") operator fun PropertyState.getValue(receiver: Any?, property: KProperty<*>): T = get() @@ -34,4 +52,5 @@ operator fun PropertyState.getValue(receiver: Any?, property: KProperty<* * * Example: `var someProperty by somePropertyState` */ +@Deprecated("Will be removed in 1.0") operator fun PropertyState.setValue(receiver: Any?, property: KProperty<*>, value: T) = set(value) diff --git a/samples/ant/gradle/wrapper/gradle-wrapper.properties b/samples/ant/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/ant/gradle/wrapper/gradle-wrapper.properties +++ b/samples/ant/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/build-scan/gradle/wrapper/gradle-wrapper.properties b/samples/build-scan/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/build-scan/gradle/wrapper/gradle-wrapper.properties +++ b/samples/build-scan/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/code-quality/gradle/wrapper/gradle-wrapper.properties b/samples/code-quality/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/code-quality/gradle/wrapper/gradle-wrapper.properties +++ b/samples/code-quality/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/composite-builds/gradle/wrapper/gradle-wrapper.properties b/samples/composite-builds/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/composite-builds/gradle/wrapper/gradle-wrapper.properties +++ b/samples/composite-builds/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/copy/gradle/wrapper/gradle-wrapper.properties b/samples/copy/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/copy/gradle/wrapper/gradle-wrapper.properties +++ b/samples/copy/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/domain-objects/gradle/wrapper/gradle-wrapper.properties b/samples/domain-objects/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/domain-objects/gradle/wrapper/gradle-wrapper.properties +++ b/samples/domain-objects/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/extra-properties/gradle/wrapper/gradle-wrapper.properties b/samples/extra-properties/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/extra-properties/gradle/wrapper/gradle-wrapper.properties +++ b/samples/extra-properties/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/gradle-plugin/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/gradle-plugin/plugin/gradle/wrapper/gradle-wrapper.properties b/samples/gradle-plugin/plugin/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/gradle-plugin/plugin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/gradle-plugin/plugin/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/groovy-interop/gradle/wrapper/gradle-wrapper.properties b/samples/groovy-interop/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/groovy-interop/gradle/wrapper/gradle-wrapper.properties +++ b/samples/groovy-interop/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/hello-android/gradle/wrapper/gradle-wrapper.properties b/samples/hello-android/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/hello-android/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello-android/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/hello-coroutines/gradle/wrapper/gradle-wrapper.properties b/samples/hello-coroutines/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/hello-coroutines/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello-coroutines/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/hello-js/gradle/wrapper/gradle-wrapper.properties b/samples/hello-js/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/hello-js/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello-js/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/hello-kotlin/gradle/wrapper/gradle-wrapper.properties b/samples/hello-kotlin/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/hello-kotlin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello-kotlin/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/hello-world/gradle/wrapper/gradle-wrapper.properties b/samples/hello-world/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/hello-world/gradle/wrapper/gradle-wrapper.properties +++ b/samples/hello-world/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/kotlin-friendly-groovy-plugin/consumer/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin-friendly-groovy-plugin/consumer/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/kotlin-friendly-groovy-plugin/consumer/gradle/wrapper/gradle-wrapper.properties +++ b/samples/kotlin-friendly-groovy-plugin/consumer/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/kotlin-friendly-groovy-plugin/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin-friendly-groovy-plugin/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/kotlin-friendly-groovy-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/kotlin-friendly-groovy-plugin/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/kotlin-friendly-groovy-plugin/plugin/gradle/wrapper/gradle-wrapper.properties b/samples/kotlin-friendly-groovy-plugin/plugin/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/kotlin-friendly-groovy-plugin/plugin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/kotlin-friendly-groovy-plugin/plugin/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/maven-plugin/gradle/wrapper/gradle-wrapper.properties b/samples/maven-plugin/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/maven-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/samples/maven-plugin/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/maven-publish/gradle/wrapper/gradle-wrapper.properties b/samples/maven-publish/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/maven-publish/gradle/wrapper/gradle-wrapper.properties +++ b/samples/maven-publish/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/model-rules/gradle/wrapper/gradle-wrapper.properties b/samples/model-rules/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/model-rules/gradle/wrapper/gradle-wrapper.properties +++ b/samples/model-rules/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/modularity/gradle/wrapper/gradle-wrapper.properties b/samples/modularity/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/modularity/gradle/wrapper/gradle-wrapper.properties +++ b/samples/modularity/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/multi-kotlin-project-config-injection/gradle/wrapper/gradle-wrapper.properties b/samples/multi-kotlin-project-config-injection/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/multi-kotlin-project-config-injection/gradle/wrapper/gradle-wrapper.properties +++ b/samples/multi-kotlin-project-config-injection/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/multi-kotlin-project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties b/samples/multi-kotlin-project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/multi-kotlin-project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/samples/multi-kotlin-project-with-buildSrc/buildSrc/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/multi-kotlin-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties b/samples/multi-kotlin-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/multi-kotlin-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/samples/multi-kotlin-project-with-buildSrc/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties b/samples/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties +++ b/samples/multi-kotlin-project/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/multi-project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties b/samples/multi-project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/multi-project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/samples/multi-project-with-buildSrc/buildSrc/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/multi-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties b/samples/multi-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/multi-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/samples/multi-project-with-buildSrc/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/project-properties/gradle/wrapper/gradle-wrapper.properties b/samples/project-properties/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/project-properties/gradle/wrapper/gradle-wrapper.properties +++ b/samples/project-properties/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties b/samples/project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/project-with-buildSrc/buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/samples/project-with-buildSrc/buildSrc/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties b/samples/project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties +++ b/samples/project-with-buildSrc/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/provider-properties/build.gradle.kts b/samples/provider-properties/build.gradle.kts index 832454fd7..44f148232 100644 --- a/samples/provider-properties/build.gradle.kts +++ b/samples/provider-properties/build.gradle.kts @@ -29,11 +29,11 @@ open class GreetingPlugin : Plugin { open class GreetingPluginExtension(project: Project) { private - val messageState = project.property() + val messageProperty = project.objects.property() - var message by messageState + var message by messageProperty - val messageProvider: Provider get() = messageState + val messageProvider: Provider get() = messageProperty var outputFiles by project.files() } @@ -41,15 +41,15 @@ open class GreetingPluginExtension(project: Project) { open class Greeting : DefaultTask() { private - val messageState = project.property() + val messageProperty = project.objects.property() @get:Input - var message by messageState + var message by messageProperty @get:OutputFiles var outputFiles by project.files() - fun provideMessage(message: Provider) = messageState.set(message) + fun provideMessage(message: Provider) = messageProperty.set(message) @TaskAction fun printMessage() { diff --git a/samples/provider-properties/gradle/wrapper/gradle-wrapper.properties b/samples/provider-properties/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/provider-properties/gradle/wrapper/gradle-wrapper.properties +++ b/samples/provider-properties/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip diff --git a/samples/task-dependencies/gradle/wrapper/gradle-wrapper.properties b/samples/task-dependencies/gradle/wrapper/gradle-wrapper.properties index 5161f013c..590f0e81d 100644 --- a/samples/task-dependencies/gradle/wrapper/gradle-wrapper.properties +++ b/samples/task-dependencies/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-rc-3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip