Skip to content

Commit

Permalink
Fixed tests by using non-installer IDE version.
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexanderBartash authored and jezzsantos committed Oct 18, 2024
1 parent 525d9bc commit 32e3994
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 7 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

id("java")
alias(libs.plugins.kotlin)
id("org.jetbrains.intellij.platform")
alias(libs.plugins.intellijPlatform)
alias(libs.plugins.changelog)
alias(libs.plugins.jvmwrapper)
}
Expand Down Expand Up @@ -36,12 +36,17 @@ dependencies {

intellijPlatform {
val platformVer: String = providers.gradleProperty("platformVersion").get()
rider(platformVer)
// Do not set useInstaller = true because installer version for some reason do not contain libs/testFramework.jar
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin.html#setting-up-intellij-platform
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#target-versions
rider(platformVer, useInstaller = false)
jetbrainsRuntime()
pluginVerifier()
zipSigner()
instrumentationTools()

// TestFrameworkType.Platform as of this moment does not work for rider and the warning on this page is wrong.
// https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#testing
testFramework(TestFrameworkType.Bundled)
}
}
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ gradleVersion=8.10.2
org.jetbrains.intellij.platform.downloadSources=false
# Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
# https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
kotlin.stdlib.default.dependency=false
kotlin.stdlib.default.dependency=false
org.gradle.jvmargs = -Xmx1G
7 changes: 6 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ kotlin = "1.9.25" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.htm
changelog = "2.2.1"
jvmwrapper = "0.14.0"

# https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
# Apache 2.0 https://github.com/ota4j-team/opentest4j/blob/main/LICENSE
intellijPlatform = "2.1.0"

[libraries]
kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }

[plugins]
changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
jvmwrapper = { id = "me.filippov.gradle.jvm.wrapper", version.ref = "jvmwrapper" }
jvmwrapper = { id = "me.filippov.gradle.jvm.wrapper", version.ref = "jvmwrapper" }
intellijPlatform = { id = "org.jetbrains.intellij.platformr", version.ref = "intellijPlatform" }

0 comments on commit 32e3994

Please sign in to comment.