Skip to content
This repository has been archived by the owner on Dec 5, 2023. It is now read-only.

Commit

Permalink
chore: merge upstream branch gradle/master into main
Browse files Browse the repository at this point in the history
This commit synchronizes the latest 9 changes from the https://github.com/gradle/gradle/tree/master. The changes include:

a8a1032: Merge branch 'master' into lkasso/documentation/platform-update
08511ee: put back TODO
5c03916: back to hard-coded path
5fc186e: incorporate test path fix from @tresat
7413355: fix typo
61be887: update hardcoded path to docs for tests
407bf79: fix cm paths
2e09ac5: merge master
c42798b: create documentation platform
  • Loading branch information
meowool-bot committed Nov 29, 2023
2 parents f776486 + a8a1032 commit 134f919
Show file tree
Hide file tree
Showing 5,748 changed files with 42 additions and 47 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 2 additions & 5 deletions .cm/platform_labels.cm
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,7 @@ platforms:
- documentation:
name: 'documentation'
subprojects:
- 'subprojects/docs/'
- 'subprojects/docs-asciidoctor-extensions/'
- 'subprojects/docs-asciidoctor-extensions-base/'
- 'subprojects/samples/'
- 'platforms/documentation/'
- extensibility:
name: 'extensibility'
subprojects:
Expand Down Expand Up @@ -160,7 +157,7 @@ platforms:
- 'platforms/core-configuration/kotlin-dsl-tooling-builders/'
- 'platforms/core-configuration/kotlin-dsl-tooling-models/'
- 'build-logic/kotlin-dsl/'
- 'subprojects/docs/src/snippets/kotlinDsl/'
- 'platforms/documentation/docs/src/snippets/kotlinDsl/'
- release_coordination:
name: 'release_coordination'
subprojects:
Expand Down
7 changes: 2 additions & 5 deletions .cm/summary_table.cm
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,7 @@ platforms:
- documentation:
name: 'documentation'
subprojects:
- 'subprojects/docs/'
- 'subprojects/docs-asciidoctor-extensions/'
- 'subprojects/docs-asciidoctor-extensions-base/'
- 'subprojects/samples/'
- 'platforms/documentation/'
- extensibility:
name: 'extensibility'
subprojects:
Expand Down Expand Up @@ -173,7 +170,7 @@ platforms:
- 'platforms/core-configuration/kotlin-dsl-tooling-builders/'
- 'platforms/core-configuration/kotlin-dsl-tooling-models/'
- 'build-logic/kotlin-dsl/'
- 'subprojects/docs/src/snippets/kotlinDsl/'
- 'platforms/documentation/docs/src/snippets/kotlinDsl/'
- release_coordination:
name: 'release_coordination'
subprojects:
Expand Down
51 changes: 25 additions & 26 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -108,29 +108,28 @@ subprojects/smoke-test/ @gradle/bt-support
subprojects/soak/ @gradle/bt-support

# Documentation
platforms/documentation/ @gradle/bt-devrel-education
subprojects/docs/src/docs/ @gradle/bt-devrel-education
subprojects/docs/src/samples/ @gradle/bt-devrel-education
subprojects/docs-asciidoctor-extensions-base/ @gradle/bt-devrel-education
subprojects/docs-asciidoctor-extensions/ @gradle/bt-devrel-education
subprojects/samples/ @gradle/bt-devrel-education

subprojects/docs/src/snippets/kotlinDsl/ @gradle/bt-devrel-education @gradle/bt-kotlin-dsl-maintainers
subprojects/docs/src/docs/userguide/api/kotlin_dsl.adoc @gradle/bt-devrel-education @gradle/bt-kotlin-dsl-maintainers
subprojects/docs/src/docs/userguide/migration/migrating_from_groovy_to_kotlin_dsl.adoc @gradle/bt-devrel-education @gradle/bt-kotlin-dsl-maintainers

