AccessorsClassPath.kt

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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 and :kotlin-dsl-test-fixtures

Both in one go because of their circular dependency

Tests are failing because of the lack of :customInstallation

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

    • -0
    • +558
    ./AccessorsClassPath.kt
  1. … 536 more files in changeset.