Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.0 - Use the built-in Gradle version checker #1549

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

2.0 - Use the built-in Gradle version checker #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,22 @@ dependencies {
testFixturesImplementation(libs.annotations)
}

configurations.configureEach {
if (isCanBeConsumed) {
attributes {
attribute(
GradlePluginApiVersion.GRADLE_PLUGIN_API_VERSION_ATTRIBUTE,
objects.named<GradlePluginApiVersion>(GradleVersion.version("8.1").version)
)
}
}
}

kotlin {
jvmToolchain(11)
}

tasks {
withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "11"
}
}

wrapper {
gradleVersion = properties("gradleVersion").get()
distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/org/jetbrains/intellij/platform/gradle/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand Down
10 changes: 0 additions & 10 deletions src/main/kotlin/org/jetbrains/intellij/platform/gradle/plugins/plugins.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,11 @@
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 <reified T : Any> Any.configureExtension(name: String, vararg constructionArguments: Any, noinline configuration: T.() -> Unit = {}) {
with((this as ExtensionAware).extensions) {
val extension = findByName(name) as? T ?: create<T>(name, *constructionArguments)
extension.configuration()
}
}

internal fun checkGradleVersion() {
if (GradleVersion.current() < Constraints.MINIMAL_GRADLE_VERSION) {
throw PluginInstantiationException("$PLUGIN_NAME requires Gradle ${Constraints.MINIMAL_GRADLE_VERSION} and higher")
}
}
3 changes: 0 additions & 3 deletions ...tlin/org/jetbrains/intellij/platform/gradle/plugins/project/IntelliJPlatformBasePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -47,8 +46,6 @@ abstract class IntelliJPlatformBasePlugin : Plugin<Project> {
override fun apply(project: Project) {
log.info("Configuring plugin: $PLUGIN_BASE_ID")

checkGradleVersion()

with(project) {
with(plugins) {
apply(JavaPlugin::class)
Expand Down
3 changes: 0 additions & 3 deletions ...org/jetbrains/intellij/platform/gradle/plugins/settings/IntelliJPlatformSettingsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<IntelliJPlatformRepositoriesExtension>(
Expand Down
Loading