Provide a specific configuration for the generate tasks pre-configure…

…d with the required dependencies (#37) * Provide a specific configuration for the generate tasks pre-configured with the required dependencies * Update to make intellij release version optional
JetBrains · May 5, 2021 · b606a6a · b606a6a
1 parent 478d30a
commit b606a6a
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -29,6 +29,9 @@ grammarKit {
 
     // tag or short commit hash of Grammar-Kit to use (see link below). Default is 2020.3.1
     grammarKitRelease = '6452fde524'
+  
+    // optionally provide an IntelliJ version to build the classpath for GenerateParser/GenerateLexer tasks
+    intellijRelease = '203.7717.81'
 }
 ```
 

diff --git a/src/main/groovy/org/jetbrains/grammarkit/GrammarKit.groovy b/src/main/groovy/org/jetbrains/grammarkit/GrammarKit.groovy
@@ -11,24 +11,71 @@ class GrammarKit implements Plugin<Project> {
         target.afterEvaluate {
             target.repositories {
                 maven { url "https://cache-redirector.jetbrains.com/intellij-dependencies" }
+                maven { url "https://www.jetbrains.com/intellij-repository/releases" }
                 maven { url 'https://www.jitpack.io' }
             }
-            target.dependencies.add(
-                    JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME,
-                    "com.github.JetBrains:Grammar-Kit:${grammarKitExtension.grammarKitRelease}",
-                    {
-                        exclude group: 'org.jetbrains.plugins'
-                        exclude module: 'idea'
-                    })
-            target.dependencies.add(
-                    JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME,
-                    "org.jetbrains.intellij.deps.jflex:jflex:${grammarKitExtension.jflexRelease}",
-                    {
-                        exclude group: 'org.jetbrains.plugins'
-                        exclude module: 'idea'
-                        exclude module: 'ant'
-                    }
-            )
+            if (grammarKitExtension.intellijRelease == null) {
+                target.dependencies.add(
+                        JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME,
+                        "com.github.JetBrains:Grammar-Kit:${grammarKitExtension.grammarKitRelease}",
+                        {
+                            exclude group: 'org.jetbrains.plugins'
+                            exclude module: 'idea'
+                        })
+                target.dependencies.add(
+                        JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME,
+                        "org.jetbrains.intellij.deps.jflex:jflex:${grammarKitExtension.jflexRelease}",
+                        {
+                            exclude group: 'org.jetbrains.plugins'
+                            exclude module: 'idea'
+                            exclude module: 'ant'
+                        }
+                )
+            } else {
+                configureGrammarKitClassPath()
+            }
+        }
+    }
+
+    void configureGrammarKitClassPath(Project target) {
+        target.configurations {
+            grammarKitClassPath
+        }
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "com.github.JetBrains:Grammar-Kit:${grammarKitExtension.grammarKitRelease}"
+        )
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "org.jetbrains.intellij.deps.jflex:jflex:${grammarKitExtension.jflexRelease}"
+        )
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "com.jetbrains.intellij.platform:indexing-impl:${grammarKitExtension.intellijRelease}"
+        )
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "com.jetbrains.intellij.platform:analysis-impl:${grammarKitExtension.intellijRelease}"
+        )
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "com.jetbrains.intellij.platform:core-impl:${grammarKitExtension.intellijRelease}"
+        )
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "com.jetbrains.intellij.platform:lang-impl:${grammarKitExtension.intellijRelease}"
+        )
+        target.dependencies.add(
+                target.configurations.grammarKitClassPath.name,
+                "org.jetbrains.intellij.deps:asm-all:7.0.1"
+        )
+        target.configurations.grammarKitClassPath {
+            exclude group: 'com.jetbrains.rd'
+            exclude group: 'org.jetbrains.marketplace'
+            exclude group: 'org.roaringbitmap'
+            exclude group: 'org.jetbrains.plugins'
+            exclude module: 'idea'
+            exclude module: 'ant'
         }
     }
 }
diff --git a/src/main/groovy/org/jetbrains/grammarkit/GrammarKitPluginExtension.groovy b/src/main/groovy/org/jetbrains/grammarkit/GrammarKitPluginExtension.groovy
@@ -3,5 +3,6 @@ package org.jetbrains.grammarkit
 class GrammarKitPluginExtension {
     def grammarKitRelease = '2020.3.1'
     def jflexRelease = '1.7.0-1'
+    String intellijRelease = null
 }
 
diff --git a/src/main/groovy/org/jetbrains/grammarkit/tasks/GenerateLexer.groovy b/src/main/groovy/org/jetbrains/grammarkit/tasks/GenerateLexer.groovy
@@ -35,7 +35,12 @@ class GenerateLexer extends BaseTask {
             newArgs.add(flexFile)
             args(newArgs)
 
-            classpath project.configurations.compileClasspath.files.findAll({ it.name.startsWith("jflex") })
+            if (project.configurations.hasProperty("grammarKitClassPath")) {
+                classpath project.configurations.grammarKitClassPath
+            } else {
+                classpath project.configurations.compileClasspath.files.findAll(
+                        { it.name.startsWith("jflex") })
+            }
 
             purgeFiles(targetFile)
         })

diff --git a/src/main/groovy/org/jetbrains/grammarkit/tasks/GenerateParser.groovy b/src/main/groovy/org/jetbrains/grammarkit/tasks/GenerateParser.groovy
@@ -35,14 +35,18 @@ class GenerateParser extends BaseTask {
                     "testFramework"
             ]
 
-            classpath project.configurations.compileClasspath.files.findAll({
-                for (lib in requiredLibs) {
-                    if (it.name.equalsIgnoreCase("${lib}.jar") || it.name.startsWith("${lib}-")) {
-                        return true;
+            if (project.configurations.hasProperty("grammarKitClassPath")) {
+                classpath project.configurations.grammarKitClassPath
+            } else {
+                classpath project.configurations.compileClasspath.files.findAll({
+                    for (lib in requiredLibs) {
+                        if (it.name.equalsIgnoreCase("${lib}.jar") || it.name.startsWith("${lib}-")) {
+                            return true;
+                        }
                     }
-                }
-                return false;
-            })
+                    return false;
+                })
+            }
 
             purgeFiles(parserFile, psiDir)
         }