diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f47bfaf1d4ee3..b05768a1dd63c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -60,7 +60,7 @@ platforms/core-execution/build-cache-packaging/ @gradle/bt-execution platforms/core-execution/hashing/ @gradle/bt-execution @gradle/bt-ge-build-cache platforms/core-execution/snapshots/ @gradle/bt-execution @gradle/bt-ge-build-cache -# Gradle Enterprise integration +# Develocity integration platforms/enterprise/ @gradle/bt-build-scan @gradle/ge-build-insights platforms/enterprise/enterprise/ @gradle/bt-build-scan @gradle/ge-testing @gradle/ge-build-insights @ldaley platforms/enterprise/enterprise-logging/ @gradle/bt-build-scan @gradle/ge-build-insights @gradle/ge-testing diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 3b2d0fcd56b23..c3c1a8c215bd7 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -28,7 +28,7 @@ plugins { dependencyResolutionManagement { repositories { maven { - name = "Gradle Enterprise release candidates" + name = "Develocity release candidates" url = uri("https://repo.gradle.org/gradle/enterprise-libs-release-candidates") content { val rcAndMilestonesPattern = "\\d{1,2}?\\.\\d{1,2}?(\\.\\d{1,2}?)?-((rc-\\d{1,2}?)|(milestone-\\d{1,2}?))" diff --git a/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/ConfigurationCacheState.kt b/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/ConfigurationCacheState.kt index b7a2aab7e009f..803a4190e4835 100644 --- a/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/ConfigurationCacheState.kt +++ b/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/ConfigurationCacheState.kt @@ -569,7 +569,7 @@ class ConfigurationCacheState( readCachedEnvironmentState(gradle) readPreviewFlags(gradle) readFileSystemDefaultExcludes(gradle) - // It is important that the Gradle Enterprise plugin be read before + // It is important that the Develocity plugin be read before // build cache configuration, as it may contribute build cache configuration. readGradleEnterprisePluginManager(gradle) readBuildCacheConfiguration(gradle) diff --git a/platforms/core-configuration/kotlin-dsl/doc/c4/C4_1_Context.puml b/platforms/core-configuration/kotlin-dsl/doc/c4/C4_1_Context.puml index da4e7fde95c71..72cb33e438e7c 100644 --- a/platforms/core-configuration/kotlin-dsl/doc/c4/C4_1_Context.puml +++ b/platforms/core-configuration/kotlin-dsl/doc/c4/C4_1_Context.puml @@ -15,7 +15,7 @@ System_Ext(ide, "IntelliJ IDE", "IDEA or Android Studio with the Kotlin plugin e System_Ext(kotlinTools, "Kotlin Toolchain", "kotlinc, Gradle plugin etc...") -System_Ext(buildCache, "Gradle Build Cache", "Local, Gradle Enterprise Build Cache Node, etc...") +System_Ext(buildCache, "Gradle Build Cache", "Local, Develocity Build Cache Node, etc...") Rel(dev, gradle, "Uses", "Command Line") Rel(gradleKotlinDsl, kotlinTools, "Uses") diff --git a/platforms/core-configuration/kotlin-dsl/doc/c4/C4_2_Container.puml b/platforms/core-configuration/kotlin-dsl/doc/c4/C4_2_Container.puml index 42314120adc07..ef9ede289ef36 100644 --- a/platforms/core-configuration/kotlin-dsl/doc/c4/C4_2_Container.puml +++ b/platforms/core-configuration/kotlin-dsl/doc/c4/C4_2_Container.puml @@ -44,7 +44,7 @@ System_Boundary(kotlinTools, "Kotlin Toolchain") { Rel_Neighbor(kgp, kotlinc, "Uses", "Daemon") } -System_Ext(buildCache, "Gradle Build Cache", "Local, Gradle Enterprise Build Cache Node, etc...") +System_Ext(buildCache, "Gradle Build Cache", "Local, Develocity Build Cache Node, etc...") Rel(dev, gradle, "Uses", "Command Line") Rel(dev, editor, "Uses", "GUI") diff --git a/platforms/core-configuration/kotlin-dsl/doc/c4/C4_3_Component.puml b/platforms/core-configuration/kotlin-dsl/doc/c4/C4_3_Component.puml index 958ded5ae6f7b..c1c4a2ce2f18f 100644 --- a/platforms/core-configuration/kotlin-dsl/doc/c4/C4_3_Component.puml +++ b/platforms/core-configuration/kotlin-dsl/doc/c4/C4_3_Component.puml @@ -103,7 +103,7 @@ Boundary(kotlinTools, "Kotlin Toolchain") { Rel_Neighbor(kgp, kotlinc, "Uses", "Daemon") } -System_Ext(buildCache, "Gradle Build Cache", "Local, Gradle Enterprise Build Cache Node, etc...") +System_Ext(buildCache, "Gradle Build Cache", "Local, Develocity Build Cache Node, etc...") Rel(dev, gradle, "Uses", "Command Line") Rel(dev, editor, "Uses", "GUI") diff --git a/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_1_Context.svg b/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_1_Context.svg index 7142e95365171..4c2780a893449 100644 --- a/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_1_Context.svg +++ b/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_1_Context.svg @@ -1,4 +1,4 @@ -Context diagram for the Gradle Kotlin DSL«external_system»Gradle Build Tool«system»Kotlin DSL«person»DeveloperDeveloper using a Kotlin DSLbased Gradle build«external_system»IntelliJ IDEIDEA or Android Studio withthe Kotlin plugin enabled«external_system»Kotlin Toolchainkotlinc, Gradle plugin etc...«external_system»Gradle Build CacheLocal, Gradle Enterprise BuildCache Node, etc...Uses[Command Line]UsesUsesUses[GUI]Uses[Tooling API]UsesUsesUses«external_system»Gradle Build Tool«system»Kotlin DSL«person»DeveloperDeveloper using a Kotlin DSLbased Gradle build«external_system»IntelliJ IDEIDEA or Android Studio withthe Kotlin plugin enabled«external_system»Kotlin Toolchainkotlinc, Gradle plugin etc...«external_system»Gradle Build CacheLocal, Develocity BuildCache Node, etc...Uses[Command Line]UsesUsesUses[GUI]Uses[Tooling API]UsesUsesUses \ No newline at end of file +--> diff --git a/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_2_Container.svg b/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_2_Container.svg index fbd06bcfff560..e4052492d6cf0 100644 --- a/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_2_Container.svg +++ b/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_2_Container.svg @@ -1,4 +1,4 @@ -Container diagram for the Gradle Kotlin DSL«boundary»Gradle [System]«boundary»Gradle Kotlin DSL [System]«boundary»IntelliJ IDE [System]«boundary»Kotlin Toolchain [System]«external_system»Gradle Build ToolThe Gradle Build Tool«container»Kotlin DSL Provider[The core of the Gradle Kotlin DSL]«container»IDE ToolingAPI Models[Calculates script dependenciesand error reporting for editors]«container»`kotlin-dsl` Plugin[Gradle Plugin to developKotlin-based projects thatcontribute build logic]«container»Kotlin DSL ScriptDependencies Resolver[Loaded from IntelliJ ProjectGradle version]«external_system».gradle.kts script editorIn IntelliJ IDEA or AndroidStudio«external_system»IntelliJ Kotlin Pluginfor IDEA or Android Studio«external_system»Kotlin Gradle PluginThe`org.jetbrains.kotlin.jvm`Gradle plugin«external_system»Kotlin Compilerkotlinc«person»DeveloperDeveloper using a Kotlin DSLbased Gradle build«external_system»Gradle Build CacheLocal, Gradle Enterprise BuildCache Node, etc...UsesUsesUses[TAPI]Uses[Script compilation]Uses[e.g. in `buildSrc`]UsesUses[Daemon]Uses[Command Line]Uses[GUI]Uses[Embedded]AppliesUsesLoads[Embedded]UsesUses«boundary»Gradle [System]«boundary»Gradle Kotlin DSL [System]«boundary»IntelliJ IDE [System]«boundary»Kotlin Toolchain [System]«external_system»Gradle Build ToolThe Gradle Build Tool«container»Kotlin DSL Provider[The core of the Gradle Kotlin DSL]«container»IDE ToolingAPI Models[Calculates script dependenciesand error reporting for editors]«container»`kotlin-dsl` Plugin[Gradle Plugin to developKotlin-based projects thatcontribute build logic]«container»Kotlin DSL ScriptDependencies Resolver[Loaded from IntelliJ ProjectGradle version]«external_system».gradle.kts script editorIn IntelliJ IDEA or AndroidStudio«external_system»IntelliJ Kotlin Pluginfor IDEA or Android Studio«external_system»Kotlin Gradle PluginThe`org.jetbrains.kotlin.jvm`Gradle plugin«external_system»Kotlin Compilerkotlinc«person»DeveloperDeveloper using a Kotlin DSLbased Gradle build«external_system»Gradle Build CacheLocal, Develocity BuildCache Node, etc...UsesUsesUses[TAPI]Uses[Script compilation]Uses[e.g. in `buildSrc`]UsesUses[Daemon]Uses[Command Line]Uses[GUI]Uses[Embedded]AppliesUsesLoads[Embedded]UsesUses \ No newline at end of file +--> diff --git a/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_3_Component.svg b/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_3_Component.svg index e30eaa52a7bd2..e31b88189eea3 100644 --- a/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_3_Component.svg +++ b/platforms/core-configuration/kotlin-dsl/doc/c4/images/C4_3_Component.svg @@ -1,4 +1,4 @@ -Component diagram for the Gradle Kotlin DSL«boundary»Gradle [System]«external_system»Gradle Build Tool«boundary»Gradle Kotlin DSL [System]«boundary»Kotlin DSL Provider [Container]«boundary»`kotlin-dsl` Gradle Plugin [Container]«boundary»IDE ToolingAPI Models [Container]«boundary»Loaded into IntelliJ [Container]«boundary»IntelliJ IDEA or Android Studio [System]«external_system»`.gradle.kts` script editor«boundary»Kotlin Toolchain«external_system»Script Evaluation«external_system»Plugin Application«component»Generated`gradleKotlinDslApi()`API JAR[The Gradle Kotlin DSL API & Kotlindecorated gradleApi()]«component»GradleScriptPluginFactory[Provides script evaluation toGradle, main entry point]«component»Script Templates[One per script target type, definescripts API, declare Kotlincompiler settings and plugins,declare editor dependenciesresolver]«component»Kotlin DSL Execution[Partial evaluation interpreter for`.gradle.kts` scripts]«component»Script Source andClasspath[Script source and classpathcalculation]«component»Accessors[Collects Project Schema,generates Accessors source andbytecode]«component»Implicit Imports[Includes Gradle's default imports]«component»`kotlin-dsl` GradlePlugin[Configures the project for plugindevelopment and Kotlin DSLfeatures in source sets]«component»Embedded Kotlin[Repository with Kotlin artifactsfrom Gradle distributions]«component»Precompiled scriptssupport[Configures Kotlin compiler for`.gradle.kts` scripts, infers pluginIDs from script names convention]«external_system»`java-gradle-plugin`«component»TAPI Models[classpath, sourcepath, implicitimports, user reports]«component»TAPI Model Builders[On-demand source distrodownload, Calculates editorwarnings and errors]«component»Dependencies Resolver[one loaded per script target type]«external_system»IntelliJ Kotlin Pluginfor IDEA or Android Studio«external_system»Dependenciesclasspath, sourcepath,implicit imports«external_system»Report PanelDisplays warnings and errorson top of the editor UI«external_system»Inline HintsDisplays warning and errorhints inline in the editor UI«external_system»Kotlin Compilerkotlinc«external_system»Kotlin Gradle PluginThe`org.jetbrains.kotlin.jvm`Gradle plugin«person»DeveloperDeveloper using a Kotlin DSLbased Gradle build«external_system»Gradle Build CacheLocal, Gradle Enterprise BuildCache Node, etc...Delegates toUses[script API forcompilation]Uses[for compilation]Uses[for compilation]Uses[for compilation]Queries[for compilation]ConfiguresConfiguresApplies[and configures]BuildQueries[Script classpath]Queries[Implicit Imports]Selects[by configuration, oneloaded per script targettype]Configures[Lenient mode, collectingexceptions]Queries[Collected exceptions]Adds[dependency]Registers[on Kotlin compiler]Registers[on Kotlin compiler]Selects[Depending on fileextension]AppliesUsesSelects[by file extension]Uses[Daemon]Uses[Command Line]Uses[GUI]Uses[Embedded]Applies andconfiguresProvidesReportsReportsRequests[TAPI]Uses[Embedded]Loads[Embedded]UsesUsesUses«boundary»Gradle [System]«external_system»Gradle Build Tool«boundary»Gradle Kotlin DSL [System]«boundary»Kotlin DSL Provider [Container]«boundary»`kotlin-dsl` Gradle Plugin [Container]«boundary»IDE ToolingAPI Models [Container]«boundary»Loaded into IntelliJ [Container]«boundary»IntelliJ IDEA or Android Studio [System]«external_system»`.gradle.kts` script editor«boundary»Kotlin Toolchain«external_system»Script Evaluation«external_system»Plugin Application«component»Generated`gradleKotlinDslApi()`API JAR[The Gradle Kotlin DSL API & Kotlindecorated gradleApi()]«component»GradleScriptPluginFactory[Provides script evaluation toGradle, main entry point]«component»Script Templates[One per script target type, definescripts API, declare Kotlincompiler settings and plugins,declare editor dependenciesresolver]«component»Kotlin DSL Execution[Partial evaluation interpreter for`.gradle.kts` scripts]«component»Script Source andClasspath[Script source and classpathcalculation]«component»Accessors[Collects Project Schema,generates Accessors source andbytecode]«component»Implicit Imports[Includes Gradle's default imports]«component»`kotlin-dsl` GradlePlugin[Configures the project for plugindevelopment and Kotlin DSLfeatures in source sets]«component»Embedded Kotlin[Repository with Kotlin artifactsfrom Gradle distributions]«component»Precompiled scriptssupport[Configures Kotlin compiler for`.gradle.kts` scripts, infers pluginIDs from script names convention]«external_system»`java-gradle-plugin`«component»TAPI Models[classpath, sourcepath, implicitimports, user reports]«component»TAPI Model Builders[On-demand source distrodownload, Calculates editorwarnings and errors]«component»Dependencies Resolver[one loaded per script target type]«external_system»IntelliJ Kotlin Pluginfor IDEA or Android Studio«external_system»Dependenciesclasspath, sourcepath,implicit imports«external_system»Report PanelDisplays warnings and errorson top of the editor UI«external_system»Inline HintsDisplays warning and errorhints inline in the editor UI«external_system»Kotlin Compilerkotlinc«external_system»Kotlin Gradle PluginThe`org.jetbrains.kotlin.jvm`Gradle plugin«person»DeveloperDeveloper using a Kotlin DSLbased Gradle build«external_system»Gradle Build CacheLocal, Develocity BuildCache Node, etc...Delegates toUses[script API forcompilation]Uses[for compilation]Uses[for compilation]Uses[for compilation]Queries[for compilation]ConfiguresConfiguresApplies[and configures]BuildQueries[Script classpath]Queries[Implicit Imports]Selects[by configuration, oneloaded per script targettype]Configures[Lenient mode, collectingexceptions]Queries[Collected exceptions]Adds[dependency]Registers[on Kotlin compiler]Registers[on Kotlin compiler]Selects[Depending on fileextension]AppliesUsesSelects[by file extension]Uses[Daemon]Uses[Command Line]Uses[GUI]Uses[Embedded]Applies andconfiguresProvidesReportsReportsRequests[TAPI]Uses[Embedded]Loads[Embedded]UsesUsesUses \ No newline at end of file +--> diff --git a/platforms/enterprise/enterprise-logging/build.gradle.kts b/platforms/enterprise/enterprise-logging/build.gradle.kts index 3bc57d4b791c6..9937883eeeaad 100644 --- a/platforms/enterprise/enterprise-logging/build.gradle.kts +++ b/platforms/enterprise/enterprise-logging/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("gradlebuild.distribution.api-java") } -description = "Logging API consumed by the Gradle Enterprise plugin" +description = "Logging API consumed by the Develocity plugin" gradlebuildJava.usedInWorkers() diff --git a/platforms/enterprise/enterprise-operations/build.gradle.kts b/platforms/enterprise/enterprise-operations/build.gradle.kts index dae7bbf36c91f..945c028294b8a 100644 --- a/platforms/enterprise/enterprise-operations/build.gradle.kts +++ b/platforms/enterprise/enterprise-operations/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("gradlebuild.publish-public-libraries") } -description = "Build operations consumed by the Gradle Enterprise plugin" +description = "Build operations consumed by the Develocity plugin" dependencies { api(project(":build-operations")) diff --git a/platforms/enterprise/enterprise-operations/src/main/java/org/gradle/api/internal/tasks/SnapshotTaskInputsBuildOperationType.java b/platforms/enterprise/enterprise-operations/src/main/java/org/gradle/api/internal/tasks/SnapshotTaskInputsBuildOperationType.java index 22b620cc37f38..79aa154dafd80 100644 --- a/platforms/enterprise/enterprise-operations/src/main/java/org/gradle/api/internal/tasks/SnapshotTaskInputsBuildOperationType.java +++ b/platforms/enterprise/enterprise-operations/src/main/java/org/gradle/api/internal/tasks/SnapshotTaskInputsBuildOperationType.java @@ -162,7 +162,7 @@ interface VisitState extends FilePropertyVisitor.VisitState { /** * The “primary” attribute of the current property. *

- * Used by Gradle Enterprise plugin < 3.8, retained for backwards compatibility. + * Used by Develocity plugin < 3.8, retained for backwards compatibility. *

* Returns the name value of one of: *