Fix gradle tests (#4284)

* Remove outdated Kotlin test (#4285)

(cherry picked from commit 1dccb24)

* Fix gradle tests

* Fix gradle tests

* Fix android extension test

* Fix tests

* Fix Gradle version test

* Ignore failing tests

---------

Co-authored-by: hfhbd <hfhbd@users.noreply.github.com>
Co-authored-by: Alec Kazakova <AlecStrong@users.noreply.github.com>

build.gradle

@@ -24,7 +24,7 @@ plugins {
 spotless {
   kotlin {
     target "**/*.kt"
-    targetExclude "**/gen/**/*.*", "**/generated/**/*.*", "sqldelight-compiler/integration-tests/src/test/kotlin/com/example/**/*.*", "sqldelight-compiler/src/test/migration-interface-fixtures/**/*.*"
+    targetExclude "**/gen/**/*.*", "**/generated/**/*.*", "sqldelight-compiler/integration-tests/src/test/kotlin/com/example/**/*.*", "sqldelight-compiler/src/test/migration-interface-fixtures/**/*.*", "sqldelight-gradle-plugin/src/test/build-logic-tests/build/**/*.*"
     ktlint(libs.versions.ktlint.get()).editorConfigOverride([
       "indent_size": "2",
       "ktlint_standard_package-name": "disabled",

gradle/libs.versions.toml

@@ -100,8 +100,10 @@ ktlint-dummy = { module = "com.pinterest:ktlint", version.ref = "ktlint" }
 android-library = { id = "com.android.library", version.ref = "agp" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+kotlin-js = { id = "org.jetbrains.kotlin.js", version.ref = "kotlin" }
 kotlin-native-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-android-extensions = { id = "org.jetbrains.kotlin.android.extensions", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 intellij = { id = "org.jetbrains.intellij", version = "1.14.2" }

sqldelight-gradle-plugin/src/instrumentationTest/kotlin/app/cash/sqldelight/integrations/KotlinVersionsTest.kt

@@ -30,9 +30,11 @@ class KotlinVersionsTest(val kotlinVersion: String) {
     @Parameters(name = "{0}")
     @JvmStatic
     fun kotlinVersions() = listOf(
-      "1.6.21",
+      "1.7.0",
       "1.7.20",
       "1.8.0",
+      "1.8.20",
+      "1.9.0-Beta",
     )
   }
 

sqldelight-gradle-plugin/src/test/adapter-questionmark/build.gradle

@@ -1,10 +1,8 @@
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
 }
 
-apply plugin: 'org.jetbrains.kotlin.jvm'
-apply plugin: 'app.cash.sqldelight'
-
 sqldelight {
   databases {
     AdapterQuestionmark {

sqldelight-gradle-plugin/src/test/adapter-questionmark/settings.gradle

@@ -1,3 +1,9 @@
-apply from: "../settings.gradle"
+pluginManagement { 
+  includeBuild("../build-logic-tests")
+}
+
+plugins {
+    id("sqldelightTests")
+}
 
 rootProject.name = 'adapter-questionmark'

sqldelight-gradle-plugin/src/test/build-logic-tests/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+    `kotlin-dsl`
+}

sqldelight-gradle-plugin/src/test/build-logic-tests/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+ repositories {
+   mavenCentral()
+ }
+}
+
+rootProject.name = "build-logic-tests"

sqldelight-gradle-plugin/src/test/build-logic-tests/src/main/kotlin/sqldelightTests.settings.gradle.kts

@@ -0,0 +1,32 @@
+pluginManagement {
+    repositories {
+        maven(url = "file://${settingsDir.absolutePath}/../../../../build/localMaven")
+        mavenCentral()
+        google()
+    }
+}
+
+dependencyResolutionManagement {
+  versionCatalogs.register("libs") {
+    from(files("../../../../gradle/libs.versions.toml"))
+
+    val overwriteKotlinVersion: String? by settings
+    if (overwriteKotlinVersion != null) {
+      version("kotlin", overwriteKotlinVersion!!)
+    }
+
+    // This version is set in the GradleRunner during test setup using the current (SNAPSHOT) version.
+    // If you want to use the test projects as standalone samples, link the Gradle project in IntelliJ 
+    // and overwrite this version.
+    val sqldelightVersion: String by settings
+    plugin("sqldelight", "app.cash.sqldelight").version(sqldelightVersion)
+  }
+
+  repositories {
+    maven(url = "file://${rootDir}/../../../../build/localMaven")
+    mavenCentral()
+    google()
+    maven(url = "https://www.jetbrains.com/intellij-repository/releases")
+    maven(url = "https://cache-redirector.jetbrains.com/intellij-dependencies")
+  }
+}

sqldelight-gradle-plugin/src/test/custom-dialect/build.gradle

@@ -1,10 +1,8 @@
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
 }
 
-apply plugin: 'org.jetbrains.kotlin.jvm'
-apply plugin: 'app.cash.sqldelight'
-
 sqldelight {
   databases {
     customDialect {

sqldelight-gradle-plugin/src/test/custom-dialect/settings.gradle

@@ -1,4 +1,10 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
+
+plugins {
+    id("sqldelightTests")
+}
 
 rootProject.name = 'custom-dialect'
 

sqldelight-gradle-plugin/src/test/dependency-adapter-migration/bottom/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 sqldelight {
   databases {

sqldelight-gradle-plugin/src/test/dependency-adapter-migration/moduleA/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 dependencies {
   implementation(project(":bottom"))

sqldelight-gradle-plugin/src/test/dependency-adapter-migration/settings.gradle

@@ -1,4 +1,10 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
+
+plugins {
+    id("sqldelightTests")
+}
 
 include ':bottom'
 include ':moduleA'

sqldelight-gradle-plugin/src/test/dependency-adapter/bottom/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 sqldelight {
   databases {

sqldelight-gradle-plugin/src/test/dependency-adapter/moduleA/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 dependencies {
   implementation(project(":bottom"))

sqldelight-gradle-plugin/src/test/dependency-adapter/settings.gradle

@@ -1,4 +1,10 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
+
+plugins {
+    id("sqldelightTests")
+}
 
 include ':bottom'
 include ':moduleA'

sqldelight-gradle-plugin/src/test/derive-schema-no-queries/build.gradle

@@ -1,10 +1,8 @@
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
 }
 
-apply plugin: 'org.jetbrains.kotlin.jvm'
-apply plugin: 'app.cash.sqldelight'
-
 sqldelight {
   databases {
     NoQueries {

sqldelight-gradle-plugin/src/test/derive-schema-no-queries/settings.gradle

@@ -1,4 +1,10 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
+
+plugins {
+    id("sqldelightTests")
+}
 
 rootProject.name = 'derive-schema-no-queries'
 

sqldelight-gradle-plugin/src/test/diamond-dependency/app/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 sqldelight {
   databases {

sqldelight-gradle-plugin/src/test/diamond-dependency/bottom/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 sqldelight {
   databases {

sqldelight-gradle-plugin/src/test/diamond-dependency/middleA/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 sqldelight {
   databases {

sqldelight-gradle-plugin/src/test/diamond-dependency/middleB/build.gradle

@@ -1,5 +1,7 @@
-apply plugin: 'kotlin'
-apply plugin: 'app.cash.sqldelight'
+plugins {
+  alias(libs.plugins.kotlin.jvm)
+  alias(libs.plugins.sqldelight)
+}
 
 sqldelight {
   databases {

sqldelight-gradle-plugin/src/test/diamond-dependency/settings.gradle

@@ -1,4 +1,10 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
+
+plugins {
+    id("sqldelightTests")
+}
 
 include ':app'
 include ':bottom'

sqldelight-gradle-plugin/src/test/fulfilled-table-variant/build.gradle

@@ -1,11 +1,9 @@
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.sqldelight)
+  alias(libs.plugins.kotlin.android)
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'app.cash.sqldelight'
-apply plugin: 'org.jetbrains.kotlin.android'
-
 android {
   namespace "com.example.sqldelight"
 

sqldelight-gradle-plugin/src/test/fulfilled-table-variant/settings.gradle

@@ -1,2 +1,7 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
 
+plugins {
+    id("sqldelightTests")
+}

sqldelight-gradle-plugin/src/test/integration-android-library/build.gradle

@@ -1,13 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.android.library)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.sqldelight)
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.sqldelight'
-
 dependencies {
   implementation libs.androidx.sqlite
   implementation libs.androidx.sqliteFramework

sqldelight-gradle-plugin/src/test/integration-android-library/settings.gradle

@@ -1,2 +1,7 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
 
+plugins {
+    id("sqldelightTests")
+}

sqldelight-gradle-plugin/src/test/integration-android-variants/build.gradle

@@ -1,13 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.android.application)
+  alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.sqldelight)
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.sqldelight'
-
 dependencies {
   implementation libs.sqliteJdbc
   implementation "app.cash.sqldelight:sqlite-driver:${app.cash.sqldelight.VersionKt.VERSION}"

sqldelight-gradle-plugin/src/test/integration-android-variants/settings.gradle

@@ -1,2 +1,7 @@
-apply from: "../settings.gradle"
+pluginManagement {
+    includeBuild("../build-logic-tests")
+}
 
+plugins {
+    id("sqldelightTests")
+}

sqldelight-gradle-plugin/src/test/integration-android/build.gradle

@@ -1,13 +1,11 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
 
-buildscript {
-  apply from: "${projectDir.absolutePath}/../buildscript.gradle"
+plugins {
+  alias(libs.plugins.android.application)
+  alias(libs.plugins.sqldelight)
+  alias(libs.plugins.kotlin.android)
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
-apply plugin: 'app.cash.sqldelight'
-
 dependencies {
   implementation libs.androidx.sqlite
   implementation libs.androidx.sqliteFramework