Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Rename method to not be a getter, to avoid being accidentally invoked

  1. … 3 more files in changeset.
Attach the buildSrc export scope to settings

This is the minimal change required to make Kotlin DSL IDE integration

work. When getting a script's classpath fails, we fall back to this

classpath.

  1. … 10 more files in changeset.
Revert "Revert "Merge remote-tracking branch 'origin/sg/merges/pr-9419'""

This reverts commit 0625bc7420e55e87730673231af6ad45dd04f47a.

  1. … 90 more files in changeset.
Revert "Merge remote-tracking branch 'origin/sg/merges/pr-9419'"

This reverts commit 2f79026f5e127a8175e25844522237615b19ed52 because of a performance regression,

reversing changes made to 7f1e66079ce629ecde3e09e549e9796ab85761dc.

  1. … 90 more files in changeset.
Remove TextResourceLoader.Factory

  1. … 32 more files in changeset.
Fix several tests

  1. … 19 more files in changeset.
Fix several tests

  1. … 19 more files in changeset.
Fix several tests

  1. … 19 more files in changeset.
Fix several tests

  1. … 19 more files in changeset.
Fix several tests

  1. … 19 more files in changeset.
Fix several tests

  1. … 19 more files in changeset.
Add implicit import for plugin spec builders package to the model

  1. … 4 more files in changeset.
Limit dir count in build/ on projects with precompiled script plugins

Signed-off-by: Paul Merlin <paul@gradle.com>

  1. … 1 more file in changeset.
Revert "Set `prepareKotlinBuildScriptModel` task group explicitly"

This reverts commit 853397e86cb8f888e34d290c953cdbab12b00a1f.

Set `prepareKotlinBuildScriptModel` task group explicitly

Introduce `prepareKotlinBuildScriptModel` task

To replace `projects` as the trigger for precompiled script plugin

type-safe accessor code generation tasks.

  1. … 3 more files in changeset.
Include implicit imports for precompiled script plugin accessors

In model response.

Unfortunately the test must continue to be `@Ignore`d because the

tests don't execute against the latest version of the model builder.

  1. … 7 more files in changeset.
Merge type-safe accessors for precompiled script plugins wip

  1. … 40 more files in changeset.
Merge tip of `kotlin-dsl@develop` into master

This brings master up-to-date with gradle/kotlin-dsl@cd78487a11e6a50fe7aa4fe277399c1a44d7c789

The main change is:

Introduce resolver request correlation id

And make it possible to correlate events from the Kotlin DSL resolver

log with the daemon log.

  1. … 4 more files in changeset.
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

  1. … 24 more files in changeset.
Merge gradle/kotlin-dsl@v1.1.1 into eskatos/kotlin-dsl-merge

commit 'e57395d8378'

# Conflicts:

# build.gradle.kts

# gradle/wrapper/gradle-wrapper.properties

# 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/gradle/wrapper/gradle-wrapper.properties

# samples/hello-coroutines/gradle/wrapper/gradle-wrapper.properties

# samples/hello-js/gradle/wrapper/gradle-wrapper.properties

# samples/hello-kapt/gradle/wrapper/gradle-wrapper.properties

# 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/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/gradle/wrapper/gradle-wrapper.properties

# samples/multi-kotlin-project-with-buildSrc/gradle/wrapper/gradle-wrapper.properties

# 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/ProjectSchemaAccessorsIntegrationTest.kt

# subprojects/plugins/src/test/kotlin/org/gradle/kotlin/dsl/plugins/dsl/KotlinDslPluginTest.kt

# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/integration/KotlinBuildScriptModelIntegrationTest.kt

# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/integration/ScriptModelIntegrationTest.kt

# subprojects/provider/src/test/kotlin/org/gradle/kotlin/dsl/resolver/SourceDistributionResolverIntegrationTest.kt

# update-wrapper.sh

  1. … 16 more files in changeset.
Import :kotlin-dsl-tooling-builders

Signed-off-by: Paul Merlin <paul@gradle.com>

    • -0
    • +126
    ./dsl/tooling/builders/BuildSrcClassPathModeConfigurationAction.kt
    • -0
    • +201
    ./dsl/tooling/builders/EditorReportsBuilder.kt
    • -0
    • +447
    ./dsl/tooling/builders/KotlinBuildScriptModelBuilder.kt
    • -0
    • +55
    ./dsl/tooling/builders/KotlinBuildScriptTemplateModelBuilder.kt
    • -0
    • +117
    ./dsl/tooling/builders/KotlinLibSources.kt
    • -0
    • +35
    ./dsl/tooling/builders/KotlinScriptingModelBuildersRegistrationAction.kt
  1. … 17 more files in changeset.