chore: merge upstream branch gradle/master into main

This commit synchronizes the latest 6 changes from the https://github.com/gradle/gradle/tree/master. The changes include:

aa9f77e: gradle/gradle#27240 Move core-runtime projects to core-runtime platform
4c080f5: Move distributions-core project to core-runtime
e0f2544: Move distributions-basics project to core-runtime
6a29081: Move build-profile project to core-runtime
c9b2546: Move instrumentation-declarations project to core-runtime
16dcf95: Move installation-beacon project to core-runtime

.cm/platform_labels.cm

@@ -118,12 +118,10 @@ platforms:
     subprojects:
       - 'platforms/core-execution/'
       - 'platforms/core-runtime/build-operations/'
-      - 'subprojects/build-profile/'
   - core_runtime:
     name: 'core_runtime'
     subprojects:
       - 'platforms/core-runtime/'
-      - 'subprojects/installation-beacon/'
   - documentation:
     name: 'documentation'
     subprojects:

.cm/summary_table.cm

@@ -131,12 +131,10 @@ platforms:
     name: 'core_execution'
     subprojects:
       - 'platforms/core-runtime/'
-      - 'subprojects/build-profile/'
   - core_runtime:
     name: 'core_runtime'
     subprojects:
       - 'platforms/core-runtime/'
-      - 'subprojects/installation-beacon/'
   - documentation:
     name: 'documentation'
     subprojects:

.github/CODEOWNERS

@@ -47,9 +47,6 @@ platforms/core-runtime/                                     @gradle/bt-core-runt
 platforms/core-runtime/build-operations/                    @gradle/bt-core-runtime-maintainers @gradle/bt-execution @gradle/bt-ge-build-cache
 platforms/core-runtime/functional/                          @gradle/bt-core-runtime-maintainers @gradle/bt-execution @bamboo
 platforms/core-runtime/files/                               @gradle/bt-core-runtime-maintainers @gradle/bt-execution @gradle/bt-ge-build-cache
-subprojects/build-profile/                                  @gradle/bt-core-runtime-maintainers
-subprojects/installation-beacon/                            @gradle/bt-core-runtime-maintainers
-subprojects/instrumentation-declarations/                   @gradle/bt-core-runtime-maintainers
 
 # Core automation platform (core/execution)
 platforms/core-execution/                                   @gradle/bt-execution

.teamcity/subprojects.json

@@ -113,7 +113,7 @@
   },
   {
     "name": "build-profile",
-    "path": "subprojects/build-profile",
+    "path": "platforms/core-runtime/build-profile",
     "unitTests": true,
     "functionalTests": true,
     "crossVersionTests": false
@@ -183,14 +183,14 @@
   },
   {
     "name": "distributions-basics",
-    "path": "subprojects/distributions-basics",
+    "path": "platforms/core-runtime/distributions-basics",
     "unitTests": false,
     "functionalTests": false,
     "crossVersionTests": false
   },
   {
     "name": "distributions-core",
-    "path": "subprojects/distributions-core",
+    "path": "platforms/core-runtime/distributions-core",
     "unitTests": false,
     "functionalTests": false,
     "crossVersionTests": false
@@ -379,7 +379,7 @@
   },
   {
     "name": "installation-beacon",
-    "path": "subprojects/installation-beacon",
+    "path": "platforms/core-runtime/installation-beacon",
     "unitTests": false,
     "functionalTests": false,
     "crossVersionTests": false
@@ -393,7 +393,7 @@
   },
   {
     "name": "instrumentation-declarations",
-    "path": "subprojects/instrumentation-declarations",
+    "path": "platforms/core-runtime/instrumentation-declarations",
     "unitTests": false,
     "functionalTests": false,
     "crossVersionTests": false

settings.gradle.kts

@@ -45,8 +45,6 @@ unassigned {
 
 // Gradle Distributions - for testing and for publishing a full distribution
 unassigned {
-    subproject("distributions-core")
-    subproject("distributions-basics")
     subproject("distributions-full")
 }
 
@@ -56,11 +54,8 @@ unassigned {
     subproject("plugins")
     subproject("build-events")
     subproject("diagnostics")
-    subproject("installation-beacon")
     subproject("composite-builds")
     subproject("core-api")
-    subproject("build-profile")
-    subproject("instrumentation-declarations")
 }
 
 // Core Runtime Platform
@@ -70,11 +65,16 @@ platform("core-runtime") {
     subproject("bootstrap")
     subproject("build-operations")
     subproject("build-option")
+    subproject("build-profile")
     subproject("cli")
+    subproject("distributions-basics")
+    subproject("distributions-core")
     subproject("file-temp")
     subproject("files")
     subproject("functional")
+    subproject("installation-beacon")
     subproject("instrumentation-agent")
+    subproject("instrumentation-declarations")
     subproject("internal-instrumentation-api")
     subproject("internal-instrumentation-processor")
     subproject("launcher")