Skip to content

Commit

Permalink
Update dependencies and support 2022.1 IDEs
Browse files Browse the repository at this point in the history
  • Loading branch information
AzureMarker committed Apr 15, 2022
1 parent 275e6c2 commit 63bbdfb
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
plugins {
id 'org.jetbrains.intellij' version '1.4.0'
id 'org.jetbrains.kotlin.jvm' version '1.5.20'
id 'org.jetbrains.grammarkit' version '2021.1.3'
id 'org.jetbrains.intellij' version '1.5.2'
id 'org.jetbrains.kotlin.jvm' version '1.6.20'
id 'org.jetbrains.grammarkit' version '2021.2.2'
id 'idea'
}

import org.jetbrains.grammarkit.tasks.*

group 'com.mdrobnak'
version '0.2.9'

Expand All @@ -15,7 +13,7 @@ repositories {
}

dependencies {
implementation 'io.sentry:sentry:5.6.1'
implementation 'io.sentry:sentry:5.7.2'

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
Expand All @@ -25,20 +23,14 @@ dependencies {
sourceSets.main.java.srcDirs 'src/main/gen'
idea.module.generatedSourceDirs.add(file('src/main/gen'))

grammarKit {
// Fix a error during parser generation. Might be related to
// https://github.com/JetBrains/gradle-grammar-kit-plugin/issues/48
grammarKitRelease = "2021.1.2"
}

task generateLexer(type: GenerateLexer) {
generateLexer {
source = "src/main/grammars/LalrpopLexer.flex"
targetDir = "src/main/gen/com/mdrobnak/lalrpop/lexer"
targetClass = "LalrpopLexer"
purgeOldFiles = true
}

task generateParser(type: GenerateParser) {
generateParser {
source = "src/main/grammars/LalrpopParser.bnf"
targetRoot = "src/main/gen/"
pathToParser = "/com/mdrobnak/lalrpop/parser/LalrpopParser.java"
Expand All @@ -49,27 +41,35 @@ task generateParser(type: GenerateParser) {
// See https://github.com/JetBrains/gradle-intellij-plugin/
intellij {
// Test with a recent EAP or release
version = '2021.3.2'
plugins = ['PsiViewer:213-SNAPSHOT', 'org.rust.lang:0.4.165.4438-213', 'org.toml.lang:213.5744.224']
version = '2022.1'
plugins = ['PsiViewer:221-SNAPSHOT', 'org.rust.lang:0.4.168.4555-221', 'org.toml.lang:221.5080.126']

// Don't limit the untilBuild value to the current major IDE version
sameSinceUntilBuild = true
updateSinceUntilBuild = false
}
compileKotlin {
kotlinOptions {
jvmTarget = "11"
apiVersion = "1.4"
apiVersion = "1.5"
freeCompilerArgs = ["-Xjvm-default=enable"]
}

dependsOn(generateLexer, generateParser)
}
runPluginVerifier {
ideVersions = ["IIC-2021.3.2"]
ideVersions = ["IIC-2022.1"]
}
publishPlugin {
token = System.getenv("ORG_GRADLE_PROJECT_intellijPublishToken")
}
buildSearchableOptions {
// This is really flaky and we probably don't need it
enabled = false
}
patchPluginXml {
// Support 2021.3
sinceBuild = "213.6461"
// Support 2022.1
sinceBuild = "221"

changeNotes = """
<b>0.2.9</b><br>
Expand Down

0 comments on commit 63bbdfb

Please # to comment.