Merge branch 'refs/heads/main' into feat/update-dependency-resolution

# Conflicts: # src/main/kotlin/DevPublishPlugin.kt # src/main/kotlin/data/DevPubConfigurationsContainer.kt # src/main/kotlin/data/PublicationData.kt # src/main/kotlin/tasks/GeneratePublicationDataChecksumTask.kt # src/main/kotlin/utils/debugUtils.kt
adamko-dev · Jul 13, 2024 · d9703d6 · d9703d6
2 parents 2832b15 + 16c2b4a
commit d9703d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/api/dev-publish-plugin.api b/api/dev-publish-plugin.api
@@ -7,7 +7,6 @@ public final class dev/adamko/gradle/dev_publish/DevPublishPlugin : org/gradle/a
 	public static final field DEV_PUB__PUBLICATION_DEPENDENCIES Ljava/lang/String;
 	public static final field DEV_PUB__PUBLICATION_INCOMING Ljava/lang/String;
 	public static final field DEV_PUB__PUBLICATION_OUTGOING Ljava/lang/String;
-	public fun <init> (Lorg/gradle/api/provider/ProviderFactory;Lorg/gradle/api/file/ProjectLayout;Lorg/gradle/api/file/FileSystemOperations;Lorg/gradle/api/model/ObjectFactory;)V
 	public synthetic fun apply (Ljava/lang/Object;)V
 	public fun apply (Lorg/gradle/api/Project;)V
 }
@@ -21,7 +20,6 @@ public final class dev/adamko/gradle/dev_publish/DevPublishPlugin$configureMaven
 }
 
 public abstract class dev/adamko/gradle/dev_publish/DevPublishPluginExtension {
-	public fun <init> ()V
 	public abstract fun getDevMavenRepo ()Lorg/gradle/api/file/DirectoryProperty;
 }
 

diff --git a/src/main/kotlin/DevPublishPlugin.kt b/src/main/kotlin/DevPublishPlugin.kt
@@ -4,6 +4,7 @@ import dev.adamko.gradle.dev_publish.data.CreatePublicationChecksum.Companion.cr
 import dev.adamko.gradle.dev_publish.data.DevPubAttributes
 import dev.adamko.gradle.dev_publish.data.DevPubConfigurationsContainer
 import dev.adamko.gradle.dev_publish.data.LoadPublicationChecksum.Companion.loadPublicationChecksum
+import dev.adamko.gradle.dev_publish.internal.DevPublishInternalApi
 import dev.adamko.gradle.dev_publish.services.DevPublishService
 import dev.adamko.gradle.dev_publish.services.DevPublishService.Companion.SERVICE_NAME
 import dev.adamko.gradle.dev_publish.tasks.DevPublishTasksContainer
@@ -36,7 +37,10 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin.CHECK_TASK_NAME
  *
  * This is useful for testing, as Maven metadata and Plugin Marker artifact gets published correctly.
  */
-class DevPublishPlugin @Inject constructor(
+class DevPublishPlugin
+@Inject
+@DevPublishInternalApi
+constructor(
   private val providers: ProviderFactory,
   private val layout: ProjectLayout,
   private val fs: FileSystemOperations,

diff --git a/src/main/kotlin/DevPublishPluginExtension.kt b/src/main/kotlin/DevPublishPluginExtension.kt
@@ -6,7 +6,8 @@ import org.gradle.api.file.DirectoryProperty
 /**
  * Settings for controlling the behaviour of [DevPublishPlugin] and its tasks.
  */
-abstract class DevPublishPluginExtension {
+abstract class DevPublishPluginExtension
+@DevPublishInternalApi constructor() {
 
   /**
    * Location of the file-based test Maven repository.