Skip to content

Commit 9bfdc1f

Browse files
committed
Don't use idea_type; use ijVersion directly.
1 parent 98fc86a commit 9bfdc1f

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
33

44
buildscript {
55
ext.ijVersion = BuildConfiguration.INSTANCE.getPlatformVersion(project)
6-
ext.idea_type = ext.ijVersion.platformType
7-
86
ext.kotlin_version = Version.INSTANCE.Kotlin(ext.ijVersion)
97
ext.java_version = Version.INSTANCE.Java(ext.ijVersion)
108

@@ -63,10 +61,10 @@ configure(allprojects - project(":src")) {
6361
dependencies {
6462
intellijPlatform {
6563
if (ijVersion instanceof IntelliJSnapshot) {
66-
create(idea_type, ijVersion.value, false)
64+
create(ijVersion.platformType, ijVersion.value, false)
6765
jetbrainsRuntime()
6866
} else {
69-
create(idea_type, ijVersion.platformVersion, true)
67+
create(ijVersion.platformType, ijVersion.platformVersion, true)
7068
}
7169

7270
instrumentationTools()
@@ -144,7 +142,7 @@ dependencies {
144142
}
145143

146144
sourceSets.main {
147-
if (idea_type == "IU") {
145+
if (ijVersion.platformType == "IU") {
148146
if (ext.ijVersion.buildVersion >= 193) {
149147
resources.srcDir("src/main/resources-microservices/193")
150148
} else {
@@ -169,7 +167,7 @@ tasks {
169167
buildSearchableOptions.enabled = true
170168
}
171169

172-
println "Building for IntelliJ ${idea_type} version '${ijVersion.platformVersion}', since build '${ijVersion.buildVersion}'"
170+
println "Building for IntelliJ ${ijVersion.platformType} version '${ijVersion.platformVersion}', since build '${ijVersion.buildVersion}'"
173171

174172
intellijPlatform {
175173
pluginConfiguration {

src/intellij-compat/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
val ijVersion = BuildConfiguration.getPlatformVersion(project)
2-
val intellijType = project.property("idea_type")
32

43
version = ijVersion.buildVersion.toString()
54

@@ -58,7 +57,7 @@ sourceSets.main {
5857

5958
// Microservices
6059

61-
if (intellijType == "IU") {
60+
if (ijVersion.platformType == "IU") {
6261
if (ijVersion.buildVersion >= 231) {
6362
java.srcDir("src/microservices/IU-231")
6463
} else {

0 commit comments

Comments
 (0)