Skip to content
Snippets Groups Projects
Commit 02363fa0 authored by Johannes Mey's avatar Johannes Mey
Browse files

update

parent 0cc1822c
No related branches found
No related tags found
1 merge request!21Chore/support for intellijj 2024.2
Pipeline #19288 failed
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
## [Unreleased] ## [Unreleased]
### Added ### Added
- Support for IntelliJ IDEA 2024.1.
### Changed ### Changed
......
...@@ -15,15 +15,15 @@ plugins { ...@@ -15,15 +15,15 @@ plugins {
// Kotlin support // Kotlin support
id("org.jetbrains.kotlin.jvm") version "1.9.0" id("org.jetbrains.kotlin.jvm") version "1.9.0"
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
id("org.jetbrains.intellij") version "1.15.0" id("org.jetbrains.intellij") version "1.17.3"
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
id("org.jetbrains.changelog") version "2.0.0" id("org.jetbrains.changelog") version "2.0.0"
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
id("io.gitlab.arturbosch.detekt") version "1.23.0" id("io.gitlab.arturbosch.detekt") version "1.23.3"
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
id("org.jlleitschuh.gradle.ktlint") version "11.3.2" id("org.jlleitschuh.gradle.ktlint") version "12.1.1"
// grammrkit - read more: https://plugins.gradle.org/plugin/org.jetbrains.grammarkit // grammrkit - read more: https://plugins.gradle.org/plugin/org.jetbrains.grammarkit
id("org.jetbrains.grammarkit") version "2022.3.1" id("org.jetbrains.grammarkit") version "2022.3.2.2"
} }
group = properties("pluginGroup") group = properties("pluginGroup")
...@@ -35,8 +35,8 @@ repositories { ...@@ -35,8 +35,8 @@ repositories {
} }
java { java {
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_17
} }
idea { idea {
...@@ -82,15 +82,14 @@ tasks { ...@@ -82,15 +82,14 @@ tasks {
val generateGrammarLexer = task<GenerateLexerTask>("generateGrammarLexer") { val generateGrammarLexer = task<GenerateLexerTask>("generateGrammarLexer") {
sourceFile.set(file("src/main/grammar/Grammar.flex")) sourceFile.set(file("src/main/grammar/Grammar.flex"))
targetDir.set("src/gen/java/org/jastadd/tooling/grammar/lexer/") targetOutputDir.set(file("src/gen/java/org/jastadd/tooling/grammar/lexer/"))
targetClass.set("GrammarLexer")
purgeOldFiles.set(true) purgeOldFiles.set(true)
} }
// not fully working because of https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/3 // not fully working because of https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/3
val generateGrammarParser = task<GenerateParserTask>("generateGrammarParser") { val generateGrammarParser = task<GenerateParserTask>("generateGrammarParser") {
sourceFile.set(file("src/main/grammar/Grammar.bnf")) sourceFile.set(file("src/main/grammar/Grammar.bnf"))
targetRoot.set("src/gen/java") targetRootOutputDir.set(file("src/gen/java"))
pathToParser.set("/org/jastadd/tooling/grammar/GrammarParser.java") pathToParser.set("/org/jastadd/tooling/grammar/GrammarParser.java")
pathToPsiRoot.set("/org/jastadd/tooling/grammar/psi") pathToPsiRoot.set("/org/jastadd/tooling/grammar/psi")
purgeOldFiles.set(true) purgeOldFiles.set(true)
...@@ -98,15 +97,14 @@ tasks { ...@@ -98,15 +97,14 @@ tasks {
val generateAspectLexer = task<GenerateLexerTask>("generateAspectLexer") { val generateAspectLexer = task<GenerateLexerTask>("generateAspectLexer") {
sourceFile.set(file("src/main/grammar/Aspect.flex")) sourceFile.set(file("src/main/grammar/Aspect.flex"))
targetDir.set("src/gen/java/org/jastadd/tooling/aspect/lexer/") targetOutputDir.set(file("src/gen/java/org/jastadd/tooling/aspect/lexer/"))
targetClass.set("AspectLexer")
purgeOldFiles.set(true) purgeOldFiles.set(true)
} }
// not fully working because of https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/3 // not fully working because of https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/3
val generateAspectParser = task<GenerateParserTask>("generateAspectParser") { val generateAspectParser = task<GenerateParserTask>("generateAspectParser") {
sourceFile.set(file("src/main/grammar/Aspect.bnf")) sourceFile.set(file("src/main/grammar/Aspect.bnf"))
targetRoot.set("src/gen/java") targetRootOutputDir.set(file("src/gen/java"))
pathToParser.set("/org/jastadd/tooling/aspect/AspectParser.java") pathToParser.set("/org/jastadd/tooling/aspect/AspectParser.java")
pathToPsiRoot.set("/org/jastadd/tooling/aspect/psi") pathToPsiRoot.set("/org/jastadd/tooling/aspect/psi")
purgeOldFiles.set(true) purgeOldFiles.set(true)
...@@ -119,7 +117,6 @@ tasks { ...@@ -119,7 +117,6 @@ tasks {
dependsOn(generateAspectParser) dependsOn(generateAspectParser)
} }
// Set the compatibility versions to 1.8
withType<JavaCompile> { withType<JavaCompile> {
sourceCompatibility = "17" sourceCompatibility = "17"
targetCompatibility = "17" targetCompatibility = "17"
......
...@@ -9,11 +9,11 @@ pluginRepositoryUrl = https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin/ ...@@ -9,11 +9,11 @@ pluginRepositoryUrl = https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin/
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions. # for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild = 223 pluginSinceBuild = 223
pluginUntilBuild = 233.* pluginUntilBuild = 241.*
## Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl ## Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
## See https://jb.gg/intellij-platform-builds-list for available build versions. ## See https://jb.gg/intellij-platform-builds-list for available build versions.
#pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1.2 pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1.2
platformType = IC platformType = IC
platformVersion = 2023.3.2 platformVersion = 2023.3.2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment