Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Intellij to 2023.3 #563

Merged
merged 1 commit into from
Sep 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ allprojects {
maven { url 'https://www.jetbrains.com/intellij-repository/releases' }
maven { url "https://cache-redirector.jetbrains.com/intellij-dependencies" }
maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies" }
maven { url "https://maven.pkg.jetbrains.space/public/p/ktor/eap" }
}

group = GROUP
Expand All @@ -36,7 +35,7 @@ allprojects {
subprojects {
apply(plugin: "org.jetbrains.kotlin.jvm")

kotlin.jvmToolchain(11)
kotlin.jvmToolchain(17)

tasks.withType(Test).configureEach {
testLogging {
Expand All @@ -53,5 +52,6 @@ subprojects {
exclude group: 'ai.grazie.spell'
exclude group: 'ai.grazie.utils'
exclude group: 'ai.grazie.nlp'
exclude group: 'ai.grazie.model'
}
}
5 changes: 4 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ dependencies {

testImplementation libs.junit
testImplementation libs.truth
testImplementation(libs.bundles.intelliJ)
testImplementation(libs.bundles.intelliJ) {
exclude(group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core")
}
testImplementation libs.coroutines.core
}

generateLexer {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ open class SqlCoreEnvironment(
ProjectRootManagerImpl(projectEnvironment.project),
)

System.setProperty("platform.projectModel.workspace.model.file.index", "false")
projectEnvironment.project.registerService(
DirectoryIndex::class.java,
DirectoryIndexImpl(projectEnvironment.project),
Expand Down
10 changes: 8 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
[versions]
ideaVersion = "222.4459.24" # Flamingo | 2022.2.1 (see https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html)
# AS releases: https://plugins.jetbrains.com/docs/intellij/android-studio-releases-list.html
# IC sources: https://www.jetbrains.com/intellij-repository/releases
# choose a matching/similar build
ideaVersion = "223.8836.41" # AS Giraffe | IC-2022.3.3
kotlin = "1.9.10"

[libraries]
intellijCoreImpl = { module = "com.jetbrains.intellij.platform:core-impl", version.ref = "ideaVersion" }
intellijProjectModelImpl = { module = "com.jetbrains.intellij.platform:project-model-impl", version.ref = "ideaVersion" }
intellijAnalysisImpl = { module = "com.jetbrains.intellij.platform:analysis-impl", version.ref = "ideaVersion" }
intellijIndexing = { module = "com.jetbrains.intellij.platform:indexing", version.ref = "ideaVersion" }
intellijUtilUi = { module = "com.jetbrains.intellij.platform:util-ui", version.ref = "ideaVersion" }
coroutines-core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"

junit = "junit:junit:4.13.2"
truth = "com.google.truth:truth:1.1.5"

[bundles]
intelliJ = ["intellijCoreImpl", "intellijProjectModelImpl", "intellijAnalysisImpl", "intellijIndexing"]
intelliJ = ["intellijCoreImpl", "intellijProjectModelImpl", "intellijAnalysisImpl", "intellijIndexing", "intellijUtilUi"]

[plugins]
kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
Expand Down
5 changes: 4 additions & 1 deletion sample-headless/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ dependencies {
implementation project(':sample-core')
implementation project(':core')

implementation libs.bundles.intelliJ
implementation(libs.bundles.intelliJ) {
exclude(group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core")
}
testImplementation libs.coroutines.core
testImplementation "org.jetbrains.kotlin:kotlin-test"
}