Bump Intellij to 2023.3

sqldelight · Sep 14, 2023 · 9053a54 · 9053a54
1 parent 8a932cf
commit 9053a54
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -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
@@ -36,7 +35,7 @@ allprojects {
 subprojects {
   apply(plugin: "org.jetbrains.kotlin.jvm")
 
-  kotlin.jvmToolchain(11)
+  kotlin.jvmToolchain(17)
 
   tasks.withType(Test).configureEach {
     testLogging {
@@ -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'
   }
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -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 {

diff --git a/core/src/main/kotlin/com/alecstrong/sql/psi/core/SqlCoreEnvironment.kt b/core/src/main/kotlin/com/alecstrong/sql/psi/core/SqlCoreEnvironment.kt
@@ -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),

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -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" }

diff --git a/sample-headless/build.gradle b/sample-headless/build.gradle
@@ -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"
 }