Skip to content

chore: Support against IC-2024.2+ #245

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.

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

Closed
wants to merge 1 commit into from
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/IJ-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build --continue -PplatformVersion=LATEST-EAP-SNAPSHOT
run: ./gradlew build --continue -PideaVersion=LATEST-EAP-SNAPSHOT
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/IJ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ jobs:
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build -PplatformVersion=${{ matrix.IJ }}

run: ./gradlew build -PideaVersion=${{ matrix.IJ }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'temurin'
cache: 'gradle'
java-version: 17
distribution: 'temurin'
cache: 'gradle'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
14 changes: 9 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ plugins {

group = "com.redhat.devtools.intellij"
version = providers.gradleProperty("projectVersion").get() // Plugin version
val ideaVersion = providers.gradleProperty("platformVersion").get()
val platformVersion = providers.gradleProperty("ideaVersion").get()

// Set the JVM language level used to build the project.
java {
Expand All @@ -31,7 +31,7 @@ repositories {

dependencies {
intellijPlatform {
create(IntelliJPlatformType.IntellijIdeaCommunity, ideaVersion)
create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersion)

// Bundled Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
Expand Down Expand Up @@ -59,10 +59,14 @@ dependencies {
testImplementation(libs.junit)
testImplementation(libs.assertj.core)
testImplementation(libs.mockito.inline)
testImplementation(libs.opentest4j) // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#missing-opentest4j-dependency-in-test-framework
testImplementation(libs.opentest4j) // known issue: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-faq.html#missing-opentest4j-dependency-in-test-framework

}

intellijPlatform {
buildSearchableOptions = false
}

tasks {
wrapper {
gradleVersion = providers.gradleProperty("gradleVersion").get()
Expand Down Expand Up @@ -102,8 +106,8 @@ nexusPublishing {

val testJarFile = file("${layout.buildDirectory}/libs/intellij-common-${version}-test.jar")
val testArtifact = artifacts.add("archives", testJarFile) {
setType("test")
setClassifier("test")
type = "test"
classifier = "test"
builtBy("packageTests")
}

Expand Down
11 changes: 4 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,21 @@ nexusUser=invalid
nexusPassword=invalid

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
# platformType = IC (not needed as hard-coded in gradle build directly)
platformVersion=2024.2
ideaVersion=2024.2

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion=8.8
gradleVersion=8.5

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
platformBundledPlugins=org.jetbrains.plugins.yaml
platformPlugins=

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

# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency=false

# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
org.gradle.configuration-cache=true
# disabled because of issue with publish plugin -> https://github.com/gradle-nexus/publish-plugin/issues/221
org.gradle.configuration-cache=false

# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching=true
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ opentest4j = "1.3.0"

# plugins
gradleIntelliJPlugin = "2.1.0"
gradleNexusPublishPlugin = "1.1.0"
gradleNexusPublishPlugin = "2.0.0"

[libraries]
junit = { group = "junit", name = "junit", version.ref = "junit" }
Expand Down
Loading