Create explicit compiler env

.github/workflows/PR.yml

@@ -37,7 +37,7 @@ jobs:
       - name: Run spotless
         run: ./gradlew spotlessCheck
       - name: Assemble parallel
-        run: ./gradlew assemble
+        run: ./gradlew assemble dokkaHtml
 
       # Linux tests
       - name: Run gradle tests

dialects/hsql/build.gradle

@@ -13,17 +13,18 @@ grammarKit {
 dependencies {
   api projects.sqldelightCompiler.dialect
 
-  compileOnly libs.intellij.ideImpl
-
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
+
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {
     exclude group: "com.jetbrains.intellij.platform"
   }
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 }
 
 apply from: "$rootDir/gradle/gradle-mvn-push.gradle"

dialects/mysql/build.gradle

@@ -17,14 +17,14 @@ dependencies {
   api libs.mysqlJdbc
   api projects.sqldelightCompiler.dialect
 
-  compileOnly libs.intellij.ideImpl
-  compileOnly libs.intellij.core.ui
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
   compileOnly libs.moshi
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/postgresql/build.gradle

@@ -17,14 +17,14 @@ dependencies {
   api libs.postgresJdbc
   api projects.sqldelightCompiler.dialect
 
-  compileOnly libs.intellij.ideImpl
-  compileOnly libs.intellij.core.ui
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
   compileOnly libs.moshi
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-18/build.gradle

@@ -12,13 +12,13 @@ grammarKit {
 dependencies {
   api projects.sqldelightCompiler.dialect
 
-  compileOnly libs.intellij.ideImpl
-  compileOnly libs.intellij.core.ui
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-24/build.gradle

@@ -12,12 +12,13 @@ grammarKit {
 dependencies {
   api projects.dialects.sqlite318
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-25/build.gradle

@@ -12,12 +12,13 @@ grammarKit {
 dependencies {
   api projects.dialects.sqlite324
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-30/build.gradle

@@ -12,12 +12,13 @@ grammarKit {
 dependencies {
   api projects.dialects.sqlite325
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-33/build.gradle

@@ -12,12 +12,13 @@ grammarKit {
 dependencies {
   api projects.dialects.sqlite330
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-35/build.gradle

@@ -12,12 +12,13 @@ grammarKit {
 dependencies {
   api projects.dialects.sqlite333
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite-3-38/build.gradle

@@ -12,12 +12,13 @@ grammarKit {
 dependencies {
   api projects.dialects.sqlite335
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

dialects/sqlite/json-module/build.gradle

@@ -13,13 +13,14 @@ grammarKit {
 dependencies {
   api projects.sqldelightCompiler.dialect
 
-  compileOnly libs.intellij.ideImpl
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
   testImplementation projects.dialects.sqlite318
-  testImplementation(libs.intellij.ideImpl) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
   testImplementation libs.junit
   testImplementation libs.truth
   testImplementation(libs.sqlPsiTestFixtures) {

gradle/gradle-mvn-push.gradle

@@ -19,3 +19,8 @@ publishing {
         }
     }
 }
+
+tasks.withType(AbstractArchiveTask).configureEach {
+    setPreserveFileTimestamps false
+    setReproducibleFileOrder true
+}

gradle/libs.versions.toml

@@ -49,7 +49,9 @@ moshiCodegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version = "
 
 intellij-core = { module = "com.jetbrains.intellij.platform:core", version.ref = "idea" }
 intellij-coreImpl = { module = "com.jetbrains.intellij.platform:core-impl", version.ref = "idea" }
-intellij-core-ui = { module = "com.jetbrains.intellij.platform:core-ui", version.ref = "idea" }
+intellij-coreUi = { module = "com.jetbrains.intellij.platform:core-ui", version.ref = "idea" }
+intellij-ide = { module = "com.jetbrains.intellij.platform:ide", version.ref = "idea" }
+intellij-ideCore = { module = "com.jetbrains.intellij.platform:ide-core", version.ref = "idea" }
 intellij-ideImpl = { module = "com.jetbrains.intellij.platform:ide-impl", version.ref = "idea" }
 intellij-testFramework = { module = "com.jetbrains.intellij.platform:test-framework", version.ref = "idea" }
 intellij-lang = { module = "com.jetbrains.intellij.platform:lang", version.ref = "idea" }
@@ -60,6 +62,8 @@ intellij-android = { module = "com.jetbrains.intellij.android:android-adt-ui-mod
 intellij-projectModel = { module = "com.jetbrains.intellij.platform:project-model", version.ref = "idea" }
 intellij-projectModelImpl = { module = "com.jetbrains.intellij.platform:project-model-impl", version.ref = "idea" }
 intellij-utilEx = { module = "com.jetbrains.intellij.platform:util-ex", version.ref = "idea" }
+intellij-utilUi = { module = "com.jetbrains.intellij.platform:util-ui", version.ref = "idea" }
+intellij-util = { module = "com.jetbrains.intellij.platform:util", version.ref = "idea" }
 
 jna = { module = "net.java.dev.jna:jna", version = "5.13.0" }
 

sample/settings.gradle

@@ -64,6 +64,8 @@ includeBuild('..') {
     substitute module("app.cash.sqldelight:runtime-jvm") using project(":runtime")
     substitute module("app.cash.sqldelight:gradle-plugin") using project(":sqldelight-gradle-plugin")
     substitute module("app.cash.sqldelight:sqlite-3-18-dialect") using project(":dialects:sqlite-3-18")
+    substitute module("app.cash.sqldelight:compiler-env") using project(":sqldelight-compiler:environment")
+    substitute module("app.cash.sqldelight:migration-env") using project(":sqlite-migrations:environment")
     substitute module("app.cash.sqldelight:async-extensions") using project(":extensions:async-extensions")
   }
 }

settings.gradle

@@ -56,8 +56,10 @@ include ':extensions:rxjava3-extensions'
 include ':runtime'
 include ':sqldelight-compiler'
 include ':sqldelight-compiler:dialect'
+include ':sqldelight-compiler:environment'
 include ':sqldelight-compiler:integration-tests'
 include ':sqldelight-gradle-plugin'
 include ':sqldelight-idea-plugin'
 include ':sqlite-migrations'
+include ':sqlite-migrations:environment'
 include ':test-util'

sqldelight-compiler/build.gradle

@@ -25,21 +25,21 @@ grammarKit {
 }
 
 dependencies {
-  api libs.sqlPsi
   api projects.sqldelightCompiler.dialect
 
-  implementation libs.kotlinPoet
   implementation libs.jgrapht
 
   compileOnly libs.sqliteJdbc
-  compileOnly libs.intellij.testFramework
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 
   testImplementation libs.burst
   testImplementation libs.sqliteJdbc
-  testImplementation (libs.intellij.testFramework) {
-    exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
+  testImplementation(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
   }
-  testImplementation libs.kotlin.coroutines.core
+
   testImplementation libs.kotlin.test.junit
   testImplementation libs.truth
   testImplementation projects.testUtil

sqldelight-compiler/dialect/build.gradle

@@ -9,8 +9,9 @@ dependencies {
   api libs.sqlPsi
   api libs.kotlinPoet
 
-  compileOnly libs.intellij.coreImpl
-  compileOnly libs.intellij.utilEx
+  compileOnly(projects.sqldelightCompiler.environment) {
+    targetConfiguration = "shadow"
+  }
 }
 
 apply from: "$rootDir/gradle/gradle-mvn-push.gradle"