diff --git a/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/RuntimeValidationPlugin.kt b/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/RuntimeValidationPlugin.kt deleted file mode 100644 index 5eca887bb..000000000 --- a/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/RuntimeValidationPlugin.kt +++ /dev/null @@ -1,14 +0,0 @@ -package com.github.triplet.gradle.common.validation - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.util.GradleVersion - -internal class RuntimeValidationPlugin : Plugin { - override fun apply(project: Project) { - check(project === project.rootProject) - - GradleRuntimeValidator(GradleVersion.current(), MIN_GRADLE_VERSION) - .validate() - } -} diff --git a/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/Validation.kt b/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/Validation.kt index 10198f81f..efae06b06 100644 --- a/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/Validation.kt +++ b/common/validation/src/main/kotlin/com/github/triplet/gradle/common/validation/Validation.kt @@ -10,15 +10,15 @@ import org.gradle.api.logging.Logger import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.findByType import org.gradle.kotlin.dsl.withType +import org.gradle.util.GradleVersion /** * Validates required dependencies. If GPP can't run in the current context, an error will be * thrown. */ fun Project.validateRuntime() { - rootProject.plugins.apply(RuntimeValidationPlugin::class) - - project.plugins.withType { + GradleRuntimeValidator(GradleVersion.current(), MIN_GRADLE_VERSION).validate() + plugins.withType { val agpPluginVersion = extensions.findByType()?.pluginVersion AgpRuntimeValidator(agpPluginVersion, MIN_AGP_VERSION).validate() } diff --git a/play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt b/play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt index 5a3f782d1..1a3a9ba23 100644 --- a/play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt +++ b/play/plugin/src/main/kotlin/com/github/triplet/gradle/play/PlayPublisherPlugin.kt @@ -97,7 +97,7 @@ internal abstract class PlayPublisherPlugin @Inject constructor( } private fun applyInternal(project: Project) { - val executionDir = project.rootProject.layout.projectDirectory + val executionDir = project.rootDir val cliOptionsExtension = project.objects.newInstance() val bootstrapOptionsHolder = BootstrapOptions.Holder()