Skip to content

Commit 6a38b0e

Browse files
committed
EDU-7963: Return remote-env module back to 251 builds
Previously, it was excluded because of technical issue with IJPGP 2.1
1 parent 0a9d45b commit 6a38b0e

File tree

5 files changed

+12
-35
lines changed

5 files changed

+12
-35
lines changed

intellij-plugin/branches/243/resources/META-INF/platform-plugin.xml

-5
This file was deleted.

intellij-plugin/branches/251/resources/META-INF/platform-plugin.xml

-1
This file was deleted.

intellij-plugin/build.gradle.kts

+10-22
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,7 @@ dependencies {
330330
pluginModule(implementation(project("sql")))
331331
pluginModule(implementation(project("sql:sql-jvm")))
332332
pluginModule(implementation(project("github")))
333-
// Temporary workaround to make it work with 2025.1.
334-
// Will be fixed automatically after migration to IJPGP 2.4
335-
if (!isAtLeast251) {
336-
pluginModule(implementation(project("remote-env")))
337-
}
333+
pluginModule(implementation(project("remote-env")))
338334
pluginModule(implementation(project("features:command-line")))
339335
pluginModule(implementation(project("features:ai-error-explanation")))
340336
pluginModule(implementation(project("features:ai-hints-core")))
@@ -599,22 +595,18 @@ project("jvm-core") {
599595
}
600596
}
601597

602-
// Temporary workaround to make it work with 2025.1.
603-
// Will be fixed automatically after migration to IJPGP 2.4
604-
if (!isAtLeast251) {
605-
project("remote-env") {
606-
dependencies {
607-
intellijPlatform {
608-
val ideVersion = if (isStudioIDE || isRiderIDE) ideaVersion else baseVersion
609-
intellijIde(ideVersion)
598+
project("remote-env") {
599+
dependencies {
600+
intellijPlatform {
601+
val ideVersion = if (isStudioIDE || isRiderIDE) ideaVersion else baseVersion
602+
intellijIde(ideVersion)
610603

611-
intellijPlugins(codeWithMePlugin)
612-
}
604+
intellijPlugins(codeWithMePlugin)
605+
}
613606

614-
implementation(project(":intellij-plugin:educational-core"))
607+
implementation(project(":intellij-plugin:educational-core"))
615608

616-
testImplementation(project(":intellij-plugin:educational-core", "testOutput"))
617-
}
609+
testImplementation(project(":intellij-plugin:educational-core", "testOutput"))
618610
}
619611
}
620612

@@ -1190,10 +1182,6 @@ fun manifestFile(project: Project): File? {
11901182
}
11911183
":intellij-plugin:educational-core", ":intellij-plugin:code-insight",
11921184
":intellij-plugin:Edu-Python:Idea", ":intellij-plugin:Edu-Python:PyCharm" -> return manifestFile(project.parent!!)
1193-
":intellij-plugin:remote-env" -> {
1194-
// TODO: drop it after inlining `platform-plugin.xml`
1195-
filePath = "remote-env.xml"
1196-
}
11971185
// Localization module is not supposed to have a plugin manifest.
11981186
// Since it also is not supposed to have any code, only resources, no need to verify anything for it
11991187
":intellij-plugin:localization" -> return null

intellij-plugin/resources/META-INF/plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<xi:include href="/META-INF/educational-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
88
<xi:include href="/META-INF/edu-code-insight.xml" xpointer="xpointer(/idea-plugin/*)"/>
9-
<xi:include href="/META-INF/platform-plugin.xml" xpointer="xpointer(/idea-plugin/*)"/>
109

1110
<!--update description in description.html file instead-->
1211
<description/>
@@ -37,6 +36,7 @@
3736
<module name="sql-core"/>
3837
<module name="sql-jvm"/>
3938
<module name="github"/>
39+
<module name="remote-env"/>
4040

4141
<!-- feature modules -->
4242
<module name="command-line"/>

settings.gradle.kts

+1-6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ include(
3535
"intellij-plugin:sql",
3636
"intellij-plugin:sql:sql-jvm",
3737
"intellij-plugin:github",
38+
"intellij-plugin:remote-env",
3839
"intellij-plugin:localization",
3940
"intellij-plugin:features:command-line",
4041
"intellij-plugin:features:ai-error-explanation",
@@ -45,12 +46,6 @@ include(
4546
"intellij-plugin:features:ide-onboarding"
4647
)
4748

48-
// Temporary workaround to make it work with 2025.1.
49-
// Will be fixed automatically after migration to IJPGP 2.4
50-
if (settings.providers.gradleProperty("environmentName").get().toInt() < 251) {
51-
include("intellij-plugin:remote-env")
52-
}
53-
5449
if (settings.providers.gradleProperty("fleetIntegration").get().toBoolean()) {
5550
include("fleet-plugin")
5651
}

0 commit comments

Comments
 (0)