Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 0 additions & 64 deletions Jenkinsfile

This file was deleted.

22 changes: 11 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ group = "com.redhat.devtools.intellij"
version = providers.gradleProperty("projectVersion").get() // Plugin version
val ideaVersion = providers.gradleProperty("platformVersion").get()
val javaVersion = 17
val ideaVersionInt = when {
// e.g. '20XY.Z'
ideaVersion.length == 6 -> ideaVersion.replace(".", "").substring(2).toInt()
// e.g. '2XY.ABCDE.12'
else -> ideaVersion.substringBefore(".").toInt()
}

// Set the JVM language level used to build the project.
kotlin {
Expand All @@ -29,16 +35,12 @@ java {
targetCompatibility = JavaVersion.toVersion(javaVersion)
}


repositories {
mavenLocal()
/*
* github repo with intellij-common needs to be listed before jboss repository. Both have 1.9.9-SNAPSHOT
* First hit wins regardless of timestamp
*/
maven { url = uri("https://raw.githubusercontent.com/redhat-developer/intellij-common-ui-test-library/repository/snapshots") }
maven { url = uri("https://raw.githubusercontent.com/redhat-developer/intellij-common-ui-test-library/repository/releases") }
maven { url = uri("https://raw.githubusercontent.com/redhat-developer/intellij-common/repository/snapshots") }
maven { url = uri("https://raw.githubusercontent.com/redhat-developer/intellij-common/repository/releases") }
maven { url = uri("https://repository.jboss.org") }
mavenCentral()
intellijPlatform {
defaultRepositories()
Expand All @@ -56,7 +58,7 @@ dependencies {
/*
* platformVersion check for JSON breaking changes since 2024.3
*/
if (ideaVersion.startsWith("2024.3") || ideaVersion.startsWith("25")) {
if (ideaVersionInt >= 243) {
platformBundledPlugins.add("com.intellij.modules.json")
}
println("use bundled Plugins: $platformBundledPlugins")
Expand All @@ -74,10 +76,10 @@ dependencies {
}

implementation(libs.devtools.common)
implementation(libs.openshift.client)
implementation(libs.kubernetes.client)
implementation(libs.kubernetes.model)
implementation(libs.kubernetes.model.common)
implementation(libs.openshift.client)
implementation(libs.kubernetes.httpclient.okhttp)
implementation(libs.jackson.core)
implementation(libs.commons.lang3)
Expand Down Expand Up @@ -135,9 +137,7 @@ intellijPlatform {

tasks {
fun supportsEnhancedClassRedefinition(): Boolean {
val platformVersion = findProperty("platformVersion").toString().toFloatOrNull()
return platformVersion != null
&& platformVersion >= 2024.1
return ideaVersionInt >= 241
}

wrapper {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ gradleVersion=8.5

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html#dependency-declaration-in-pluginxml
platformBundledPlugins=org.jetbrains.plugins.yaml, org.jetbrains.plugins.terminal
platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.0.59
platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.1.62

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild=231
Expand Down
Loading