Skip to content

Commit 91b92a4

Browse files
hfhbdhfhbd
authored
Create explicit compiler env (#4079)
* Create explicit compiler env * Fix spotless * Fix sample * Fix sample * Fix migration environment * Fix generateSchema task * Fix classpath order * Add jdbc sqlite driver to the generateInterface tasks * Add comments * Move memory-consuming dokkaHtml task from test to assemble --------- Co-authored-by: hfhbd <hfhbd@users.noreply.github.com>
1 parent 19f6cc3 commit 91b92a4

File tree

41 files changed

+351
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+351
-200
lines changed

‎.github/workflows/PR.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Run spotless
3838
run: ./gradlew spotlessCheck
3939
- name: Assemble parallel
40-
run: ./gradlew assemble
40+
run: ./gradlew assemble dokkaHtml
4141

4242
# Linux tests
4343
- name: Run gradle tests

‎dialects/hsql/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ grammarKit {
1313
dependencies {
1414
api projects.sqldelightCompiler.dialect
1515

16-
compileOnly libs.intellij.ideImpl
17-
18-
testImplementation(libs.intellij.ideImpl) {
19-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
16+
compileOnly(projects.sqldelightCompiler.environment) {
17+
targetConfiguration = "shadow"
2018
}
21-
testImplementation libs.kotlin.coroutines.core
19+
2220
testImplementation libs.junit
2321
testImplementation libs.truth
2422
testImplementation(libs.sqlPsiTestFixtures) {
2523
exclude group: "com.jetbrains.intellij.platform"
2624
}
25+
testImplementation(projects.sqldelightCompiler.environment) {
26+
targetConfiguration = "shadow"
27+
}
2728
}
2829

2930
apply from: "$rootDir/gradle/gradle-mvn-push.gradle"

‎dialects/mysql/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ dependencies {
1717
api libs.mysqlJdbc
1818
api projects.sqldelightCompiler.dialect
1919

20-
compileOnly libs.intellij.ideImpl
21-
compileOnly libs.intellij.core.ui
20+
compileOnly(projects.sqldelightCompiler.environment) {
21+
targetConfiguration = "shadow"
22+
}
2223
compileOnly libs.moshi
2324

24-
testImplementation(libs.intellij.ideImpl) {
25-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
25+
testImplementation(projects.sqldelightCompiler.environment) {
26+
targetConfiguration = "shadow"
2627
}
27-
testImplementation libs.kotlin.coroutines.core
2828
testImplementation libs.junit
2929
testImplementation libs.truth
3030
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/postgresql/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ dependencies {
1717
api libs.postgresJdbc
1818
api projects.sqldelightCompiler.dialect
1919

20-
compileOnly libs.intellij.ideImpl
21-
compileOnly libs.intellij.core.ui
20+
compileOnly(projects.sqldelightCompiler.environment) {
21+
targetConfiguration = "shadow"
22+
}
2223
compileOnly libs.moshi
2324

24-
testImplementation(libs.intellij.ideImpl) {
25-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
25+
testImplementation(projects.sqldelightCompiler.environment) {
26+
targetConfiguration = "shadow"
2627
}
27-
testImplementation libs.kotlin.coroutines.core
2828
testImplementation libs.junit
2929
testImplementation libs.truth
3030
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/sqlite-3-18/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ grammarKit {
1212
dependencies {
1313
api projects.sqldelightCompiler.dialect
1414

15-
compileOnly libs.intellij.ideImpl
16-
compileOnly libs.intellij.core.ui
15+
compileOnly(projects.sqldelightCompiler.environment) {
16+
targetConfiguration = "shadow"
17+
}
1718

18-
testImplementation(libs.intellij.ideImpl) {
19-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
19+
testImplementation(projects.sqldelightCompiler.environment) {
20+
targetConfiguration = "shadow"
2021
}
21-
testImplementation libs.kotlin.coroutines.core
2222
testImplementation libs.junit
2323
testImplementation libs.truth
2424
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/sqlite-3-24/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ grammarKit {
1212
dependencies {
1313
api projects.dialects.sqlite318
1414

15-
compileOnly libs.intellij.ideImpl
15+
compileOnly(projects.sqldelightCompiler.environment) {
16+
targetConfiguration = "shadow"
17+
}
1618

17-
testImplementation(libs.intellij.ideImpl) {
18-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
19+
testImplementation(projects.sqldelightCompiler.environment) {
20+
targetConfiguration = "shadow"
1921
}
20-
testImplementation libs.kotlin.coroutines.core
2122
testImplementation libs.junit
2223
testImplementation libs.truth
2324
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/sqlite-3-25/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ grammarKit {
1212
dependencies {
1313
api projects.dialects.sqlite324
1414

15-
compileOnly libs.intellij.ideImpl
15+
compileOnly(projects.sqldelightCompiler.environment) {
16+
targetConfiguration = "shadow"
17+
}
1618

17-
testImplementation(libs.intellij.ideImpl) {
18-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
19+
testImplementation(projects.sqldelightCompiler.environment) {
20+
targetConfiguration = "shadow"
1921
}
20-
testImplementation libs.kotlin.coroutines.core
2122
testImplementation libs.junit
2223
testImplementation libs.truth
2324
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/sqlite-3-30/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ grammarKit {
1212
dependencies {
1313
api projects.dialects.sqlite325
1414

15-
compileOnly libs.intellij.ideImpl
15+
compileOnly(projects.sqldelightCompiler.environment) {
16+
targetConfiguration = "shadow"
17+
}
1618

17-
testImplementation(libs.intellij.ideImpl) {
18-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
19+
testImplementation(projects.sqldelightCompiler.environment) {
20+
targetConfiguration = "shadow"
1921
}
20-
testImplementation libs.kotlin.coroutines.core
2122
testImplementation libs.junit
2223
testImplementation libs.truth
2324
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/sqlite-3-33/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ grammarKit {
1212
dependencies {
1313
api projects.dialects.sqlite330
1414

15-
compileOnly libs.intellij.ideImpl
15+
compileOnly(projects.sqldelightCompiler.environment) {
16+
targetConfiguration = "shadow"
17+
}
1618

17-
testImplementation(libs.intellij.ideImpl) {
18-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
19+
testImplementation(projects.sqldelightCompiler.environment) {
20+
targetConfiguration = "shadow"
1921
}
20-
testImplementation libs.kotlin.coroutines.core
2122
testImplementation libs.junit
2223
testImplementation libs.truth
2324
testImplementation(libs.sqlPsiTestFixtures) {

‎dialects/sqlite-3-35/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ grammarKit {
1212
dependencies {
1313
api projects.dialects.sqlite333
1414

15-
compileOnly libs.intellij.ideImpl
15+
compileOnly(projects.sqldelightCompiler.environment) {
16+
targetConfiguration = "shadow"
17+
}
1618

17-
testImplementation(libs.intellij.ideImpl) {
18-
exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-core"
19+
testImplementation(projects.sqldelightCompiler.environment) {
20+
targetConfiguration = "shadow"
1921
}
20-
testImplementation libs.kotlin.coroutines.core
2122
testImplementation libs.junit
2223
testImplementation libs.truth
2324
testImplementation(libs.sqlPsiTestFixtures) {

0 commit comments

Comments
 (0)