Use Azul JDK for toolchains

cashapp · Jan 29, 2023 · ed0bcb7 · ed0bcb7
1 parent 8170fa1
commit ed0bcb7
Show file tree

Hide file tree

Showing 30 changed files with 120 additions and 30 deletions.
diff --git a/adapters/primitive-adapters/build.gradle b/adapters/primitive-adapters/build.gradle
@@ -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'
 

diff --git a/dialects/hsql/build.gradle b/dialects/hsql/build.gradle
@@ -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')

diff --git a/dialects/mysql/build.gradle b/dialects/mysql/build.gradle
@@ -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

diff --git a/dialects/postgresql/build.gradle b/dialects/postgresql/build.gradle
@@ -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

diff --git a/dialects/sqlite-3-18/build.gradle b/dialects/sqlite-3-18/build.gradle
@@ -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')

diff --git a/dialects/sqlite-3-24/build.gradle b/dialects/sqlite-3-24/build.gradle
@@ -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')

diff --git a/dialects/sqlite-3-25/build.gradle b/dialects/sqlite-3-25/build.gradle
@@ -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')

diff --git a/dialects/sqlite-3-30/build.gradle b/dialects/sqlite-3-30/build.gradle
@@ -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')

diff --git a/dialects/sqlite-3-33/build.gradle b/dialects/sqlite-3-33/build.gradle
@@ -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')

diff --git a/dialects/sqlite-3-35/build.gradle b/dialects/sqlite-3-35/build.gradle
@@ -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')

diff --git a/dialects/sqlite-3-38/build.gradle b/dialects/sqlite-3-38/build.gradle
@@ -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')

diff --git a/dialects/sqlite/json-module/build.gradle b/dialects/sqlite/json-module/build.gradle
@@ -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')

diff --git a/drivers/android-driver/build.gradle b/drivers/android-driver/build.gradle
@@ -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'
 

diff --git a/drivers/jdbc-driver/build.gradle b/drivers/jdbc-driver/build.gradle
@@ -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'
 

diff --git a/drivers/r2dbc-driver/build.gradle b/drivers/r2dbc-driver/build.gradle
@@ -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'
 

diff --git a/drivers/sqlite-driver/build.gradle b/drivers/sqlite-driver/build.gradle
@@ -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'
 

diff --git a/extensions/androidx-paging3/build.gradle b/extensions/androidx-paging3/build.gradle
@@ -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()

diff --git a/extensions/async-extensions/build.gradle b/extensions/async-extensions/build.gradle
@@ -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'
 

diff --git a/extensions/coroutines-extensions/build.gradle b/extensions/coroutines-extensions/build.gradle
@@ -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'
 

diff --git a/extensions/rxjava2-extensions/build.gradle b/extensions/rxjava2-extensions/build.gradle
@@ -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'
 

diff --git a/extensions/rxjava3-extensions/build.gradle b/extensions/rxjava3-extensions/build.gradle
@@ -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'
 

diff --git a/runtime/build.gradle b/runtime/build.gradle
@@ -9,7 +9,10 @@ sourceSets {
   main
 }
 
-kotlin.jvmToolchain(8)
+kotlin.jvmToolchain {
+  languageVersion.set(JavaLanguageVersion.of(8))
+  vendor.set(JvmVendorSpec.AZUL)
+}
 
 kotlin {
   mingwX86()

diff --git a/sample/android/build.gradle b/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

diff --git a/sqldelight-compiler/build.gradle b/sqldelight-compiler/build.gradle
@@ -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"

diff --git a/sqldelight-compiler/dialect/build.gradle b/sqldelight-compiler/dialect/build.gradle
@@ -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

diff --git a/sqldelight-compiler/integration-tests/build.gradle b/sqldelight-compiler/integration-tests/build.gradle
@@ -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')

diff --git a/sqldelight-gradle-plugin/build.gradle b/sqldelight-gradle-plugin/build.gradle
@@ -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 {

diff --git a/sqldelight-idea-plugin/build.gradle b/sqldelight-idea-plugin/build.gradle
@@ -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

diff --git a/sqlite-migrations/build.gradle b/sqlite-migrations/build.gradle
@@ -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

diff --git a/test-util/build.gradle b/test-util/build.gradle
@@ -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')