subprojects/docs/src/docs/userguide/core-plugins/base_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/build_dashboard_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/build_init_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/checkstyle_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/codenarc_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/distribution_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/ear_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/jacoco_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/java_gradle_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/pmd_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/core-plugins/war_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/dep-man/ @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/jvm/ @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/reference/directory_layout.adoc @gradle/bt-devrel-education @gradle/bt-jvm
subprojects/docs/src/docs/userguide/troubleshooting/version_catalog_problems.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/ @gradle/bt-devrel-education
platforms/documentation/docs/src/samples/ @gradle/bt-devrel-education
platforms/documentation/docs/src/docs-asciidoctor-extensions-base/ @gradle/bt-devrel-education
platforms/documentation/docs/src/docs-asciidoctor-extensions/ @gradle/bt-devrel-education
platforms/documentation/samples/ @gradle/bt-devrel-education

platforms/documentation/docs/src/snippets/kotlinDsl/ @gradle/bt-devrel-education @gradle/bt-kotlin-dsl-maintainers
platforms/documentation/docs/src/docs/userguide/api/kotlin_dsl.adoc @gradle/bt-devrel-education @gradle/bt-kotlin-dsl-maintainers
platforms/documentation/docs/src/docs/userguide/migration/migrating_from_groovy_to_kotlin_dsl.adoc @gradle/bt-devrel-education @gradle/bt-kotlin-dsl-maintainers

platforms/documentation/docs/src/docs/userguide/core-plugins/base_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/build_dashboard_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/build_init_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/checkstyle_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/codenarc_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/distribution_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/ear_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/jacoco_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/java_gradle_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/pmd_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/core-plugins/war_plugin.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/dep-man/ @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/jvm/ @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/reference/directory_layout.adoc @gradle/bt-devrel-education @gradle/bt-jvm
platforms/documentation/docs/src/docs/userguide/troubleshooting/version_catalog_problems.adoc @gradle/bt-devrel-education @gradle/bt-jvm
8 changes: 4 additions & 4 deletions .teamcity/subprojects.json
Original file line number Diff line number Diff line change
Expand Up @@ -239,21 +239,21 @@
},
{
"name": "docs",
"path": "subprojects/docs",
"path": "platforms/documentation/docs",
"unitTests": true,
"functionalTests": false,
"crossVersionTests": false
},
{
"name": "docs-asciidoctor-extensions",
"path": "subprojects/docs-asciidoctor-extensions",
"path": "platforms/documentation/docs-asciidoctor-extensions",
"unitTests": false,
"functionalTests": false,
"crossVersionTests": false
},
{
"name": "docs-asciidoctor-extensions-base",
"path": "subprojects/docs-asciidoctor-extensions-base",
"path": "platforms/documentation/docs-asciidoctor-extensions-base",
"unitTests": true,
"functionalTests": false,
"crossVersionTests": false
Expand Down Expand Up @@ -813,7 +813,7 @@
},
{
"name": "samples",
"path": "subprojects/samples",
"path": "platforms/documentation/samples",
"unitTests": false,
"functionalTests": true,
"crossVersionTests": false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ plugins {
id("gradlebuild.module-identity")
}

val docsProjectLocation = "subprojects/docs" // TODO instead of reaching directly into the project we should use dependency management

val intTestHomeDir = repoRoot().dir("intTestHomeDir")

val cachesCleanerService = gradle.sharedServices.registerIfAbsent("cachesCleaner", CachesCleaner::class) {
Expand Down Expand Up @@ -75,7 +73,7 @@ fun DistributionTest.configureGradleTestEnvironment() {
// The user home dir is not wiped out by clean. Move the daemon working space underneath the build dir so they don't pile up on CI.
// The actual daemon registry dir will be a subfolder using the name of the distribution.
daemonRegistry = repoRoot().dir("build/daemon")
gradleSnippetsDir = repoRoot().dir("$docsProjectLocation/src/snippets")
gradleSnippetsDir = repoRoot().dir("platforms/documentation/docs/src/snippets") // TODO use dependency management
}

// Wire the different inputs for local distributions and repos that are declared by dependencies in the build scripts
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 134f919

Please sign in to comment.