Use Azul JDK for toolchains (#3857)

* Use Azul JDK for toolchains

* Add foojay-resolved-convention plugin

* Create convention plugin(s) for jvm toolchain

adapters/primitive-adapters/build.gradle

@@ -4,10 +4,9 @@ plugins {
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
   id("app.cash.sqldelight.multiplatform")
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-primitive-adapters'
 
 kotlin {

buildLogic/settings.gradle

@@ -18,4 +18,5 @@ dependencyResolutionManagement {
   }
 }
 
-include(":multiplatform-convention")
+include(":multiplatform-convention")
+include(":toolchain-convention")

buildLogic/toolchain-convention/build.gradle

@@ -0,0 +1,21 @@
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  id("java-gradle-plugin")
+}
+
+gradlePlugin {
+  plugins {
+    runtime {
+      id = "app.cash.sqldelight.toolchain.runtime"
+      implementationClass = "app.cash.sqldelight.toolchain.RuntimeToolchainConventions"
+    }
+    compiler {
+      id = "app.cash.sqldelight.toolchain.compiler"
+      implementationClass = "app.cash.sqldelight.toolchain.CompilerToolchainConventions"
+    }
+  }
+}
+
+dependencies {
+  compileOnly libs.kotlin.plugin
+}

buildLogic/toolchain-convention/src/main/kotlin/app/cash/sqldelight/toolchain/ToolchainConventions.kt

@@ -0,0 +1,20 @@
+package app.cash.sqldelight.toolchain
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.jvm.toolchain.JvmVendorSpec
+import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
+
+abstract class ToolchainConventions(private val jdkVersion: Int) : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.kotlinExtension.jvmToolchain { spec ->
+      spec.languageVersion.set(JavaLanguageVersion.of(jdkVersion))
+      spec.vendor.set(JvmVendorSpec.AZUL)
+    }
+  }
+}
+
+class RuntimeToolchainConventions : ToolchainConventions(8)
+
+class CompilerToolchainConventions : ToolchainConventions(11)

dialects/hsql/build.gradle

@@ -3,14 +3,13 @@ plugins {
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':sqldelight-compiler:dialect')
 

dialects/mysql/build.gradle

@@ -4,14 +4,13 @@ plugins {
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   ksp libs.moshiCodegen
 

dialects/postgresql/build.gradle

@@ -4,14 +4,13 @@ plugins {
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   ksp libs.moshiCodegen
 

dialects/sqlite-3-18/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':sqldelight-compiler:dialect')
 

dialects/sqlite-3-24/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':dialects:sqlite-3-18')
 

dialects/sqlite-3-25/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':dialects:sqlite-3-24')
 

dialects/sqlite-3-30/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':dialects:sqlite-3-25')
 

dialects/sqlite-3-33/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':dialects:sqlite-3-30')
 

dialects/sqlite-3-35/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':dialects:sqlite-3-33')
 

dialects/sqlite-3-38/build.gradle

@@ -2,14 +2,13 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':dialects:sqlite-3-35')
 

dialects/sqlite/json-module/build.gradle

@@ -3,14 +3,13 @@ plugins {
   alias(libs.plugins.grammarKitComposer)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.compiler")
 }
 
 grammarKit {
   intellijRelease.set(libs.versions.idea)
 }
 
-kotlin.jvmToolchain(11)
-
 dependencies {
   api project(':sqldelight-compiler:dialect')
 

drivers/android-driver/build.gradle

@@ -3,10 +3,9 @@ plugins {
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-android-driver'
 
 android {

drivers/driver-test/build.gradle

@@ -1,5 +1,6 @@
 plugins {
   id("app.cash.sqldelight.multiplatform")
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
 // https://youtrack.jetbrains.com/issue/KTIJ-14471
@@ -8,8 +9,6 @@ sourceSets {
 }
 
 kotlin {
-  jvmToolchain(8)
-
   mingwX86()
 
   sourceSets {

drivers/jdbc-driver/build.gradle

@@ -1,13 +1,10 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-jdbc-driver'
 
 dependencies {

drivers/r2dbc-driver/build.gradle

@@ -4,10 +4,9 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-r2dbc-driver'
 
 dependencies {

drivers/sqlite-driver/build.gradle

@@ -2,10 +2,9 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-sqlite-driver'
 
 dependencies {

extensions/androidx-paging3/build.gradle

@@ -2,12 +2,11 @@ plugins {
   alias(libs.plugins.kotlin.multiplatform)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
 archivesBaseName = 'sqldelight-androidx-paging3'
 
-kotlin.jvmToolchain(8)
-
 kotlin {
   ios()
   jvm()

extensions/async-extensions/build.gradle

@@ -2,10 +2,9 @@ plugins {
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
   id("app.cash.sqldelight.multiplatform")
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-async-extensions'
 
 kotlin {

extensions/coroutines-extensions/build.gradle

@@ -2,10 +2,9 @@ plugins {
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
   id("app.cash.sqldelight.multiplatform")
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-coroutines-extensions'
 
 kotlin {

extensions/rxjava2-extensions/build.gradle

@@ -2,10 +2,9 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-rxjava2-extensions'
 
 dependencies {

extensions/rxjava3-extensions/build.gradle

@@ -2,10 +2,9 @@ plugins {
   alias(libs.plugins.kotlin.jvm)
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
-kotlin.jvmToolchain(8)
-
 archivesBaseName = 'sqldelight-rxjava3-extensions'
 
 dependencies {

runtime/build.gradle

@@ -2,15 +2,14 @@ plugins {
   alias(libs.plugins.publish)
   alias(libs.plugins.dokka)
   id("app.cash.sqldelight.multiplatform")
+  id("app.cash.sqldelight.toolchain.runtime")
 }
 
 // https://youtrack.jetbrains.com/issue/KTIJ-14471
 sourceSets {
   main
 }
 
-kotlin.jvmToolchain(8)
-
 kotlin {
   mingwX86()
 

sample/android/build.gradle

@@ -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