From 2e65a6bad5825c73e0887ce08ad5ecbab8aa2193 Mon Sep 17 00:00:00 2001 From: hfhbd Date: Sat, 2 Mar 2024 12:20:33 +0100 Subject: [PATCH] Use the built-in Gradle version checker --- build.gradle.kts | 17 +++++++++++------ .../intellij/platform/gradle/Constants.kt | 1 - .../intellij/platform/gradle/plugins/plugins.kt | 10 ---------- .../project/IntelliJPlatformBasePlugin.kt | 3 --- .../settings/IntelliJPlatformSettingsPlugin.kt | 3 --- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 95169d13f2..2f237b8bcd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -65,17 +65,22 @@ dependencies { testFixturesImplementation(libs.annotations) } +configurations.configureEach { + if (isCanBeConsumed) { + attributes { + attribute( + GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE, + objects.named(GradleVersion.version("8.1").version) + ) + } + } +} + kotlin { jvmToolchain(11) } tasks { - withType { - kotlinOptions { - jvmTarget = "11" - } - } - wrapper { gradleVersion = properties("gradleVersion").get() distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-$gradleVersion-all.zip" diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt index fb135233b9..062be6b2ce 100644 --- a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt +++ b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt @@ -24,7 +24,6 @@ object Constants { const val VERSION_LATEST = "latest" object Constraints { - val MINIMAL_GRADLE_VERSION: GradleVersion = GradleVersion.version("8.1") val MINIMAL_INTELLIJ_PLATFORM_BUILD_NUMBER = "223".toVersion() val MINIMAL_INTELLIJ_PLATFORM_VERSION = "2022.3".toVersion() } diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/plugins.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/plugins.kt index a3c41f84ab..1ead8e03bc 100644 --- a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/plugins.kt +++ b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/plugins.kt @@ -3,11 +3,7 @@ package org.jetbrains.intellij.platform.gradle.plugins import org.gradle.api.plugins.ExtensionAware -import org.gradle.api.plugins.PluginInstantiationException import org.gradle.kotlin.dsl.create -import org.gradle.util.GradleVersion -import org.jetbrains.intellij.platform.gradle.Constants.Constraints -import org.jetbrains.intellij.platform.gradle.Constants.PLUGIN_NAME internal inline fun Any.configureExtension(name: String, vararg constructionArguments: Any, noinline configuration: T.() -> Unit = {}) { with((this as ExtensionAware).extensions) { @@ -15,9 +11,3 @@ internal inline fun Any.configureExtension(name: String, varar extension.configuration() } } - -internal fun checkGradleVersion() { - if (GradleVersion.current() < Constraints.MINIMAL_GRADLE_VERSION) { - throw PluginInstantiationException("$PLUGIN_NAME requires Gradle ${Constraints.MINIMAL_GRADLE_VERSION} and higher") - } -} diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt index d822d758fb..b60fdae524 100644 --- a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt +++ b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt @@ -30,7 +30,6 @@ import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformReposit import org.jetbrains.intellij.platform.gradle.isBuildFeatureEnabled import org.jetbrains.intellij.platform.gradle.model.platformPath import org.jetbrains.intellij.platform.gradle.model.productInfo -import org.jetbrains.intellij.platform.gradle.plugins.checkGradleVersion import org.jetbrains.intellij.platform.gradle.plugins.configureExtension import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask import org.jetbrains.intellij.platform.gradle.utils.Logger @@ -47,8 +46,6 @@ abstract class IntelliJPlatformBasePlugin : Plugin { override fun apply(project: Project) { log.info("Configuring plugin: $PLUGIN_BASE_ID") - checkGradleVersion() - with(project) { with(plugins) { apply(JavaPlugin::class) diff --git a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/settings/IntelliJPlatformSettingsPlugin.kt b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/settings/IntelliJPlatformSettingsPlugin.kt index 6780adebfa..3699b63f91 100644 --- a/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/settings/IntelliJPlatformSettingsPlugin.kt +++ b/src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/settings/IntelliJPlatformSettingsPlugin.kt @@ -8,7 +8,6 @@ import org.gradle.api.provider.ProviderFactory import org.jetbrains.intellij.platform.gradle.Constants.Extensions import org.jetbrains.intellij.platform.gradle.Constants.PLUGIN_SETTINGS_ID import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformRepositoriesExtension -import org.jetbrains.intellij.platform.gradle.plugins.checkGradleVersion import org.jetbrains.intellij.platform.gradle.plugins.configureExtension import org.jetbrains.intellij.platform.gradle.utils.Logger import javax.inject.Inject @@ -23,8 +22,6 @@ abstract class IntelliJPlatformSettingsPlugin @Inject constructor( override fun apply(settings: Settings) { log.info("Configuring plugin: $PLUGIN_SETTINGS_ID") - checkGradleVersion() - @Suppress("UnstableApiUsage") with(settings.dependencyResolutionManagement.repositories) { configureExtension(