Extract PluginAuthorServices from plugins project

platforms/jvm/language-jvm/src/main/java/org/gradle/language/jvm/internal/JvmPluginServiceRegistry.java

@@ -18,6 +18,10 @@
 
 import org.gradle.api.internal.component.ArtifactType;
 import org.gradle.api.internal.component.ComponentTypeRegistry;
+import org.gradle.api.internal.tasks.DefaultSourceSetContainer;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.plugins.jvm.internal.DefaultJvmPluginServices;
+import org.gradle.api.tasks.SourceSetContainer;
 import org.gradle.internal.service.ServiceRegistration;
 import org.gradle.internal.service.scopes.AbstractPluginServiceRegistry;
 import org.gradle.jvm.JvmLibrary;
@@ -30,6 +34,18 @@ public void registerBuildServices(ServiceRegistration registration) {
         registration.addProvider(new ComponentRegistrationAction());
     }
 
+    @Override
+    public void registerProjectServices(ServiceRegistration registration) {
+        registration.addProvider(new ProjectScopeServices());
+        registration.add(DefaultJvmPluginServices.class);
+    }
+
+    private static class ProjectScopeServices {
+        SourceSetContainer createSourceSetContainer(ObjectFactory objectFactory) {
+            return objectFactory.newInstance(DefaultSourceSetContainer.class);
+        }
+    }
+
     private static class ComponentRegistrationAction {
         /**
          * @param registration unused parameter required by convention, see {@link org.gradle.internal.service.DefaultServiceRegistry}.

platforms/jvm/plugins-java-base/src/main/java/org/gradle/api/plugins/internal/JvmLanguageUtilsServiceRegistry.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024 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.
+ */
+
+package org.gradle.api.plugins.internal;
+
+import org.gradle.api.plugins.jvm.internal.DefaultJvmLanguageUtilities;
+import org.gradle.internal.service.ServiceRegistration;
+import org.gradle.internal.service.scopes.AbstractPluginServiceRegistry;
+
+/**
+ * Registers services containing utilities used by projects that compile JVM language source.
+ */
+public class JvmLanguageUtilsServiceRegistry extends AbstractPluginServiceRegistry {
+    @Override
+    public void registerProjectServices(ServiceRegistration registration) {
+        registration.add(DefaultJvmLanguageUtilities.class);
+    }
+}

platforms/jvm/plugins-java-base/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry

@@ -0,0 +1 @@
+org.gradle.api.plugins.internal.JvmLanguageUtilsServiceRegistry

platforms/software/publish/src/main/java/org/gradle/api/publish/internal/service/PublishServices.java

@@ -16,7 +16,10 @@
 
 package org.gradle.api.publish.internal.service;
 
+import org.gradle.api.component.SoftwareComponentFactory;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.DefaultProjectDependencyPublicationResolver;
+import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.publish.internal.component.DefaultSoftwareComponentFactory;
 import org.gradle.api.publish.internal.mapping.DefaultDependencyCoordinateResolverFactory;
 import org.gradle.api.publish.internal.validation.DuplicatePublicationTracker;
 import org.gradle.internal.service.ServiceRegistration;
@@ -29,4 +32,16 @@ public void registerBuildServices(ServiceRegistration registration) {
         registration.add(DuplicatePublicationTracker.class);
         registration.add(DefaultDependencyCoordinateResolverFactory.class);
     }
+
+    @Override
+    public void registerGlobalServices(ServiceRegistration registration) {
+        registration.addProvider(new GlobalScopeServices());
+    }
+
+    private static class GlobalScopeServices {
+        @SuppressWarnings("unused") // Used by reflection
+        SoftwareComponentFactory createSoftwareComponentFactory(ObjectFactory objectFactory) {
+            return new DefaultSoftwareComponentFactory(objectFactory);
+        }
+    }
 }

subprojects/plugins/build.gradle.kts

