Skip to content

Commit

Permalink
Add 2023.1 and 2023.2 compatibility. Minimal required version is now …
Browse files Browse the repository at this point in the history
…2022.3
  • Loading branch information
Exidex committed Aug 22, 2023
1 parent a0db0bf commit dcb1573
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ jobs:
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.0.4

# Setup Java 11 environment for the next steps
# Setup Java 17 environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
java-version: 17

# Set environment variables
- name: Export Properties
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
with:
ref: ${{ github.event.release.tag_name }}

# Setup Java 11 environment for the next steps
# Setup Java 17 environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
java-version: 17

# Set environment variables
- name: Export Properties
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ jobs:
- name: Fetch Sources
uses: actions/checkout@v3

# Setup Java 11 environment for the next steps
# Setup Java 17 environment for the next steps
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11
java-version: 17

# Run IDEA prepared for UI testing
- name: Run IDE
Expand Down
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
# intellij-kdl Changelog

## [Unreleased]
### Added
- 2023.1 and 2023.2 compatibility
- Minimal required version is now 2022.3

## [1.0.1]
### Added
### Added
- 2022.3 compatibility

## [1.0.0]
Expand Down
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
id("org.jetbrains.intellij") version "1.9.0"
id("org.jetbrains.changelog") version "1.3.1"
id("org.jetbrains.qodana") version "0.1.13"
id("org.jetbrains.grammarkit") version "2021.2.2"
id("org.jetbrains.grammarkit") version "2022.3.1"
id("org.ajoberstar.grgit") version "5.0.0"
}

Expand All @@ -25,7 +25,7 @@ repositories {

kotlin {
jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
languageVersion.set(JavaLanguageVersion.of(17))
}
}

Expand Down Expand Up @@ -114,21 +114,21 @@ sourceSets {
}

val generateKdlLexer = task<GenerateLexerTask>("generateKdlLexer") {
source.set("src/main/grammars/KdlLexer.flex")
sourceFile.set(file("src/main/grammars/KdlLexer.flex"))
targetDir.set("src/genparser/dev/kdl/lang/lexer")
targetClass.set("KdlLexer")
purgeOldFiles.set(true)
}

val generateKdlStringLexer = task<GenerateLexerTask>("generateKdlStringLexer") {
source.set("src/main/grammars/KdlStringLexer.flex")
sourceFile.set(file("src/main/grammars/KdlStringLexer.flex"))
targetDir.set("src/genparser/dev/kdl/lang/escape")
targetClass.set("KdlStringLexer")
purgeOldFiles.set(true)
}

val generateKdlParser = task<GenerateParserTask>("generateKdlParser") {
source.set("src/main/grammars/KdlParser.bnf")
sourceFile.set(file("src/main/grammars/KdlParser.bnf"))
targetRoot.set("src/genparser")
pathToParser.set("dev/kdl/lang/parser/KdlParser.java")
pathToPsiRoot.set("dev/kdl/lang/psi")
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
pluginGroup=dev.kdl
pluginName=intellij-kdl
pluginVersion=1.0.1
pluginVersion=2.0.0

pluginSinceBuild=213
pluginUntilBuild=223.*
pluginSinceBuild=223
pluginUntilBuild=232.*

platformType=IC
platformVersion=2021.3.3
platformVersion=2022.3

platformPlugins=PsiViewer:213-SNAPSHOT
platformPlugins=PsiViewer:2022.3

gradleVersion=7.5.1

Expand Down

0 comments on commit dcb1573

Please sign in to comment.