From 3a64efe2b8ee509ce4e352af9246db34c1e3a5eb Mon Sep 17 00:00:00 2001 From: "Rodrigo B. de Oliveira" Date: Fri, 7 Feb 2025 18:18:13 -0300 Subject: [PATCH] Extract `model-reflect` from `model-core` --- .teamcity/subprojects.json | 7 +++ .../build.gradle.kts | 1 + .../configuration-cache/build.gradle.kts | 1 + .../build.gradle.kts | 1 + .../file-collections/build.gradle.kts | 1 + .../flow-services/build.gradle.kts | 1 + .../model-core/build.gradle.kts | 7 ++- .../model-reflect/build.gradle.kts | 56 +++++++++++++++++++ .../gradle/internal/reflect/ClassDetails.java | 0 .../internal/reflect/ClassInspector.java | 0 .../reflect/DefaultTypeValidationContext.java | 0 .../internal/reflect/GroovyMethods.java | 0 .../reflect/JavaPropertyReflectionUtil.java | 0 .../internal/reflect/MethodDescription.java | 0 .../gradle/internal/reflect/MethodSet.java | 0 .../org/gradle/internal/reflect/Methods.java | 0 .../internal/reflect/MutableClassDetails.java | 0 .../reflect/MutablePropertyDetails.java | 0 .../reflect/NoSuchPropertyException.java | 0 ...ProblemRecordingTypeValidationContext.java | 0 .../internal/reflect/PropertyAccessor.java | 0 .../reflect/PropertyAccessorType.java | 0 .../internal/reflect/PropertyDetails.java | 0 .../internal/reflect/PropertyMutator.java | 0 .../org/gradle/internal/reflect/Types.java | 0 .../UnsupportedPropertyValueException.java | 0 .../annotations/AnnotationCategory.java | 0 .../FunctionAnnotationMetadata.java | 0 .../annotations/HasAnnotationMetadata.java | 0 .../PropertyAnnotationMetadata.java | 0 .../annotations/TypeAnnotationMetadata.java | 0 .../TypeAnnotationMetadataStore.java | 0 .../impl/AbstractHasAnnotationMetadata.java | 0 .../DefaultFunctionAnnotationMetadata.java | 0 .../DefaultPropertyAnnotationMetadata.java | 0 .../impl/DefaultTypeAnnotationMetadata.java | 0 .../DefaultTypeAnnotationMetadataStore.java | 0 .../annotations/impl/package-info.java | 0 .../reflect/annotations/package-info.java | 0 .../reflect/validation/DefaultPluginId.java | 0 .../DefaultTypeAwareProblemBuilder.java | 0 .../validation/DelegatingProblemBuilder.java | 0 .../ReplayingTypeValidationContext.java | 0 .../validation/TypeAwareProblemBuilder.java | 0 .../validation/TypeValidationContext.java | 0 .../TypeValidationProblemRenderer.java | 0 .../reflect/ClassInspectorTest.groovy | 0 .../JavaPropertyReflectionUtilTest.groovy | 0 ...JavaPropertyReflectionUtilTestMethods.java | 0 .../internal/reflect/JavaTestSubject.java | 0 .../reflect/JavaTestSubjectSubclass.java | 0 .../reflect/MethodDescriptionTest.groovy | 0 .../internal/reflect/MethodsTest.groovy | 0 .../reflect/PropertyAccessorTypeTest.groovy | 0 .../gradle/internal/reflect/TypesTest.groovy | 0 ...aultTypeAnnotationMetadataStoreTest.groovy | 0 .../DefaultTypeAwareProblemBuilderTest.groovy | 0 .../ValidationMessageCheckerTest.groovy | 0 .../TestAnnotationHandlingSupport.groovy | 0 .../ValidationMessageChecker.groovy | 0 ...lidationMessageDisplayConfiguration.groovy | 0 .../core-execution/execution/build.gradle.kts | 2 + .../plugin-development/build.gradle.kts | 4 +- .../extensibility/plugin-use/build.gradle.kts | 1 + .../jvm/language-groovy/build.gradle.kts | 2 + platforms/jvm/language-jvm/build.gradle.kts | 3 +- platforms/jvm/testing-jvm/build.gradle.kts | 1 + .../dependency-management/build.gradle.kts | 2 + .../software/platform-base/build.gradle.kts | 1 + settings.gradle.kts | 1 + subprojects/core/build.gradle.kts | 2 + .../gradle/DistributionIntegrationSpec.groovy | 1 + testing/integ-test/build.gradle.kts | 1 + .../internal-integ-testing/build.gradle.kts | 1 + testing/smoke-test/build.gradle.kts | 1 + 75 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 platforms/core-configuration/model-reflect/build.gradle.kts rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/ClassDetails.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/ClassInspector.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/GroovyMethods.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/JavaPropertyReflectionUtil.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/MethodDescription.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/MethodSet.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/Methods.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/MutableClassDetails.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/MutablePropertyDetails.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/NoSuchPropertyException.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/ProblemRecordingTypeValidationContext.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/PropertyAccessor.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/PropertyAccessorType.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/PropertyDetails.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/PropertyMutator.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/Types.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/UnsupportedPropertyValueException.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/AnnotationCategory.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/FunctionAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/HasAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/PropertyAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadataStore.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/impl/AbstractHasAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultFunctionAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultPropertyAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadata.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStore.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/impl/package-info.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/annotations/package-info.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/DefaultPluginId.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilder.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/DelegatingProblemBuilder.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/ReplayingTypeValidationContext.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/TypeAwareProblemBuilder.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/TypeValidationContext.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/main/java/org/gradle/internal/reflect/validation/TypeValidationProblemRenderer.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/ClassInspectorTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTestMethods.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/JavaTestSubject.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/JavaTestSubjectSubclass.java (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/MethodDescriptionTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/MethodsTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/PropertyAccessorTypeTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/TypesTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilderTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/test/groovy/org/gradle/internal/reflect/validation/ValidationMessageCheckerTest.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/testFixtures/groovy/org/gradle/internal/reflect/annotations/TestAnnotationHandlingSupport.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageChecker.groovy (100%) rename platforms/core-configuration/{model-core => model-reflect}/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageDisplayConfiguration.groovy (100%) diff --git a/.teamcity/subprojects.json b/.teamcity/subprojects.json index 77d767a54d48b..a763ef32971f4 100644 --- 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 index 481353f1ce07c..21245899799ae 100644 --- 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 index 4705b6596a879..979ee807e4d96 100644 --- 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 index 8433845778178..af2808b040073 100644 --- 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 index 2816a7bac6302..f5ae59a534179 100644 --- 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 index d0ce0352f6332..0e2b7bc76ff92 100644 --- 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 index 701648f964c00..97c753ec0b477 100644 --- 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 new file mode 100644 index 0000000000000..b567f4dd7582a --- /dev/null +++ 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/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/ClassDetails.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/ClassDetails.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/ClassDetails.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/ClassDetails.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/ClassInspector.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/ClassInspector.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/ClassInspector.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/ClassInspector.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/GroovyMethods.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/GroovyMethods.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/GroovyMethods.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/GroovyMethods.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/JavaPropertyReflectionUtil.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/JavaPropertyReflectionUtil.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/JavaPropertyReflectionUtil.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/JavaPropertyReflectionUtil.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MethodDescription.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MethodDescription.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MethodDescription.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MethodDescription.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MethodSet.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MethodSet.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MethodSet.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MethodSet.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/Methods.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/Methods.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/Methods.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/Methods.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MutableClassDetails.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MutableClassDetails.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MutableClassDetails.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MutableClassDetails.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MutablePropertyDetails.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MutablePropertyDetails.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/MutablePropertyDetails.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/MutablePropertyDetails.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/NoSuchPropertyException.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/NoSuchPropertyException.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/NoSuchPropertyException.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/NoSuchPropertyException.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/ProblemRecordingTypeValidationContext.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/ProblemRecordingTypeValidationContext.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/ProblemRecordingTypeValidationContext.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/ProblemRecordingTypeValidationContext.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyAccessor.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyAccessor.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyAccessor.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyAccessor.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyAccessorType.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyAccessorType.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyAccessorType.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyAccessorType.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyDetails.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyDetails.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyDetails.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyDetails.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyMutator.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyMutator.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/PropertyMutator.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/PropertyMutator.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/Types.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/Types.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/Types.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/Types.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/UnsupportedPropertyValueException.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/UnsupportedPropertyValueException.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/UnsupportedPropertyValueException.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/UnsupportedPropertyValueException.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/AnnotationCategory.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/AnnotationCategory.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/AnnotationCategory.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/AnnotationCategory.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/FunctionAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/FunctionAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/FunctionAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/FunctionAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/HasAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/HasAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/HasAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/HasAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/PropertyAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/PropertyAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/PropertyAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/PropertyAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadataStore.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadataStore.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadataStore.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/TypeAnnotationMetadataStore.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/AbstractHasAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/AbstractHasAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/AbstractHasAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/AbstractHasAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultFunctionAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultFunctionAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultFunctionAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultFunctionAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultPropertyAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultPropertyAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultPropertyAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultPropertyAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadata.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadata.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadata.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadata.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStore.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStore.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStore.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStore.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/package-info.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/package-info.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/impl/package-info.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/impl/package-info.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/package-info.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/package-info.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/annotations/package-info.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/annotations/package-info.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/DefaultPluginId.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/DefaultPluginId.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/DefaultPluginId.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/DefaultPluginId.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilder.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilder.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilder.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilder.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/DelegatingProblemBuilder.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/DelegatingProblemBuilder.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/DelegatingProblemBuilder.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/DelegatingProblemBuilder.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/ReplayingTypeValidationContext.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/ReplayingTypeValidationContext.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/ReplayingTypeValidationContext.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/ReplayingTypeValidationContext.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/TypeAwareProblemBuilder.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/TypeAwareProblemBuilder.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/TypeAwareProblemBuilder.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/TypeAwareProblemBuilder.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/TypeValidationContext.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/TypeValidationContext.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/TypeValidationContext.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/TypeValidationContext.java diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/TypeValidationProblemRenderer.java b/platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/TypeValidationProblemRenderer.java similarity index 100% rename from platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/validation/TypeValidationProblemRenderer.java rename to platforms/core-configuration/model-reflect/src/main/java/org/gradle/internal/reflect/validation/TypeValidationProblemRenderer.java diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/ClassInspectorTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/ClassInspectorTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/ClassInspectorTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/ClassInspectorTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTestMethods.java b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTestMethods.java similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTestMethods.java rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaPropertyReflectionUtilTestMethods.java diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaTestSubject.java b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaTestSubject.java similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaTestSubject.java rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaTestSubject.java diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaTestSubjectSubclass.java b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaTestSubjectSubclass.java similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/JavaTestSubjectSubclass.java rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/JavaTestSubjectSubclass.java diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/MethodDescriptionTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/MethodDescriptionTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/MethodDescriptionTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/MethodDescriptionTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/MethodsTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/MethodsTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/MethodsTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/MethodsTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/PropertyAccessorTypeTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/PropertyAccessorTypeTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/PropertyAccessorTypeTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/PropertyAccessorTypeTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/TypesTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/TypesTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/TypesTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/TypesTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilderTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilderTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilderTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/validation/DefaultTypeAwareProblemBuilderTest.groovy diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/validation/ValidationMessageCheckerTest.groovy b/platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/validation/ValidationMessageCheckerTest.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/validation/ValidationMessageCheckerTest.groovy rename to platforms/core-configuration/model-reflect/src/test/groovy/org/gradle/internal/reflect/validation/ValidationMessageCheckerTest.groovy diff --git a/platforms/core-configuration/model-core/src/testFixtures/groovy/org/gradle/internal/reflect/annotations/TestAnnotationHandlingSupport.groovy b/platforms/core-configuration/model-reflect/src/testFixtures/groovy/org/gradle/internal/reflect/annotations/TestAnnotationHandlingSupport.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/testFixtures/groovy/org/gradle/internal/reflect/annotations/TestAnnotationHandlingSupport.groovy rename to platforms/core-configuration/model-reflect/src/testFixtures/groovy/org/gradle/internal/reflect/annotations/TestAnnotationHandlingSupport.groovy diff --git a/platforms/core-configuration/model-core/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageChecker.groovy b/platforms/core-configuration/model-reflect/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageChecker.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageChecker.groovy rename to platforms/core-configuration/model-reflect/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageChecker.groovy diff --git a/platforms/core-configuration/model-core/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageDisplayConfiguration.groovy b/platforms/core-configuration/model-reflect/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageDisplayConfiguration.groovy similarity index 100% rename from platforms/core-configuration/model-core/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageDisplayConfiguration.groovy rename to platforms/core-configuration/model-reflect/src/testFixtures/groovy/org/gradle/internal/reflect/validation/ValidationMessageDisplayConfiguration.groovy diff --git a/platforms/core-execution/execution/build.gradle.kts b/platforms/core-execution/execution/build.gradle.kts index f75a917264185..ceeca8201cf09 100644 --- 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 index 696e89ae0447e..82f052300d630 100644 --- 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 index 6458cea04a2ff..92b62a4939c19 100644 --- 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 index e980ba586a2fd..0f550d89c943e 100644 --- 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 index f611b08ac83f6..f15b7556b101d 100644 --- 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 index 0bd1d6baa163d..fbfcebacbb9ff 100644 --- 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 index 99635e455382f..14b99932def5e 100644 --- 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 index 8c809ba85fdb1..494a0e2d215f9 100644 --- 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 index d0999b0ddfe42..05b0527c1f33c 100644 --- 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 index 7f473521b5596..95a7d8cc6b733 100644 --- 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/testing/distributions-integ-tests/src/integTest/groovy/org/gradle/DistributionIntegrationSpec.groovy b/testing/distributions-integ-tests/src/integTest/groovy/org/gradle/DistributionIntegrationSpec.groovy index 2ce7019bffab1..6c1adaef823cc 100644 --- a/testing/distributions-integ-tests/src/integTest/groovy/org/gradle/DistributionIntegrationSpec.groovy +++ b/testing/distributions-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 index d6cfe571b2ff3..e4f1b6a3cd792 100644 --- 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 index a146f327b5917..e49e1abe5ca03 100644 --- 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 index cf231c789dd4e..d9f90126f3734 100644 --- 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) }