@@ -9,17 +9,16 @@ errorprone {
 }
 
 dependencies {
-    api(project(":base-services"))
     api(project(":core"))
 
+    implementation(project(":base-services"))
     implementation(project(":core-api"))
     implementation(project(":logging"))
     implementation(project(":model-core"))
     implementation(project(":platform-jvm"))
     implementation(project(":plugins-groovy"))
     implementation(project(":plugins-java-base"))
     implementation(project(":plugins-java-library"))
-    implementation(project(":publish"))
 
     integTestImplementation(testFixtures(project(":enterprise-operations")))
     integTestImplementation(testFixtures(project(":language-java")))

testing/architecture-test/src/changes/archunit_store/internal-api-nullability.txt

@@ -1010,10 +1010,8 @@ Class <org.gradle.api.plugins.internal.HelpTasksAutoApplyAction> is not annotate
 Class <org.gradle.api.plugins.internal.JavaConfigurationVariantMapping$UnpublishableArtifactTypeSpec> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JavaConfigurationVariantMapping.java:0)
 Class <org.gradle.api.plugins.internal.JavaConfigurationVariantMapping> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JavaConfigurationVariantMapping.java:0)
 Class <org.gradle.api.plugins.internal.JavaPluginHelper> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JavaPluginHelper.java:0)
+Class <org.gradle.api.plugins.internal.JvmLanguageUtilsServiceRegistry> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JvmLanguageUtilsServiceRegistry.java:0)
 Class <org.gradle.api.plugins.internal.JvmPluginsHelper> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JvmPluginsHelper.java:0)
-Class <org.gradle.api.plugins.internal.PluginAuthorServices$GlobalScopeServices> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (PluginAuthorServices.java:0)
-Class <org.gradle.api.plugins.internal.PluginAuthorServices$ProjectScopeServices> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (PluginAuthorServices.java:0)
-Class <org.gradle.api.plugins.internal.PluginAuthorServices> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (PluginAuthorServices.java:0)
 Class <org.gradle.api.publish.internal.CompositePublicationArtifactSet> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (CompositePublicationArtifactSet.java:0)
 Class <org.gradle.api.publish.internal.DefaultPublicationArtifactSet$1> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (DefaultPublicationArtifactSet.java:0)
 Class <org.gradle.api.publish.internal.DefaultPublicationArtifactSet> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (DefaultPublicationArtifactSet.java:0)
@@ -1050,6 +1048,7 @@ Class <org.gradle.api.publish.internal.metadata.ModuleMetadataSpec$Variant> is n
 Class <org.gradle.api.publish.internal.metadata.ModuleMetadataSpec$Version> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ModuleMetadataSpec.java:0)
 Class <org.gradle.api.publish.internal.metadata.ModuleMetadataSpec> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ModuleMetadataSpec.java:0)
 Class <org.gradle.api.publish.internal.metadata.ModuleMetadataSpecBuilder> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (ModuleMetadataSpecBuilder.java:0)
+Class <org.gradle.api.publish.internal.service.PublishServices$GlobalScopeServices> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (PublishServices.java:0)
 Class <org.gradle.api.publish.internal.service.PublishServices> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (PublishServices.java:0)
 Class <org.gradle.api.publish.internal.validation.DuplicatePublicationTracker> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (DuplicatePublicationTracker.java:0)
 Class <org.gradle.api.publish.internal.validation.PublicationErrorChecker> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (PublicationErrorChecker.java:0)
@@ -2912,6 +2911,7 @@ Class <org.gradle.language.internal.DefaultNativeBinary> is not annotated (direc
 Class <org.gradle.language.internal.DefaultNativeComponentFactory> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (DefaultNativeComponentFactory.java:0)
 Class <org.gradle.language.internal.NativeComponentFactory> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (NativeComponentFactory.java:0)
 Class <org.gradle.language.jvm.internal.JvmPluginServiceRegistry$ComponentRegistrationAction> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JvmPluginServiceRegistry.java:0)
+Class <org.gradle.language.jvm.internal.JvmPluginServiceRegistry$ProjectScopeServices> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JvmPluginServiceRegistry.java:0)
 Class <org.gradle.language.jvm.internal.JvmPluginServiceRegistry> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (JvmPluginServiceRegistry.java:0)
 Class <org.gradle.language.nativeplatform.internal.AbstractHeaderExportingDependentSourceSet> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (AbstractHeaderExportingDependentSourceSet.java:0)
 Class <org.gradle.language.nativeplatform.internal.AbstractHeaderExportingSourceSet> is not annotated (directly or via its package) with @org.gradle.api.NonNullApi in (AbstractHeaderExportingSourceSet.java:0)