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.

Sign up for GitHub

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

Jump to bottom

Use Azul JDK for toolchains #3857

Merged
merged 3 commits into from Feb 26, 2023
Merged

Use Azul JDK for toolchains #3857

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0537a1
Use Azul JDK for toolchains
dellisd Jan 29, 2023
ed3e020
Add foojay-resolved-convention plugin
dellisd Jan 29, 2023
af6de5b
Create convention plugin(s) for jvm toolchain
dellisd Feb 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion adapters/primitive-adapters/build.gradle
View file
Open in desktop
Expand Up @@ -6,7 +6,10 @@ plugins {
id("app.cash.sqldelight.multiplatform")
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-primitive-adapters'

Expand Down
5 changes: 4 additions & 1 deletion dialects/hsql/build.gradle
View file
Open in desktop
Expand Up @@ -9,7 +9,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':sqldelight-compiler:dialect')
Expand Down
5 changes: 4 additions & 1 deletion dialects/mysql/build.gradle
View file
Open in desktop
Expand Up @@ -10,7 +10,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
ksp libs.moshiCodegen
Expand Down
5 changes: 4 additions & 1 deletion dialects/postgresql/build.gradle
View file
Open in desktop
Expand Up @@ -10,7 +10,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
ksp libs.moshiCodegen
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-18/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':sqldelight-compiler:dialect')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-24/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':dialects:sqlite-3-18')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-25/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':dialects:sqlite-3-24')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-30/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':dialects:sqlite-3-25')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-33/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':dialects:sqlite-3-30')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-35/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':dialects:sqlite-3-33')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite-3-38/build.gradle
View file
Open in desktop
Expand Up @@ -8,7 +8,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':dialects:sqlite-3-35')
Expand Down
5 changes: 4 additions & 1 deletion dialects/sqlite/json-module/build.gradle
View file
Open in desktop
Expand Up @@ -9,7 +9,10 @@ grammarKit {
intellijRelease.set(libs.versions.idea)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':sqldelight-compiler:dialect')
Expand Down
5 changes: 4 additions & 1 deletion drivers/android-driver/build.gradle
View file
Open in desktop
Expand Up @@ -5,7 +5,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-android-driver'

Expand Down
5 changes: 4 additions & 1 deletion drivers/jdbc-driver/build.gradle
View file
Open in desktop
Expand Up @@ -6,7 +6,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-jdbc-driver'

Expand Down
5 changes: 4 additions & 1 deletion drivers/r2dbc-driver/build.gradle
View file
Open in desktop
Expand Up @@ -6,7 +6,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-r2dbc-driver'

Expand Down
5 changes: 4 additions & 1 deletion drivers/sqlite-driver/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-sqlite-driver'

Expand Down
5 changes: 4 additions & 1 deletion extensions/androidx-paging3/build.gradle
View file
Open in desktop
Expand Up @@ -6,7 +6,10 @@ plugins {

archivesBaseName = 'sqldelight-androidx-paging3'

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

kotlin {
ios()
Expand Down
5 changes: 4 additions & 1 deletion extensions/async-extensions/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
id("app.cash.sqldelight.multiplatform")
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-async-extensions'

Expand Down
5 changes: 4 additions & 1 deletion extensions/coroutines-extensions/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
id("app.cash.sqldelight.multiplatform")
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-coroutines-extensions'

Expand Down
5 changes: 4 additions & 1 deletion extensions/rxjava2-extensions/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-rxjava2-extensions'

Expand Down
5 changes: 4 additions & 1 deletion extensions/rxjava3-extensions/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

archivesBaseName = 'sqldelight-rxjava3-extensions'

Expand Down
5 changes: 4 additions & 1 deletion runtime/build.gradle
View file
Open in desktop
Expand Up @@ -9,7 +9,10 @@ sourceSets {
main
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

kotlin {
mingwX86()
Expand Down
5 changes: 4 additions & 1 deletion sample/android/build.gradle
View file
Open in desktop
Expand Up @@ -3,7 +3,10 @@ plugins {
alias(libs.plugins.kotlin.android)
}

kotlin.jvmToolchain(8)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(8))
vendor.set(JvmVendorSpec.AZUL)
}

android {
compileSdk libs.versions.compileSdk.get() as int
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ pluginManagement {

plugins {
id "com.gradle.enterprise" version "3.12.3"
id "org.gradle.toolchains.foojay-resolver-convention" version "0.4.0"
}

gradleEnterprise {
Expand Down
5 changes: 4 additions & 1 deletion sqldelight-compiler/build.gradle
View file
Open in desktop
Expand Up @@ -15,7 +15,10 @@ tasks.named('test') {
}
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

sourceSets {
main.java.srcDir "gen"
Expand Down
5 changes: 4 additions & 1 deletion sqldelight-compiler/dialect/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api libs.sqlPsi
Expand Down
5 changes: 4 additions & 1 deletion sqldelight-compiler/integration-tests/build.gradle
View file
Open in desktop
Expand Up @@ -2,7 +2,10 @@ plugins {
alias(libs.plugins.kotlin.jvm)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
testImplementation project(':runtime')
Expand Down
5 changes: 4 additions & 1 deletion sqldelight-gradle-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -9,7 +9,10 @@ plugins {
id("jvm-test-suite")
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

testing {
suites {
Expand Down
5 changes: 4 additions & 1 deletion sqldelight-idea-plugin/build.gradle
View file
Open in desktop
Expand Up @@ -7,7 +7,10 @@ plugins {
alias(libs.plugins.ksp)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

intellij {
updateSinceUntilBuild = false
Expand Down
5 changes: 4 additions & 1 deletion sqlite-migrations/build.gradle
View file
Open in desktop
Expand Up @@ -4,7 +4,10 @@ plugins {
alias(libs.plugins.dokka)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
// These dependencies will not be shadowed by sqldelight-gradle-plugin
Expand Down
5 changes: 4 additions & 1 deletion test-util/build.gradle
View file
Open in desktop
Expand Up @@ -2,7 +2,10 @@ plugins {
alias(libs.plugins.kotlin.jvm)
}

kotlin.jvmToolchain(11)
kotlin.jvmToolchain {
languageVersion.set(JavaLanguageVersion.of(11))
vendor.set(JvmVendorSpec.AZUL)
}

dependencies {
api project(':sqldelight-compiler')
Expand Down