Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jetbrains-plugin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
jetbrains-plugin
Commits
c4686066
Commit
c4686066
authored
2 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
ensure compatibility
parent
2d058237
No related branches found
No related tags found
1 merge request
!18
Chore/support for intellij 2023.1
Pipeline
#16392
failed
2 years ago
Stage: test
Stage: jar
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
build.gradle.kts
+34
-29
34 additions, 29 deletions
build.gradle.kts
gradle.properties
+3
-3
3 additions, 3 deletions
gradle.properties
gradle/wrapper/gradle-wrapper.properties
+1
-1
1 addition, 1 deletion
gradle/wrapper/gradle-wrapper.properties
with
38 additions
and
33 deletions
build.gradle.kts
+
34
−
29
View file @
c4686066
import
io.gitlab.arturbosch.detekt.Detekt
import
io.gitlab.arturbosch.detekt.Detekt
import
org.jetbrains.changelog.markdownToHTML
import
org.jetbrains.changelog.markdownToHTML
import
org.jetbrains.grammarkit.tasks.GenerateLexer
import
org.jetbrains.grammarkit.tasks.GenerateLexer
Task
import
org.jetbrains.grammarkit.tasks.GenerateParser
import
org.jetbrains.grammarkit.tasks.GenerateParser
Task
import
org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import
org.jetbrains.kotlin.gradle.tasks.KotlinCompile
fun
properties
(
key
:
String
)
=
project
.
findProperty
(
key
).
toString
()
fun
properties
(
key
:
String
)
=
project
.
findProperty
(
key
).
toString
()
...
@@ -22,7 +22,7 @@ plugins {
...
@@ -22,7 +22,7 @@ plugins {
// 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
"10.2.0"
id
(
"org.jlleitschuh.gradle.ktlint"
)
version
"10.2.0"
id
(
"org.jetbrains.grammarkit"
)
version
"202
1.1.3
"
id
(
"org.jetbrains.grammarkit"
)
version
"202
2.3.1
"
}
}
group
=
properties
(
"pluginGroup"
)
group
=
properties
(
"pluginGroup"
)
...
@@ -87,36 +87,36 @@ detekt {
...
@@ -87,36 +87,36 @@ detekt {
tasks
{
tasks
{
val
generateGrammarLexer
=
task
<
GenerateLexer
>(
"generateGrammarLexer"
)
{
val
generateGrammarLexer
=
task
<
GenerateLexer
Task
>(
"generateGrammarLexer"
)
{
source
=
"src/main/grammar/Grammar.flex"
source
File
.
set
(
file
(
"src/main/grammar/Grammar.flex"
))
targetDir
=
"src/gen/java/org/jastadd/tooling/grammar/lexer/"
targetDir
.
set
(
"src/gen/java/org/jastadd/tooling/grammar/lexer/"
)
targetClass
=
"GrammarLexer"
targetClass
.
set
(
"GrammarLexer"
)
purgeOldFiles
=
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
<
GenerateParser
>(
"generateGrammarParser"
)
{
val
generateGrammarParser
=
task
<
GenerateParser
Task
>(
"generateGrammarParser"
)
{
source
=
"src/main/grammar/Grammar.bnf"
source
File
.
set
(
file
(
"src/main/grammar/Grammar.bnf"
))
targetRoot
=
"src/gen/java"
targetRoot
.
set
(
"src/gen/java"
)
pathToParser
=
"/org/jastadd/tooling/grammar/GrammarParser.java"
pathToParser
.
set
(
"/org/jastadd/tooling/grammar/GrammarParser.java"
)
pathToPsiRoot
=
"/org/jastadd/tooling/grammar/psi"
pathToPsiRoot
.
set
(
"/org/jastadd/tooling/grammar/psi"
)
purgeOldFiles
=
true
purgeOldFiles
.
set
(
true
)
}
}
val
generateAspectLexer
=
task
<
GenerateLexer
>(
"generateAspectLexer"
)
{
val
generateAspectLexer
=
task
<
GenerateLexer
Task
>(
"generateAspectLexer"
)
{
source
=
"src/main/grammar/Aspect.flex"
source
File
.
set
(
file
(
"src/main/grammar/Aspect.flex"
))
targetDir
=
"src/gen/java/org/jastadd/tooling/aspect/lexer/"
targetDir
.
set
(
"src/gen/java/org/jastadd/tooling/aspect/lexer/"
)
targetClass
=
"AspectLexer"
targetClass
.
set
(
"AspectLexer"
)
purgeOldFiles
=
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
<
GenerateParser
>(
"generateAspectParser"
)
{
val
generateAspectParser
=
task
<
GenerateParser
Task
>(
"generateAspectParser"
)
{
source
=
"src/main/grammar/Aspect.bnf"
source
File
.
set
(
file
(
"src/main/grammar/Aspect.bnf"
))
targetRoot
=
"src/gen/java"
targetRoot
.
set
(
"src/gen/java"
)
pathToParser
=
"/org/jastadd/tooling/aspect/AspectParser.java"
pathToParser
.
set
(
"/org/jastadd/tooling/aspect/AspectParser.java"
)
pathToPsiRoot
=
"/org/jastadd/tooling/aspect/psi"
pathToPsiRoot
.
set
(
"/org/jastadd/tooling/aspect/psi"
)
purgeOldFiles
=
true
purgeOldFiles
.
set
(
true
)
}
}
compileJava
{
compileJava
{
...
@@ -128,15 +128,15 @@ tasks {
...
@@ -128,15 +128,15 @@ tasks {
// Set the compatibility versions to 1.8
// Set the compatibility versions to 1.8
withType
<
JavaCompile
>
{
withType
<
JavaCompile
>
{
sourceCompatibility
=
"1
.8
"
sourceCompatibility
=
"1
7
"
targetCompatibility
=
"1
.8
"
targetCompatibility
=
"1
7
"
}
}
withType
<
KotlinCompile
>
{
withType
<
KotlinCompile
>
{
kotlinOptions
.
jvmTarget
=
"1
.8
"
kotlinOptions
.
jvmTarget
=
"1
7
"
}
}
withType
<
Detekt
>
{
withType
<
Detekt
>
{
jvmTarget
=
"1
.8
"
jvmTarget
=
"1
7
"
}
}
patchPluginXml
{
patchPluginXml
{
...
@@ -165,6 +165,11 @@ tasks {
...
@@ -165,6 +165,11 @@ tasks {
ideVersions
.
set
(
properties
(
"pluginVerifierIdeVersions"
).
split
(
','
).
map
(
String
::
trim
).
filter
(
String
::
isNotEmpty
))
ideVersions
.
set
(
properties
(
"pluginVerifierIdeVersions"
).
split
(
','
).
map
(
String
::
trim
).
filter
(
String
::
isNotEmpty
))
}
}
buildSearchableOptions
{
// otherwise the build fails
enabled
=
false
}
publishPlugin
{
publishPlugin
{
dependsOn
(
"patchChangelog"
)
dependsOn
(
"patchChangelog"
)
token
.
set
(
System
.
getenv
(
"PUBLISH_TOKEN"
))
token
.
set
(
System
.
getenv
(
"PUBLISH_TOKEN"
))
...
...
This diff is collapsed.
Click to expand it.
gradle.properties
+
3
−
3
View file @
c4686066
...
@@ -7,15 +7,15 @@ pluginVersion = 0.3.1
...
@@ -7,15 +7,15 @@ pluginVersion = 0.3.1
# 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
=
2
11
pluginSinceBuild
=
2
22
pluginUntilBuild
=
231.*
pluginUntilBuild
=
231.*
# 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
=
2021.1.3, 2021.2.4, 2021.3.3, 2022.1.4,
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.1
.2
platformVersion
=
202
2.
3.1
platformDownloadSources
=
true
platformDownloadSources
=
true
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
...
...
This diff is collapsed.
Click to expand it.
gradle/wrapper/gradle-wrapper.properties
+
1
−
1
View file @
c4686066
distributionBase
=
GRADLE_USER_HOME
distributionBase
=
GRADLE_USER_HOME
distributionPath
=
wrapper/dists
distributionPath
=
wrapper/dists
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
6.9.1
-bin.zip
distributionUrl
=
https
\:
//services.gradle.org/distributions/gradle-
7.6
-bin.zip
zipStoreBase
=
GRADLE_USER_HOME
zipStoreBase
=
GRADLE_USER_HOME
zipStorePath
=
wrapper/dists
zipStorePath
=
wrapper/dists
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment