Skip to content

Commit 2e65a6b

Browse files
committed
Use the built-in Gradle version checker
1 parent 78836dc commit 2e65a6b

File tree

5 files changed

+11
-23
lines changed

5 files changed

+11
-23
lines changed

build.gradle.kts

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,22 @@ dependencies {
6565
testFixturesImplementation(libs.annotations)
6666
}
6767

68+
configurations.configureEach {
69+
if (isCanBeConsumed) {
70+
attributes {
71+
attribute(
72+
GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
73+
objects.named<GradlePluginApiVersion>(GradleVersion.version("8.1").version)
74+
)
75+
}
76+
}
77+
}
78+
6879
kotlin {
6980
jvmToolchain(11)
7081
}
7182

7283
tasks {
73-
withType<KotlinCompile> {
74-
kotlinOptions {
75-
jvmTarget = "11"
76-
}
77-
}
78-
7984
wrapper {
8085
gradleVersion = properties("gradleVersion").get()
8186
distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-$gradleVersion-all.zip"

src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ object Constants {
2424
const val VERSION_LATEST = "latest"
2525

2626
object Constraints {
27-
val MINIMAL_GRADLE_VERSION: GradleVersion = GradleVersion.version("8.1")
2827
val MINIMAL_INTELLIJ_PLATFORM_BUILD_NUMBER = "223".toVersion()
2928
val MINIMAL_INTELLIJ_PLATFORM_VERSION = "2022.3".toVersion()
3029
}

src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/plugins.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,11 @@
33
package org.jetbrains.intellij.platform.gradle.plugins
44

55
import org.gradle.api.plugins.ExtensionAware
6-
import org.gradle.api.plugins.PluginInstantiationException
76
import org.gradle.kotlin.dsl.create
8-
import org.gradle.util.GradleVersion
9-
import org.jetbrains.intellij.platform.gradle.Constants.Constraints
10-
import org.jetbrains.intellij.platform.gradle.Constants.PLUGIN_NAME
117

128
internal inline fun <reified T : Any> Any.configureExtension(name: String, vararg constructionArguments: Any, noinline configuration: T.() -> Unit = {}) {
139
with((this as ExtensionAware).extensions) {
1410
val extension = findByName(name) as? T ?: create<T>(name, *constructionArguments)
1511
extension.configuration()
1612
}
1713
}
18-
19-
internal fun checkGradleVersion() {
20-
if (GradleVersion.current() < Constraints.MINIMAL_GRADLE_VERSION) {
21-
throw PluginInstantiationException("$PLUGIN_NAME requires Gradle ${Constraints.MINIMAL_GRADLE_VERSION} and higher")
22-
}
23-
}

src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformReposit
3030
import org.jetbrains.intellij.platform.gradle.isBuildFeatureEnabled
3131
import org.jetbrains.intellij.platform.gradle.model.platformPath
3232
import org.jetbrains.intellij.platform.gradle.model.productInfo
33-
import org.jetbrains.intellij.platform.gradle.plugins.checkGradleVersion
3433
import org.jetbrains.intellij.platform.gradle.plugins.configureExtension
3534
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
3635
import org.jetbrains.intellij.platform.gradle.utils.Logger
@@ -47,8 +46,6 @@ abstract class IntelliJPlatformBasePlugin : Plugin<Project> {
4746
override fun apply(project: Project) {
4847
log.info("Configuring plugin: $PLUGIN_BASE_ID")
4948

50-
checkGradleVersion()
51-
5249
with(project) {
5350
with(plugins) {
5451
apply(JavaPlugin::class)

src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/settings/IntelliJPlatformSettingsPlugin.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import org.gradle.api.provider.ProviderFactory
88
import org.jetbrains.intellij.platform.gradle.Constants.Extensions
99
import org.jetbrains.intellij.platform.gradle.Constants.PLUGIN_SETTINGS_ID
1010
import org.jetbrains.intellij.platform.gradle.extensions.IntelliJPlatformRepositoriesExtension
11-
import org.jetbrains.intellij.platform.gradle.plugins.checkGradleVersion
1211
import org.jetbrains.intellij.platform.gradle.plugins.configureExtension
1312
import org.jetbrains.intellij.platform.gradle.utils.Logger
1413
import javax.inject.Inject
@@ -23,8 +22,6 @@ abstract class IntelliJPlatformSettingsPlugin @Inject constructor(
2322
override fun apply(settings: Settings) {
2423
log.info("Configuring plugin: $PLUGIN_SETTINGS_ID")
2524

26-
checkGradleVersion()
27-
2825
@Suppress("UnstableApiUsage")
2926
with(settings.dependencyResolutionManagement.repositories) {
3027
configureExtension<IntelliJPlatformRepositoriesExtension>(

0 commit comments

Comments
 (0)