Migrated to the grammar-kit plugin 2022.3.2.2

Camelcade · Apr 5, 2024 · 3547fc8 · 3547fc8
1 parent f3dcfae
commit 3547fc8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -35,7 +35,7 @@ plugins {
   id("idea")
   id("jacoco")
   id("org.jetbrains.intellij") version "1.17.3"
-  id("org.jetbrains.grammarkit") version "2022.3.2.1"
+  id("org.jetbrains.grammarkit") version "2022.3.2.2"
   id("com.github.kt3k.coveralls") version "2.12.2"
   id("org.sonarqube") version "5.0.0.4638"
   id("org.jetbrains.qodana") version "0.1.13"

diff --git a/embedded/core/build.gradle.kts b/embedded/core/build.gradle.kts
@@ -37,8 +37,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateEmbeddedPerlLexer") {
     sourceFile.set(file("grammar/EmbeddedPerl.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/embedded/lexer/")
-    targetClass.set("EmbeddedPerlLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/embedded/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

diff --git a/mason/htmlmason/core/build.gradle.kts b/mason/htmlmason/core/build.gradle.kts
@@ -38,8 +38,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateHTMLMasonLexer") {
     sourceFile.set(file("grammar/HTMLMason.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/htmlmason/lexer/")
-    targetClass.set("HTMLMasonLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/htmlmason/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

diff --git a/mason/mason2/core/build.gradle.kts b/mason/mason2/core/build.gradle.kts
@@ -38,8 +38,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateMason2Lexer") {
     sourceFile.set(file("grammar/Mason2.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/mason2/lexer/")
-    targetClass.set("Mason2TemplatingLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/mason2/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

diff --git a/mojo/core/build.gradle.kts b/mojo/core/build.gradle.kts
@@ -38,8 +38,7 @@ dependencies {
 tasks {
   val generateLexerTask = register<GenerateLexerTask>("generateMojoliciousLexer") {
     sourceFile.set(file("grammar/Mojolicious.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/mojolicious/lexer/")
-    targetClass.set("MojoliciousLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/mojolicious/lexer/"))
     skeleton.set(rootProject.file(properties("templating_lexer_skeleton").get()))
     purgeOldFiles.set(true)
   }

diff --git a/plugin/core/build.gradle.kts b/plugin/core/build.gradle.kts
@@ -43,15 +43,13 @@ tasks {
 
   val generatePerlLexerTask = register<GenerateLexerTask>("generatePerlLexer") {
     sourceFile.set(file("grammar/Perl.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/perl/lexer/")
-    targetClass.set("PerlLexer")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/perl/lexer/"))
 
     dependsOn(generatePerlParserTask)
   }
   val generatePodLexerTask = register<GenerateLexerTask>("generatePodLexer") {
     sourceFile.set(file("grammar/Pod.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/pod/lexer/")
-    targetClass.set("PodLexerGenerated")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/pod/lexer/"))
 
     dependsOn(generatePodParserTask)
   }
@@ -66,7 +64,7 @@ tasks {
   }
 
   withType<GenerateParserTask> {
-    targetRoot.set(genRoot.canonicalPath)
+    targetRootOutputDir.set(genRoot)
     purgeOldFiles.set(true)
   }
 

diff --git a/tt2/core/build.gradle.kts b/tt2/core/build.gradle.kts
@@ -41,14 +41,13 @@ tasks {
     sourceFile.set(file("grammar/TemplateToolkit.bnf"))
     pathToParser.set("/com/perl5/lang/tt2/parser/TemplateToolkitParserGenerated.java")
     pathToPsiRoot.set("/com/perl5/lang/tt2/psi")
-    targetRoot.set(genRoot.canonicalPath)
+    targetRootOutputDir.set(genRoot)
     purgeOldFiles.set(true)
   }
 
   val generateLexerTask = register<GenerateLexerTask>("generateTT2Lexer") {
     sourceFile.set(file("grammar/TemplateToolkit.flex"))
-    targetDir.set("src/main/gen/com/perl5/lang/tt2/lexer/")
-    targetClass.set("TemplateToolkitLexerGenerated")
+    targetOutputDir.set(file("src/main/gen/com/perl5/lang/tt2/lexer/"))
     skeleton.set(rootProject.file(properties("lexer_skeleton").get()))
     purgeOldFiles.set(true)