Change PluginId visibility to public and Semver implementation

JavierSegoviaCordoba · Aug 16, 2024 · 263aed8 · 263aed8
1 parent 9284d41
commit 263aed8
Show file tree

Hide file tree

Showing 36 changed files with 61 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@
 
 ### Changed
 
+- `PluginId` visibility to `public`
+- `Semver` implementation to use `pluginManager::withPlugin`
+
 ### Deprecated
 
 ### Fixed

diff --git a/...gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/HubdleState.kt b/...gradle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/HubdleState.kt
@@ -9,6 +9,7 @@ import com.javiersc.hubdle.project.extensions._internal.Configurable.Before
 import com.javiersc.hubdle.project.extensions._internal.Configurable.Lazy
 import com.javiersc.hubdle.project.extensions.apis.BaseHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import org.gradle.api.Project
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
@@ -83,7 +84,7 @@ internal class HubdleState(private val project: Project) {
         for (applicablePlugin in applicablePlugins) {
             applicablePlugin.run { project.applyPlugin() }
         }
-        val ids = applicablePlugins.filter { it.isEnabled.get() }.map { it.pluginId.id }
+        val ids: List<String> = applicablePlugins.filter { it.isEnabled.get() }.map { it.pluginId.id }
         project.withPlugins(*ids.toTypedArray()) {
             val beforeConfigurables = configurables.filterIsInstance<Before>()
             for (configurable in beforeConfigurables) configurable.configure()

diff --git a/...ugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/withPluginExtensions.kt b/...ugin/main/kotlin/com/javiersc/hubdle/project/extensions/_internal/withPluginExtensions.kt
@@ -4,6 +4,7 @@ import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.LibraryExtension
 import com.diffplug.gradle.spotless.SpotlessExtension
 import com.diffplug.gradle.spotless.SpotlessExtensionPredeclare
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.semver.project.gradle.plugin.SemverExtension
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
 import kotlinx.validation.ApiValidationExtension

diff --git a/...dle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/apis/BaseHubdleExtension.kt b/...dle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/apis/BaseHubdleExtension.kt
@@ -1,6 +1,7 @@
 package com.javiersc.hubdle.project.extensions.apis
 
 import com.javiersc.gradle.project.extensions.withPlugins
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.plugins.AppliedPlugin
@@ -9,6 +10,10 @@ public interface BaseHubdleExtension {
 
     public val project: Project
 
+    public fun withPlugin(pluginId: PluginId, action: Action<AppliedPlugin>) {
+        project.pluginManager.withPlugin(pluginId.id, action)
+    }
+
     public fun withPlugin(pluginId: String, action: Action<AppliedPlugin>) {
         project.pluginManager.withPlugin(pluginId, action)
     }

diff --git a/...ugin/main/kotlin/com/javiersc/hubdle/project/extensions/apis/HubdleEnableableExtension.kt b/...ugin/main/kotlin/com/javiersc/hubdle/project/extensions/apis/HubdleEnableableExtension.kt
@@ -8,7 +8,7 @@ import com.javiersc.hubdle.project.extensions._internal.Configurable.After
 import com.javiersc.hubdle.project.extensions._internal.Configurable.Before
 import com.javiersc.hubdle.project.extensions._internal.Configurable.Lazy
 import com.javiersc.hubdle.project.extensions._internal.HubdleState
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.hubdleState
 import org.gradle.api.Action
 import org.gradle.api.Project

diff --git a/...sc/hubdle/project/extensions/config/analysis/tools/HubdleConfigAnalysisDetektExtension.kt b/...sc/hubdle/project/extensions/config/analysis/tools/HubdleConfigAnalysisDetektExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.config.analysis.tools
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.allKotlinSrcDirsWithoutBuild
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension

diff --git a/...rsc/hubdle/project/extensions/config/analysis/tools/HubdleConfigAnalysisSonarExtension.kt b/...rsc/hubdle/project/extensions/config/analysis/tools/HubdleConfigAnalysisSonarExtension.kt
@@ -8,7 +8,7 @@ import com.android.build.api.dsl.LibraryExtension
 import com.android.build.api.dsl.LibraryProductFlavor
 import com.javiersc.gradle.properties.extensions.getStringProperty
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.kotlinSrcDirsWithoutBuild
 import com.javiersc.hubdle.project.extensions._internal.kotlinTestsSrcDirsWithoutBuild

diff --git a/...onfig/binary/compatibility/validator/HubdleConfigBinaryCompatibilityValidatorExtension.kt b/...onfig/binary/compatibility/validator/HubdleConfigBinaryCompatibilityValidatorExtension.kt
@@ -5,7 +5,7 @@ import com.javiersc.gradle.project.extensions.isRootProject
 import com.javiersc.gradle.tasks.extensions.maybeNamed
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...n/com/javiersc/hubdle/project/extensions/config/coverage/HubdleConfigCoverageExtension.kt b/...n/com/javiersc/hubdle/project/extensions/config/coverage/HubdleConfigCoverageExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.config.coverage
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...bdle/project/extensions/config/documentation/api/HubdleConfigDocumentationApiExtension.kt b/...bdle/project/extensions/config/documentation/api/HubdleConfigDocumentationApiExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.config.documentation.api
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.hasKotlinGradlePlugin
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/.../extensions/config/documentation/changelog/HubdleConfigDocumentationChangelogExtension.kt b/.../extensions/config/documentation/changelog/HubdleConfigDocumentationChangelogExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.config.documentation.changelog
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...le/project/extensions/config/documentation/site/HubdleConfigDocumentationSiteExtension.kt b/...le/project/extensions/config/documentation/site/HubdleConfigDocumentationSiteExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.config.documentation.site
 import com.javiersc.gradle.project.extensions.isRootProject
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...otlin/com/javiersc/hubdle/project/extensions/config/format/HubdleConfigFormatExtension.kt b/...otlin/com/javiersc/hubdle/project/extensions/config/format/HubdleConfigFormatExtension.kt
@@ -6,7 +6,7 @@ import com.diffplug.gradle.spotless.SpotlessExtensionPredeclare
 import com.javiersc.gradle.project.extensions.isRootProject
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.libraryVersion

diff --git a/.../kotlin/com/javiersc/hubdle/project/extensions/config/nexus/HubdleConfigNexusExtension.kt b/.../kotlin/com/javiersc/hubdle/project/extensions/config/nexus/HubdleConfigNexusExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.config.nexus
 import com.javiersc.gradle.properties.extensions.getStringProperty
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...hubdle/project/extensions/config/publishing/maven/HubdleConfigPublishingMavenExtension.kt b/...hubdle/project/extensions/config/publishing/maven/HubdleConfigPublishingMavenExtension.kt
@@ -7,7 +7,7 @@ import com.javiersc.gradle.tasks.extensions.maybeRegister
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
 import com.javiersc.hubdle.project.extensions._internal.Configurable
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...le/project/extensions/config/publishing/signing/HubdleConfigPublishingSigningExtension.kt b/...le/project/extensions/config/publishing/signing/HubdleConfigPublishingSigningExtension.kt
@@ -7,7 +7,7 @@ import com.javiersc.gradle.properties.extensions.getBooleanProperty
 import com.javiersc.gradle.properties.extensions.getStringProperty
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleEnableableExtension

diff --git a/...lin/com/javiersc/hubdle/project/extensions/config/testing/HubdleConfigTestingExtension.kt b/...lin/com/javiersc/hubdle/project/extensions/config/testing/HubdleConfigTestingExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.config.testing
 import com.gradle.develocity.agent.gradle.test.TestRetryConfiguration
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleEnableableExtension

diff --git a/...bdle/project/extensions/config/versioning/semver/HubdleConfigVersioningSemverExtension.kt b/...bdle/project/extensions/config/versioning/semver/HubdleConfigVersioningSemverExtension.kt
@@ -4,18 +4,19 @@ import com.javiersc.gradle.project.extensions.isRootProject
 import com.javiersc.gradle.properties.extensions.getStringProperty
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
-import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
+import com.javiersc.hubdle.project.extensions.apis.BaseHubdleEnableableExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleEnableableExtension
 import com.javiersc.hubdle.project.extensions.config.versioning.hubdleVersioning
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.semver.project.gradle.plugin.SemverExtension
 import javax.inject.Inject
 import org.gradle.api.Action
 import org.gradle.api.Project
 import org.gradle.api.provider.Property
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.the
 
 @HubdleDslMarker
 public abstract class HubdleConfigVersioningSemverExtension
@@ -32,21 +33,25 @@ constructor(
     public val tagPrefix: Property<String> = defaultTagPrefix()
 
     public fun mapVersion(action: SemverExtension.VersionMapper) {
-        lazyConfigurable { the<SemverExtension>().mapVersion(action) }
+        withSemverPlugin { it.mapVersion(action) }
     }
 
     public fun mapVersion(action: SemverExtension.VersionAndGitMapper) {
-        lazyConfigurable { the<SemverExtension>().mapVersion(action) }
+        withSemverPlugin { it.mapVersion(action) }
     }
 
     @HubdleDslMarker
-    public fun semver(action: Action<SemverExtension> = Action {}): Unit = fallbackAction(action)
+    public fun semver(action: Action<SemverExtension> = Action {}): Unit = withSemverPlugin(action)
 
     override fun Project.defaultConfiguration() {
         applicablePlugin(
-            scope = Scope.CurrentProject, pluginId = PluginId.JavierscSemverGradlePlugin)
-        lazyConfigurable {
-            configure<SemverExtension> { tagPrefix.set(hubdleSemver.tagPrefix.get()) }
+            scope = Scope.CurrentProject,
+            pluginId = PluginId.JavierscSemverGradlePlugin,
+        )
+        withSemverPlugin {
+            configure<SemverExtension> { //
+                tagPrefix.set(hubdleSemver.tagPrefix)
+            }
         }
     }
 
@@ -55,5 +60,9 @@ constructor(
     }
 }
 
+internal fun BaseHubdleEnableableExtension.withSemverPlugin(action: Action<SemverExtension>) {
+    withPlugin(pluginId = PluginId.JavierscSemverGradlePlugin) { action.execute(project.the()) }
+}
+
 internal val HubdleEnableableExtension.hubdleSemver: HubdleConfigVersioningSemverExtension
     get() = getHubdleExtension()
diff --git a/...dle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/java/HubdleJavaExtension.kt b/...dle-plugin/main/kotlin/com/javiersc/hubdle/project/extensions/java/HubdleJavaExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.java
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleEnableableExtension

diff --git a/...tlin/com/javiersc/hubdle/project/extensions/kotlin/_internal/configureKotlinSourceSets.kt b/...tlin/com/javiersc/hubdle/project/extensions/kotlin/_internal/configureKotlinSourceSets.kt
@@ -7,7 +7,7 @@ import com.javiersc.gradle.properties.extensions.setProperty
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
 import com.javiersc.hubdle.project.extensions._internal.COMMON_MAIN
 import com.javiersc.hubdle.project.extensions._internal.MAIN
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.TEST_FIXTURES
 import com.javiersc.hubdle.project.extensions._internal.TEST_FUNCTIONAL
 import com.javiersc.hubdle.project.extensions._internal.TEST_INTEGRATION

diff --git a/.../project/extensions/kotlin/android/application/HubdleKotlinAndroidApplicationExtension.kt b/.../project/extensions/kotlin/android/application/HubdleKotlinAndroidApplicationExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.kotlin.android.application
 import com.android.build.api.dsl.ApplicationExtension
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.configurableDependencies
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension

diff --git a/...c/hubdle/project/extensions/kotlin/android/library/HubdleKotlinAndroidLibraryExtension.kt b/...c/hubdle/project/extensions/kotlin/android/library/HubdleKotlinAndroidLibraryExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.kotlin.android.library
 import com.android.build.api.dsl.LibraryExtension
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.configurableDependencies
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension

diff --git a/...c/hubdle/project/extensions/kotlin/features/shared/HubdleKotlinComposeFeatureExtension.kt b/...c/hubdle/project/extensions/kotlin/features/shared/HubdleKotlinComposeFeatureExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.kotlin.features.shared
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
 import com.javiersc.hubdle.project.extensions._internal.MAIN
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.library

diff --git a/.../hubdle/project/extensions/kotlin/features/shared/HubdleKotlinMoleculeFeatureExtension.kt b/.../hubdle/project/extensions/kotlin/features/shared/HubdleKotlinMoleculeFeatureExtension.kt
@@ -4,7 +4,7 @@ import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
 import com.javiersc.hubdle.project.extensions._internal.COMMON_MAIN
 import com.javiersc.hubdle.project.extensions._internal.MAIN
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.library
 import com.javiersc.hubdle.project.extensions.apis.BaseHubdleExtension

diff --git a/...le/project/extensions/kotlin/features/shared/HubdleKotlinSerializationFeatureExtension.kt b/...le/project/extensions/kotlin/features/shared/HubdleKotlinSerializationFeatureExtension.kt
@@ -4,7 +4,7 @@ import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
 import com.javiersc.hubdle.project.extensions._internal.COMMON_MAIN
 import com.javiersc.hubdle.project.extensions._internal.MAIN
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.library
 import com.javiersc.hubdle.project.extensions.apis.BaseHubdleExtension

diff --git a/...ubdle/project/extensions/kotlin/features/shared/HubdleKotlinSqlDelightFeatureExtension.kt b/...ubdle/project/extensions/kotlin/features/shared/HubdleKotlinSqlDelightFeatureExtension.kt
@@ -4,7 +4,7 @@ import app.cash.sqldelight.gradle.SqlDelightDatabase
 import app.cash.sqldelight.gradle.SqlDelightExtension
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions._internal.hubdleCatalog

diff --git a/...main/kotlin/com/javiersc/hubdle/project/extensions/kotlin/jvm/HubdleKotlinJvmExtension.kt b/...main/kotlin/com/javiersc/hubdle/project/extensions/kotlin/jvm/HubdleKotlinJvmExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.kotlin.jvm
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.configurableDependencies
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension

diff --git a/...ersc/hubdle/project/extensions/kotlin/multiplatform/HubdleKotlinMultiplatformExtension.kt b/...ersc/hubdle/project/extensions/kotlin/multiplatform/HubdleKotlinMultiplatformExtension.kt
@@ -2,7 +2,7 @@ package com.javiersc.hubdle.project.extensions.kotlin.multiplatform
 
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.configurableDependencies
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleConfigurableExtension

diff --git a/...ject/extensions/kotlin/multiplatform/targets/HubdleKotlinMultiplatformAndroidExtension.kt b/...ject/extensions/kotlin/multiplatform/targets/HubdleKotlinMultiplatformAndroidExtension.kt
@@ -3,7 +3,7 @@ package com.javiersc.hubdle.project.extensions.kotlin.multiplatform.targets
 import com.android.build.api.dsl.LibraryExtension
 import com.javiersc.hubdle.project.extensions.HubdleDslMarker
 import com.javiersc.hubdle.project.extensions._internal.ApplicablePlugin.Scope
-import com.javiersc.hubdle.project.extensions._internal.PluginId
+import com.javiersc.hubdle.project.extensions.shared.PluginId
 import com.javiersc.hubdle.project.extensions._internal.fallbackAction
 import com.javiersc.hubdle.project.extensions._internal.getHubdleExtension
 import com.javiersc.hubdle.project.extensions.apis.HubdleEnableableExtension