Merge Kotlin DSL v1.1.3 into eskatos/kotlin-dsl-merge
Commit '14a172ad947819fe468af4b4d20197a78ea1338c'
# Conflicts:
# build.gradle.kts
# gradle/wrapper/gradle-wrapper.properties
# kotlin-version.txt
# samples/ant/gradle/wrapper/gradle-wrapper.properties
# samples/build-cache/gradle/wrapper/gradle-wrapper.properties
# samples/build-scan/gradle/wrapper/gradle-wrapper.properties
# samples/buildSrc-plugin/gradle/wrapper/gradle-wrapper.properties
# samples/code-quality/gradle/wrapper/gradle-wrapper.properties
# samples/composite-builds/gradle/wrapper/gradle-wrapper.properties
# samples/copy/gradle/wrapper/gradle-wrapper.properties
# samples/domain-objects/gradle/wrapper/gradle-wrapper.properties
# samples/extra-properties/gradle/wrapper/gradle-wrapper.properties
# samples/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
# samples/gradle-plugin/plugin/gradle/wrapper/gradle-wrapper.properties
# samples/groovy-interop/gradle/wrapper/gradle-wrapper.properties
# samples/hello-android/build.gradle.kts
# samples/hello-android/gradle/wrapper/gradle-wrapper.properties
# samples/hello-coroutines/build.gradle.kts
# samples/hello-coroutines/gradle/wrapper/gradle-wrapper.properties
# samples/hello-js/build.gradle.kts
# samples/hello-js/gradle/wrapper/gradle-wrapper.properties
# samples/hello-kapt/build.gradle.kts
# samples/hello-kapt/gradle/wrapper/gradle-wrapper.properties
# samples/hello-kotlin/build.gradle.kts
# samples/hello-kotlin/gradle/wrapper/gradle-wrapper.properties
# samples/hello-world/gradle/wrapper/gradle-wrapper.properties
# samples/kotlin-friendly-groovy-plugin/consumer/gradle/wrapper/gradle-wrapper.properties
# samples/kotlin-friendly-groovy-plugin/gradle/wrapper/gradle-wrapper.properties
# samples/kotlin-friendly-groovy-plugin/plugin/gradle/wrapper/gradle-wrapper.properties
# samples/maven-plugin/gradle/wrapper/gradle-wrapper.properties
# samples/maven-publish/build.gradle.kts
# samples/maven-publish/gradle/wrapper/gradle-wrapper.properties
# samples/model-rules/gradle/wrapper/gradle-wrapper.properties
# samples/modularity/gradle/wrapper/gradle-wrapper.properties
# samples/multi-kotlin-project-config-injection/build.gradle.kts
# samples/multi-kotlin-project-config-injection/gradle/wrapper/gradle-wrapper.properties
# samples/multi-kotlin-project-with-buildSrc/build.gradle.kts
# samples/multi-kotlin-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties
# samples/multi-kotlin-project/build.gradle.kts
# samples/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties
# samples/multi-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties
# samples/precompiled-script-plugin/gradle/wrapper/gradle-wrapper.properties
# samples/precompiled-script-plugin/plugin/gradle/wrapper/gradle-wrapper.properties
# samples/project-properties/gradle/wrapper/gradle-wrapper.properties
# samples/project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties
# samples/provider-properties/gradle/wrapper/gradle-wrapper.properties
# samples/source-control/external/gradle/wrapper/gradle-wrapper.properties
# samples/source-control/sample/gradle/wrapper/gradle-wrapper.properties
# samples/task-dependencies/gradle/wrapper/gradle-wrapper.properties
# samples/testkit/gradle/wrapper/gradle-wrapper.properties
# subprojects/integ-tests/src/test/kotlin/org/gradle/kotlin/dsl/integration/GradleApiExtensionsIntegrationTest.kt
# subprojects/integ-tests/src/test/kotlin/org/gradle/kotlin/dsl/integration/PrecompiledScriptPluginIntegrationTest.kt
# subprojects/integ-tests/src/test/kotlin/org/gradle/kotlin/dsl/integration/ProjectSchemaAccessorsIntegrationTest.kt
# subprojects/provider/src/main/kotlin/org/gradle/kotlin/dsl/execution/Interpreter.kt
# subprojects/provider/src/main/kotlin/org/gradle/kotlin/dsl/resolver/ResolverEvent.kt
# subprojects/provider/src/main/kotlin/org/gradle/kotlin/dsl/resolver/ResolverEventLogger.kt
# subprojects/provider/src/main/kotlin/org/gradle/kotlin/dsl/support/KotlinCompiler.kt
# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/caching/LoadDirectoryTest.kt
# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/codegen/GradleApiExtensionsTest.kt
# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/execution/ResidualProgramCompilerTest.kt
# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/integration/KotlinBuildScriptIntegrationTest.kt
# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/resolver/SourceDistributionResolverIntegrationTest.kt
# subprojects/test-fixtures/src/main/kotlin/org/gradle/kotlin/dsl/fixtures/AbstractIntegrationTest.kt
# update-wrapper.sh