Dev/253

build.gradle.kts

@@ -366,7 +366,8 @@ coverallsJacoco {
 
 intellijPlatform {
   val pluginList = mutableListOf<String>()
-  val bundledPluginList = mutableListOf(providers.gradleProperty("intelliLangPlugin").get())
+  val bundledModuleList = mutableListOf(providers.gradleProperty("intelliLangModule").get())
+  val bundledPluginList = mutableListOf<String>()
 
   if (!isCI.get()) {
     pluginList.add("PsiViewer:${providers.gradleProperty("psiViewerVersion").get()}")
@@ -408,6 +409,7 @@ intellijPlatform {
         project(":lang.mason.mason2"),
       ).forEach { localPlugin(it) }
       plugins(pluginList)
+      bundledModules(bundledModuleList)
       bundledPlugins(bundledPluginList)
     }
   }

embedded/backend/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
   }
   intellijPlatform{
     val platformVersionProvider: Provider<String> by rootProject.extra
-    create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+    create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
   }

embedded/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
   // Plugin dependencies
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-    create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+    create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

embedded/common/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

embedded/frontend/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

embedded/frontend/split/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

embedded/src/test/resources/unit/distribution/plugin.none.txt

@@ -8,16 +8,16 @@ Jar files:
 Content modules:
  - perl5.lang.embedded.common.main (REQUIRED); lib/modules/perl5.lang.embedded.common.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.common.main)
+    - perl5.plugin.common.main
  - perl5.lang.embedded.backend.main (OPTIONAL); lib/modules/perl5.lang.embedded.backend.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.backend.main)
-    - Module(name=perl5.lang.embedded.common.main)
+    - perl5.plugin.backend.main
+    - perl5.lang.embedded.common.main
  - perl5.lang.embedded.frontend.main (OPTIONAL); lib/modules/perl5.lang.embedded.frontend.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend)
-    - Module(name=perl5.lang.embedded.common.main)
+    - intellij.platform.frontend
+    - perl5.lang.embedded.common.main
  - perl5.lang.embedded.frontend.split.main (OPTIONAL); lib/modules/perl5.lang.embedded.frontend.split.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend.split)
-    - Module(name=perl5.lang.embedded.frontend.main)
+    - intellij.platform.frontend.split
+    - perl5.lang.embedded.frontend.main

gradle.properties

@@ -17,18 +17,19 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 name="Perl5 Support (Camelcade)"
-platformVersion=2025
-platformBranch=.2
+platformVersion=253
+platformBranch=.27864.23-EAP-SNAPSHOT
 platformBuild=
 pluginVersion=
 pluginBranch=
-pluginBuild=.1
+pluginBuild=
 platformToolsVersion=
-useInstaller=true
+useInstaller=false
 pycharmVersion=192.4787.5-EAP-SNAPSHOT
 clionVersion=192.4787.12-EAP-SNAPSHOT
 psiViewerVersion=252.23892.248
-intelliLangPlugin=org.intellij.intelliLang
+intelliLangModule=intellij.platform.langInjection
+intelliLangBackendModule=intellij.platform.langInjection.backend
 remoteRunPlugin=org.jetbrains.plugins.remote-run
 coveragePlugin=Coverage
 javaVersion=21
@@ -39,5 +40,5 @@ templating_lexer_skeleton=grammar/Perl5Templating.skeleton
 descriptionFile=parts/pluginDescription.html
 changesFile=parts/pluginChanges.html
 org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Xss10M
-perl.test.version=5.42.0
+perl.test.version=5.38.0
 kotlin.stdlib.default.dependency=false

mason/framework/common/build.gradle.kts

@@ -24,7 +24,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/framework/frontend/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/framework/frontend/split/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/framework/src/test/resources/unit/distribution/plugin.none.txt

@@ -8,18 +8,18 @@ Jar files:
 Content modules:
  - perl5.lang.mason.framework.backend.main (OPTIONAL); lib/modules/perl5.lang.mason.framework.backend.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.backend.main)
-    - Module(name=perl5.lang.mason.framework.common.main)
+    - perl5.plugin.backend.main
+    - perl5.lang.mason.framework.common.main
  - perl5.lang.mason.framework.common.main (REQUIRED); lib/modules/perl5.lang.mason.framework.common.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.common.main)
+    - perl5.plugin.common.main
  - perl5.lang.mason.framework.frontend.main (OPTIONAL); lib/modules/perl5.lang.mason.framework.frontend.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend.main)
-    - Module(name=perl5.plugin.frontend.main)
-    - Module(name=perl5.lang.mason.framework.common.main)
+    - intellij.platform.frontend.main
+    - perl5.plugin.frontend.main
+    - perl5.lang.mason.framework.common.main
  - perl5.lang.mason.framework.frontend.split.main (OPTIONAL); lib/modules/perl5.lang.mason.framework.frontend.split.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend.split.main)
-    - Module(name=perl5.plugin.frontend.split.main)
-    - Module(name=perl5.lang.mason.framework.frontend.main)
+    - intellij.platform.frontend.split.main
+    - perl5.plugin.frontend.split.main
+    - perl5.lang.mason.framework.frontend.main

mason/htmlmason/common/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/htmlmason/frontend/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/htmlmason/frontend/split/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/htmlmason/src/test/resources/unit/distribution/plugin.none.txt

