Extract model-reflect from model-core

ljacomet · Feb 10, 2025 · 3a64efe · 3a64efe
1 parent f021f82
commit 3a64efe
Show file tree

Hide file tree

Showing 75 changed files with 93 additions and 5 deletions.
diff --git a/.teamcity/subprojects.json b/.teamcity/subprojects.json
@@ -874,6 +874,13 @@
     "functionalTests": true,
     "crossVersionTests": false
   },
+  {
+    "name": "model-reflect",
+    "path": "platforms/core-configuration/model-reflect",
+    "unitTests": true,
+    "functionalTests": false,
+    "crossVersionTests": false
+  },
   {
     "name": "native",
     "path": "platforms/core-runtime/native",

diff --git a/platforms/core-configuration/bean-serialization-services/build.gradle.kts b/platforms/core-configuration/bean-serialization-services/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
     implementation(projects.core)
     implementation(projects.coreApi)
     implementation(projects.coreKotlinExtensions)
+    implementation(projects.modelReflect)
     implementation(projects.serviceLookup)
     implementation(projects.stdlibKotlinExtensions)
 

diff --git a/platforms/core-configuration/configuration-cache/build.gradle.kts b/platforms/core-configuration/configuration-cache/build.gradle.kts
@@ -100,6 +100,7 @@ dependencies {
     integTestImplementation(testFixtures(projects.dependencyManagement))
     integTestImplementation(testFixtures(projects.jacoco))
     integTestImplementation(testFixtures(projects.modelCore))
+    integTestImplementation(testFixtures(projects.modelReflect))
 
     crossVersionTestImplementation(projects.cli)
 

diff --git a/platforms/core-configuration/core-serialization-codecs/build.gradle.kts b/platforms/core-configuration/core-serialization-codecs/build.gradle.kts
@@ -52,6 +52,7 @@ dependencies {
     implementation(projects.hashing)
     implementation(projects.loggingApi)
     implementation(projects.messaging)
+    implementation(projects.modelReflect)
     implementation(projects.platformJvm)
     implementation(projects.publish)
     implementation(projects.serialization)

diff --git a/platforms/core-configuration/file-collections/build.gradle.kts b/platforms/core-configuration/file-collections/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
     testImplementation(testFixtures(projects.core))
     testImplementation(testFixtures(projects.coreApi))
     testImplementation(testFixtures(projects.modelCore))
+    testImplementation(testFixtures(projects.modelReflect))
     testImplementation(libs.groovyDateUtil)
 
     testFixturesImplementation(projects.baseServices)

diff --git a/platforms/core-configuration/flow-services/build.gradle.kts b/platforms/core-configuration/flow-services/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
 
     implementation(projects.core)
     implementation(projects.messaging)
+    implementation(projects.modelReflect)
     implementation(projects.problemsApi)
     implementation(projects.serviceLookup)
     implementation(projects.serviceRegistryBuilder)

diff --git a/platforms/core-configuration/model-core/build.gradle.kts b/platforms/core-configuration/model-core/build.gradle.kts
@@ -14,16 +14,14 @@ dependencies {
     api(projects.serviceLookup)
     api(projects.stdlibJavaExtensions)
     api(projects.coreApi)
-    api(projects.problemsApi)
     api(projects.hashing)
     api(projects.baseServices)
     api(projects.files)
     api(projects.functional)
-    api(projects.logging)
     api(projects.messaging)
+    api(projects.modelReflect)
     api(projects.persistentCache)
     api(projects.snapshots)
-
     api(libs.asm)
     api(libs.jsr305)
     api(libs.inject)
@@ -32,6 +30,8 @@ dependencies {
 
     implementation(projects.baseServicesGroovy)
     implementation(projects.baseAsm)
+    implementation(projects.logging)
+    implementation(projects.problemsApi)
     implementation(projects.serviceProvider)
     implementation(projects.serviceRegistryBuilder)
 
@@ -56,6 +56,7 @@ dependencies {
     testImplementation(projects.resources)
     testImplementation(testFixtures(projects.coreApi))
     testImplementation(testFixtures(projects.languageGroovy))
+    testImplementation(testFixtures(projects.modelReflect))
 
     integTestImplementation(projects.platformBase)
 

diff --git a/platforms/core-configuration/model-reflect/build.gradle.kts b/platforms/core-configuration/model-reflect/build.gradle.kts
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("gradlebuild.distribution.api-java")
+}
+
+description = "Implementation of model reflection"
+
+dependencies {
+    api(projects.baseServices)
+    api(projects.coreApi)
+    api(projects.logging)
+    api(projects.persistentCache)
+    api(projects.problemsApi)
+    api(projects.serialization)
+    api(projects.stdlibJavaExtensions)
+
+    api(libs.guava)
+    api(libs.jsr305)
+
+    implementation(libs.commonsLang)
+    implementation(libs.groovy)
+    implementation(libs.inject)
+
+    compileOnly(libs.errorProneAnnotations)
+
+    testFixturesApi(testFixtures(projects.baseDiagnostics))
+    testFixturesApi(testFixtures(projects.core))
+    testFixturesApi(projects.internalIntegTesting)
+    testFixturesImplementation(projects.baseAsm)
+    testFixturesImplementation(libs.guava)
+    testFixturesImplementation(libs.groovyAnt)
+    testFixturesImplementation(libs.groovyDatetime)
+    testFixturesImplementation(libs.groovyDateUtil)
+
+    testImplementation(projects.processServices)
+    testImplementation(projects.fileCollections)
+    testImplementation(projects.native)
+    testImplementation(projects.resources)
+    testImplementation(testFixtures(projects.coreApi))
+    testImplementation(testFixtures(projects.languageGroovy))
+}
diff --git a/...gradle/internal/reflect/ClassDetails.java → ...gradle/internal/reflect/ClassDetails.java b/...gradle/internal/reflect/ClassDetails.java → ...gradle/internal/reflect/ClassDetails.java
diff --git a/...adle/internal/reflect/ClassInspector.java → ...adle/internal/reflect/ClassInspector.java b/...adle/internal/reflect/ClassInspector.java → ...adle/internal/reflect/ClassInspector.java
diff --git a/...reflect/DefaultTypeValidationContext.java → ...reflect/DefaultTypeValidationContext.java b/...reflect/DefaultTypeValidationContext.java → ...reflect/DefaultTypeValidationContext.java
diff --git a/...radle/internal/reflect/GroovyMethods.java → ...radle/internal/reflect/GroovyMethods.java b/...radle/internal/reflect/GroovyMethods.java → ...radle/internal/reflect/GroovyMethods.java
diff --git a/...l/reflect/JavaPropertyReflectionUtil.java → ...l/reflect/JavaPropertyReflectionUtil.java b/...l/reflect/JavaPropertyReflectionUtil.java → ...l/reflect/JavaPropertyReflectionUtil.java
diff --git a/...e/internal/reflect/MethodDescription.java → ...e/internal/reflect/MethodDescription.java b/...e/internal/reflect/MethodDescription.java → ...e/internal/reflect/MethodDescription.java
diff --git a/...rg/gradle/internal/reflect/MethodSet.java → ...rg/gradle/internal/reflect/MethodSet.java b/...rg/gradle/internal/reflect/MethodSet.java → ...rg/gradle/internal/reflect/MethodSet.java
diff --git a/.../org/gradle/internal/reflect/Methods.java → .../org/gradle/internal/reflect/Methods.java b/.../org/gradle/internal/reflect/Methods.java → .../org/gradle/internal/reflect/Methods.java
diff --git a/...internal/reflect/MutableClassDetails.java → ...internal/reflect/MutableClassDetails.java b/...internal/reflect/MutableClassDetails.java → ...internal/reflect/MutableClassDetails.java
diff --git a/...ernal/reflect/MutablePropertyDetails.java → ...ernal/reflect/MutablePropertyDetails.java b/...ernal/reflect/MutablePropertyDetails.java → ...ernal/reflect/MutablePropertyDetails.java
diff --git a/...rnal/reflect/NoSuchPropertyException.java → ...rnal/reflect/NoSuchPropertyException.java b/...rnal/reflect/NoSuchPropertyException.java → ...rnal/reflect/NoSuchPropertyException.java
diff --git a/...roblemRecordingTypeValidationContext.java → ...roblemRecordingTypeValidationContext.java b/...roblemRecordingTypeValidationContext.java → ...roblemRecordingTypeValidationContext.java
diff --git a/...le/internal/reflect/PropertyAccessor.java → ...le/internal/reflect/PropertyAccessor.java b/...le/internal/reflect/PropertyAccessor.java → ...le/internal/reflect/PropertyAccessor.java
diff --git a/...nternal/reflect/PropertyAccessorType.java → ...nternal/reflect/PropertyAccessorType.java b/...nternal/reflect/PropertyAccessorType.java → ...nternal/reflect/PropertyAccessorType.java
diff --git a/...dle/internal/reflect/PropertyDetails.java → ...dle/internal/reflect/PropertyDetails.java b/...dle/internal/reflect/PropertyDetails.java → ...dle/internal/reflect/PropertyDetails.java
diff --git a/...dle/internal/reflect/PropertyMutator.java → ...dle/internal/reflect/PropertyMutator.java b/...dle/internal/reflect/PropertyMutator.java → ...dle/internal/reflect/PropertyMutator.java
diff --git a/...va/org/gradle/internal/reflect/Types.java → ...va/org/gradle/internal/reflect/Types.java b/...va/org/gradle/internal/reflect/Types.java → ...va/org/gradle/internal/reflect/Types.java
diff --git a/...ct/UnsupportedPropertyValueException.java → ...ct/UnsupportedPropertyValueException.java b/...ct/UnsupportedPropertyValueException.java → ...ct/UnsupportedPropertyValueException.java
diff --git a/...flect/annotations/AnnotationCategory.java → ...flect/annotations/AnnotationCategory.java b/...flect/annotations/AnnotationCategory.java → ...flect/annotations/AnnotationCategory.java
diff --git a/...notations/FunctionAnnotationMetadata.java → ...notations/FunctionAnnotationMetadata.java b/...notations/FunctionAnnotationMetadata.java → ...notations/FunctionAnnotationMetadata.java
diff --git a/...ct/annotations/HasAnnotationMetadata.java → ...ct/annotations/HasAnnotationMetadata.java b/...ct/annotations/HasAnnotationMetadata.java → ...ct/annotations/HasAnnotationMetadata.java
diff --git a/...notations/PropertyAnnotationMetadata.java → ...notations/PropertyAnnotationMetadata.java b/...notations/PropertyAnnotationMetadata.java → ...notations/PropertyAnnotationMetadata.java
diff --git a/...t/annotations/TypeAnnotationMetadata.java → ...t/annotations/TypeAnnotationMetadata.java b/...t/annotations/TypeAnnotationMetadata.java → ...t/annotations/TypeAnnotationMetadata.java
diff --git a/...otations/TypeAnnotationMetadataStore.java → ...otations/TypeAnnotationMetadataStore.java b/...otations/TypeAnnotationMetadataStore.java → ...otations/TypeAnnotationMetadataStore.java
diff --git a/...s/impl/AbstractHasAnnotationMetadata.java → ...s/impl/AbstractHasAnnotationMetadata.java b/...s/impl/AbstractHasAnnotationMetadata.java → ...s/impl/AbstractHasAnnotationMetadata.java
diff --git a/...pl/DefaultFunctionAnnotationMetadata.java → ...pl/DefaultFunctionAnnotationMetadata.java b/...pl/DefaultFunctionAnnotationMetadata.java → ...pl/DefaultFunctionAnnotationMetadata.java
diff --git a/...pl/DefaultPropertyAnnotationMetadata.java → ...pl/DefaultPropertyAnnotationMetadata.java b/...pl/DefaultPropertyAnnotationMetadata.java → ...pl/DefaultPropertyAnnotationMetadata.java
diff --git a/...s/impl/DefaultTypeAnnotationMetadata.java → ...s/impl/DefaultTypeAnnotationMetadata.java b/...s/impl/DefaultTypeAnnotationMetadata.java → ...s/impl/DefaultTypeAnnotationMetadata.java
diff --git a/...l/DefaultTypeAnnotationMetadataStore.java → ...l/DefaultTypeAnnotationMetadataStore.java b/...l/DefaultTypeAnnotationMetadataStore.java → ...l/DefaultTypeAnnotationMetadataStore.java
diff --git a/...eflect/annotations/impl/package-info.java → ...eflect/annotations/impl/package-info.java b/...eflect/annotations/impl/package-info.java → ...eflect/annotations/impl/package-info.java
diff --git a/...nal/reflect/annotations/package-info.java → ...nal/reflect/annotations/package-info.java b/...nal/reflect/annotations/package-info.java → ...nal/reflect/annotations/package-info.java
diff --git a/...l/reflect/validation/DefaultPluginId.java → ...l/reflect/validation/DefaultPluginId.java b/...l/reflect/validation/DefaultPluginId.java → ...l/reflect/validation/DefaultPluginId.java
diff --git a/...ation/DefaultTypeAwareProblemBuilder.java → ...ation/DefaultTypeAwareProblemBuilder.java b/...ation/DefaultTypeAwareProblemBuilder.java → ...ation/DefaultTypeAwareProblemBuilder.java
diff --git a/.../validation/DelegatingProblemBuilder.java → .../validation/DelegatingProblemBuilder.java b/.../validation/DelegatingProblemBuilder.java → .../validation/DelegatingProblemBuilder.java
diff --git a/...ation/ReplayingTypeValidationContext.java → ...ation/ReplayingTypeValidationContext.java b/...ation/ReplayingTypeValidationContext.java → ...ation/ReplayingTypeValidationContext.java
diff --git a/...t/validation/TypeAwareProblemBuilder.java → ...t/validation/TypeAwareProblemBuilder.java b/...t/validation/TypeAwareProblemBuilder.java → ...t/validation/TypeAwareProblemBuilder.java
diff --git a/...ect/validation/TypeValidationContext.java → ...ect/validation/TypeValidationContext.java b/...ect/validation/TypeValidationContext.java → ...ect/validation/TypeValidationContext.java
diff --git a/...dation/TypeValidationProblemRenderer.java → ...dation/TypeValidationProblemRenderer.java b/...dation/TypeValidationProblemRenderer.java → ...dation/TypeValidationProblemRenderer.java
diff --git a/...nternal/reflect/ClassInspectorTest.groovy → ...nternal/reflect/ClassInspectorTest.groovy b/...nternal/reflect/ClassInspectorTest.groovy → ...nternal/reflect/ClassInspectorTest.groovy
diff --git a/...ect/JavaPropertyReflectionUtilTest.groovy → ...ect/JavaPropertyReflectionUtilTest.groovy b/...ect/JavaPropertyReflectionUtilTest.groovy → ...ect/JavaPropertyReflectionUtilTest.groovy
diff --git a/...avaPropertyReflectionUtilTestMethods.java → ...avaPropertyReflectionUtilTestMethods.java b/...avaPropertyReflectionUtilTestMethods.java → ...avaPropertyReflectionUtilTestMethods.java
diff --git a/...dle/internal/reflect/JavaTestSubject.java → ...dle/internal/reflect/JavaTestSubject.java b/...dle/internal/reflect/JavaTestSubject.java → ...dle/internal/reflect/JavaTestSubject.java
diff --git a/...rnal/reflect/JavaTestSubjectSubclass.java → ...rnal/reflect/JavaTestSubjectSubclass.java b/...rnal/reflect/JavaTestSubjectSubclass.java → ...rnal/reflect/JavaTestSubjectSubclass.java
diff --git a/...rnal/reflect/MethodDescriptionTest.groovy → ...rnal/reflect/MethodDescriptionTest.groovy b/...rnal/reflect/MethodDescriptionTest.groovy → ...rnal/reflect/MethodDescriptionTest.groovy
diff --git a/...radle/internal/reflect/MethodsTest.groovy → ...radle/internal/reflect/MethodsTest.groovy b/...radle/internal/reflect/MethodsTest.groovy → ...radle/internal/reflect/MethodsTest.groovy
diff --git a/...l/reflect/PropertyAccessorTypeTest.groovy → ...l/reflect/PropertyAccessorTypeTest.groovy b/...l/reflect/PropertyAccessorTypeTest.groovy → ...l/reflect/PropertyAccessorTypeTest.groovy
diff --git a/.../gradle/internal/reflect/TypesTest.groovy → .../gradle/internal/reflect/TypesTest.groovy b/.../gradle/internal/reflect/TypesTest.groovy → .../gradle/internal/reflect/TypesTest.groovy
diff --git a/...ultTypeAnnotationMetadataStoreTest.groovy → ...ultTypeAnnotationMetadataStoreTest.groovy b/...ultTypeAnnotationMetadataStoreTest.groovy → ...ultTypeAnnotationMetadataStoreTest.groovy
diff --git a/...DefaultTypeAwareProblemBuilderTest.groovy → ...DefaultTypeAwareProblemBuilderTest.groovy b/...DefaultTypeAwareProblemBuilderTest.groovy → ...DefaultTypeAwareProblemBuilderTest.groovy
diff --git a/...ation/ValidationMessageCheckerTest.groovy → ...ation/ValidationMessageCheckerTest.groovy b/...ation/ValidationMessageCheckerTest.groovy → ...ation/ValidationMessageCheckerTest.groovy
diff --git a/...ions/TestAnnotationHandlingSupport.groovy → ...ions/TestAnnotationHandlingSupport.groovy b/...ions/TestAnnotationHandlingSupport.groovy → ...ions/TestAnnotationHandlingSupport.groovy
diff --git a/...alidation/ValidationMessageChecker.groovy → ...alidation/ValidationMessageChecker.groovy b/...alidation/ValidationMessageChecker.groovy → ...alidation/ValidationMessageChecker.groovy
diff --git a/...idationMessageDisplayConfiguration.groovy → ...idationMessageDisplayConfiguration.groovy b/...idationMessageDisplayConfiguration.groovy → ...idationMessageDisplayConfiguration.groovy
diff --git a/platforms/core-execution/execution/build.gradle.kts b/platforms/core-execution/execution/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
     api(projects.functional)
     api(projects.hashing)
     api(projects.modelCore)
+    api(projects.modelReflect)
     api(projects.persistentCache)
     api(projects.problemsApi)
     api(projects.snapshots)
@@ -50,6 +51,7 @@ dependencies {
     testImplementation(testFixtures(projects.snapshots))
     testImplementation(testFixtures(projects.core))
     testImplementation(testFixtures(projects.modelCore))
+    testImplementation(testFixtures(projects.modelReflect))
 
     testFixturesImplementation(libs.guava)
     testFixturesImplementation(projects.baseServices)

diff --git a/platforms/extensibility/plugin-development/build.gradle.kts b/platforms/extensibility/plugin-development/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     api(projects.files)
     api(projects.stdlibJavaExtensions)
     api(projects.logging)
-    api(projects.modelCore)
+    api(projects.modelReflect)
     api(projects.platformJvm)
     api(projects.problemsApi)
     api(projects.resources)
@@ -43,6 +43,7 @@ dependencies {
     implementation(projects.loggingApi)
     implementation(projects.maven)
     implementation(projects.messaging)
+    implementation(projects.modelCore)
     implementation(projects.modelGroovy)
     implementation(projects.pluginsGroovy)
     implementation(projects.pluginsJava)
@@ -66,6 +67,7 @@ dependencies {
     integTestImplementation(projects.baseServicesGroovy)
 
     integTestImplementation(testFixtures(projects.modelCore))
+    integTestImplementation(testFixtures(projects.modelReflect))
     integTestImplementation(testFixtures(projects.toolingApi))
 
     integTestImplementation(libs.groovyTest)

diff --git a/platforms/extensibility/plugin-use/build.gradle.kts b/platforms/extensibility/plugin-use/build.gradle.kts
@@ -13,6 +13,7 @@ dependencies {
     api(projects.logging)
     api(projects.messaging)
     api(projects.modelCore)
+    api(projects.modelReflect)
     api(projects.problemsApi)
 
     api(libs.guava)

diff --git a/platforms/jvm/language-groovy/build.gradle.kts b/platforms/jvm/language-groovy/build.gradle.kts
@@ -48,9 +48,11 @@ dependencies {
     testFixturesImplementation(projects.baseServices)
     testFixturesImplementation(projects.internalIntegTesting)
     testFixturesImplementation(testFixtures(projects.modelCore))
+    testFixturesImplementation(testFixtures(projects.modelReflect))
     testFixturesImplementation(libs.guava)
 
     integTestImplementation(testFixtures(projects.modelCore))
+    integTestImplementation(testFixtures(projects.modelReflect))
     integTestImplementation(libs.commonsLang)
     integTestImplementation(libs.javaParser) {
         because("The Groovy docs inspects the dependencies at compile time")

diff --git a/platforms/jvm/language-jvm/build.gradle.kts b/platforms/jvm/language-jvm/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
 
     implementation(projects.dependencyManagement)
     implementation(projects.logging)
-    implementation(projects.modelCore)
+    implementation(projects.modelReflect)
     implementation(projects.testSuitesBase)
 
     implementation(libs.guava)
@@ -39,6 +39,7 @@ dependencies {
     testImplementation(testFixtures(projects.core))
 
     integTestImplementation(testFixtures(projects.modelCore))
+    integTestImplementation(testFixtures(projects.modelReflect))
     integTestImplementation(testFixtures(projects.resourcesHttp))
 
     testFixturesImplementation(libs.commonsLang)

diff --git a/platforms/jvm/testing-jvm/build.gradle.kts b/platforms/jvm/testing-jvm/build.gradle.kts
@@ -51,6 +51,7 @@ dependencies {
 
     testImplementation(testFixtures(projects.core))
     testImplementation(testFixtures(projects.modelCore))
+    testImplementation(testFixtures(projects.modelReflect))
     testImplementation(testFixtures(projects.time))
 
     integTestImplementation(testFixtures(projects.testingBase))

diff --git a/platforms/software/dependency-management/build.gradle.kts b/platforms/software/dependency-management/build.gradle.kts
@@ -58,6 +58,7 @@ dependencies {
     api(projects.logging)
     api(projects.messaging)
     api(projects.modelCore)
+    api(projects.modelReflect)
     api(projects.persistentCache)
     api(projects.problemsApi)
     api(projects.resources)
@@ -126,6 +127,7 @@ dependencies {
     integTestImplementation(testFixtures(projects.core))
     integTestImplementation(testFixtures(projects.signing))
     integTestImplementation(testFixtures(projects.modelCore))
+    integTestImplementation(testFixtures(projects.modelReflect))
 
     testFixturesApi(projects.baseServices) {
         because("Test fixtures export the Action class")

diff --git a/platforms/software/platform-base/build.gradle.kts b/platforms/software/platform-base/build.gradle.kts
@@ -25,6 +25,7 @@ dependencies {
 
     implementation(projects.dependencyManagement)
     implementation(projects.execution)
+    implementation(projects.modelReflect)
 
     implementation(libs.commonsLang)
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -158,6 +158,7 @@ val core = platform("core") {
         subproject("stdlib-kotlin-extensions")
         subproject("stdlib-serialization-codecs")
         subproject("model-core")
+        subproject("model-reflect")
         subproject("model-groovy")
     }
 

diff --git a/subprojects/core/build.gradle.kts b/subprojects/core/build.gradle.kts
@@ -105,6 +105,7 @@ dependencies {
     api(projects.loggingApi)
     api(projects.messaging)
     api(projects.modelCore)
+    api(projects.modelReflect)
     api(projects.native)
     api(projects.normalizationJava)
     api(projects.persistentCache)
@@ -266,6 +267,7 @@ dependencies {
     testImplementation(testFixtures(projects.coreApi))
     testImplementation(testFixtures(projects.messaging))
     testImplementation(testFixtures(projects.modelCore))
+    testImplementation(testFixtures(projects.modelReflect))
     testImplementation(testFixtures(projects.logging))
     testImplementation(testFixtures(projects.baseServices))
     testImplementation(testFixtures(projects.baseDiagnostics))

diff --git a/...tributions-integ-tests/src/integTest/groovy/org/gradle/DistributionIntegrationSpec.groovy b/...tributions-integ-tests/src/integTest/groovy/org/gradle/DistributionIntegrationSpec.groovy
@@ -102,6 +102,7 @@ abstract class DistributionIntegrationSpec extends AbstractIntegrationSpec {
         "messaging",
         "model-core",
         "model-groovy",
+        "model-reflect",
         "native",
         "normalization-java",
         "persistent-cache",

diff --git a/testing/integ-test/build.gradle.kts b/testing/integ-test/build.gradle.kts
@@ -28,6 +28,7 @@ dependencies {
         exclude(group = "org.codehaus.groovy", module = "groovy-all")
     }
     integTestImplementation(testFixtures(projects.modelCore))
+    integTestImplementation(testFixtures(projects.modelReflect))
 
     crossVersionTestImplementation(projects.baseServices)
     crossVersionTestImplementation(projects.core)

diff --git a/testing/internal-integ-testing/build.gradle.kts b/testing/internal-integ-testing/build.gradle.kts
@@ -97,6 +97,7 @@ dependencies {
     implementation(projects.io)
     implementation(projects.messaging)
     implementation(projects.modelCore)
+    implementation(projects.modelReflect)
     implementation(projects.serviceProvider)
     implementation(projects.serviceRegistryBuilder)
     implementation(projects.time)

diff --git a/testing/smoke-test/build.gradle.kts b/testing/smoke-test/build.gradle.kts
@@ -42,6 +42,7 @@ dependencies {
     smokeTestImplementation(testFixtures(projects.pluginDevelopment))
     smokeTestImplementation(testFixtures(projects.versionControl))
     smokeTestImplementation(testFixtures(projects.modelCore))
+    smokeTestImplementation(testFixtures(projects.modelReflect))
 
     smokeTestDistributionRuntimeOnly(projects.distributionsFull)
 }