Skip to content

Commit

Permalink
Update to 2023.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Aleksey Medvedev committed May 17, 2023
1 parent e046a6c commit b5871c3
Show file tree
Hide file tree
Showing 7 changed files with 296 additions and 214 deletions.
30 changes: 15 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ buildscript {
}

plugins {
id "org.jetbrains.intellij" version "1.8.0"
id "org.jetbrains.grammarkit" version "2021.2.2"
id "org.jetbrains.intellij" version "1.13.3"
id "org.jetbrains.grammarkit" version "2022.3.1"
}

group 'org.cutejs'
version '1.1.1'
version '1.1.2'

sourceCompatibility = "11"
targetCompatibility = "11"
sourceCompatibility = "17"
targetCompatibility = "17"

apply plugin: 'kotlin'
apply plugin: 'org.jetbrains.intellij'
Expand All @@ -41,23 +41,23 @@ repositories {
}

dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.12'
compileOnly fileTree(dir: '/opt/phpstorm/plugins/JavaScriptLanguage/lib', include: ['JavaScriptLanguage.jar', 'javascript-openapi.jar', 'resources_en.jar', 'js-test-common.jar'])
testImplementation group: 'junit', name: 'junit', version: '4.13.1'
compileOnly fileTree(dir: '/opt/phpstorm/plugins/javascript-impl/lib', include: ['javascript-impl.jar', 'javascript-openapi.jar', 'resources_en.jar', 'js-test-common.jar'])
}

intellij {
version = '2022.2'
version = '2023.1'
runIde { ideDir = file('/opt/phpstorm') }
downloadSources = true
pluginName = 'cutejs-intellij-plugin'
plugins = ['PsiViewer:222-SNAPSHOT']
plugins = ['PsiViewer:231-SNAPSHOT']
}

patchPluginXml {
sinceBuild = "203"
sinceBuild = "231"
changeNotes = """
<ul>
<li>Support for 2022.2 Intellij platform.</li>
<li>Support for 2023.1 Intellij platform.</li>
</ul>
"""
}
Expand All @@ -71,8 +71,8 @@ import org.jetbrains.grammarkit.tasks.GenerateParserTask
def GENERATE_GROUP = 'Generate'

task generateCuteJSLexer(type: GenerateLexerTask) {
source = "src/main/grammar/CuteJS.flex"
targetDir = "src/main/gen/org/cutejs/lang/lexer"
sourceFile = file('src/main/grammar/CuteJS.flex')
targetDir = 'src/main/gen/org/cutejs/lang/lexer'
targetClass = "_CuteLexer"
purgeOldFiles = true

Expand All @@ -81,7 +81,7 @@ task generateCuteJSLexer(type: GenerateLexerTask) {
}

task generateCuteJSParser(type: GenerateParserTask) {
source = "src/main/grammar/CuteJS.bnf"
sourceFile = file('src/main/grammar/CuteJS.bnf')
targetRoot = 'src/main/gen'
pathToParser = 'src/main/gen/org/cutejs/lang/CuteParser.java'
pathToPsiRoot = 'src/main/gen/org/cutejs/lang/psi'
Expand All @@ -95,7 +95,7 @@ task generateCuteJSParser(type: GenerateParserTask) {
}

compileKotlin {
kotlinOptions.jvmTarget = "11"
kotlinOptions.jvmTarget = "17"
}
compileJava {
dependsOn generateCuteJSLexer
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit b5871c3

Please sign in to comment.