@@ -8,20 +8,20 @@ Jar files:
 Content modules:
  - perl5.lang.mason.htmlmason.common.main (REQUIRED); lib/modules/perl5.lang.mason.htmlmason.common.main.jar
   - Dependencies:
-    - Module(name=perl5.lang.mason.framework.common.main)
-    - Module(name=perl5.plugin.common.main)
+    - perl5.lang.mason.framework.common.main
+    - perl5.plugin.common.main
  - perl5.lang.mason.htmlmason.backend.main (OPTIONAL); lib/modules/perl5.lang.mason.htmlmason.backend.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.backend.main)
-    - Module(name=perl5.lang.mason.framework.backend.main)
-    - Module(name=perl5.lang.mason.htmlmason.common.main)
+    - perl5.plugin.backend.main
+    - perl5.lang.mason.framework.backend.main
+    - perl5.lang.mason.htmlmason.common.main
  - perl5.lang.mason.htmlmason.frontend.main (OPTIONAL); lib/modules/perl5.lang.mason.htmlmason.frontend.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend)
-    - Module(name=perl5.lang.mason.framework.frontend.main)
-    - Module(name=perl5.lang.mason.htmlmason.common.main)
+    - intellij.platform.frontend
+    - perl5.lang.mason.framework.frontend.main
+    - perl5.lang.mason.htmlmason.common.main
  - perl5.lang.mason.htmlmason.frontend.split.main (OPTIONAL); lib/modules/perl5.lang.mason.htmlmason.frontend.split.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend.split)
-    - Module(name=perl5.lang.mason.htmlmason.frontend.main)
-    - Module(name=perl5.lang.mason.framework.frontend.split.main)
+    - intellij.platform.frontend.split
+    - perl5.lang.mason.htmlmason.frontend.main
+    - perl5.lang.mason.framework.frontend.split.main

mason/mason2/common/build.gradle.kts

@@ -41,7 +41,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/mason2/frontend/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/mason2/frontend/split/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mason/mason2/src/test/resources/unit/distribution/plugin.none.txt

@@ -8,19 +8,19 @@ Jar files:
 Content modules:
  - perl5.lang.mason.mason2.common.main (REQUIRED); lib/modules/perl5.lang.mason.mason2.common.main.jar
   - Dependencies:
-    - Module(name=perl5.lang.mason.framework.common.main)
-    - Module(name=perl5.plugin.common.main)
+    - perl5.lang.mason.framework.common.main
+    - perl5.plugin.common.main
  - perl5.lang.mason.mason2.backend.main (OPTIONAL); lib/modules/perl5.lang.mason.mason2.backend.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.backend.main)
-    - Module(name=perl5.lang.mason.mason2.common.main)
-    - Module(name=perl5.lang.mason.framework.backend.main)
+    - perl5.plugin.backend.main
+    - perl5.lang.mason.mason2.common.main
+    - perl5.lang.mason.framework.backend.main
  - perl5.lang.mason.mason2.frontend.main (OPTIONAL); lib/modules/perl5.lang.mason.mason2.frontend.main.jar
   - Dependencies:
-    - Module(name=perl5.lang.mason.framework.frontend.main)
-    - Module(name=perl5.lang.mason.mason2.common.main)
+    - perl5.lang.mason.framework.frontend.main
+    - perl5.lang.mason.mason2.common.main
  - perl5.lang.mason.mason2.frontend.split.main (OPTIONAL); lib/modules/perl5.lang.mason.mason2.frontend.split.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend.split)
-    - Module(name=perl5.lang.mason.mason2.frontend.main)
-    - Module(name=perl5.lang.mason.framework.frontend.split.main)
+    - intellij.platform.frontend.split
+    - perl5.lang.mason.mason2.frontend.main
+    - perl5.lang.mason.framework.frontend.split.main

mojo/common/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mojo/frontend/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mojo/frontend/split/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }
 

mojo/src/test/resources/unit/distribution/plugin.none.txt

@@ -8,16 +8,16 @@ Jar files:
 Content modules:
  - perl5.lang.mojo.common.main (REQUIRED); lib/modules/perl5.lang.mojo.common.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.common.main)
+    - perl5.plugin.common.main
  - perl5.lang.mojo.backend.main (OPTIONAL); lib/modules/perl5.lang.mojo.backend.main.jar
   - Dependencies:
-    - Module(name=perl5.plugin.backend.main)
-    - Module(name=perl5.lang.mojo.common.main)
+    - perl5.plugin.backend.main
+    - perl5.lang.mojo.common.main
  - perl5.lang.mojo.frontend.main (OPTIONAL); lib/modules/perl5.lang.mojo.frontend.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend)
-    - Module(name=perl5.lang.mojo.common.main)
+    - intellij.platform.frontend
+    - perl5.lang.mojo.common.main
  - perl5.lang.mojo.frontend.split.main (OPTIONAL); lib/modules/perl5.lang.mojo.frontend.split.main.jar
   - Dependencies:
-    - Module(name=intellij.platform.frontend.split)
-    - Module(name=perl5.lang.mojo.frontend.main)
+    - intellij.platform.frontend.split
+    - perl5.lang.mojo.frontend.main

plugin/asdf/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
   }
   intellijPlatform {
     val platformVersionProvider: Provider<String> by rootProject.extra
-        create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersionProvider.get()){
+        create(IntelliJPlatformType.IntellijIdeaUltimate, platformVersionProvider.get()){
       useInstaller = providers.gradleProperty("useInstaller").get().toBoolean()
     }