Fix classpath order

sqldelight · Apr 23, 2023 · b3048e5 · b3048e5
1 parent 512fcaa
commit b3048e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightDatabase.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightDatabase.kt
@@ -272,7 +272,7 @@ abstract class SqlDelightDatabase @Inject constructor(
         it.description = "Verify ${source.name} $name migrations and CREATE statements match."
         it.properties = getProperties()
         it.verifyMigrations = verifyMigrations.get()
-        it.classpath.setFrom(configuration, intellijEnv, migrationEnv)
+        it.classpath.setFrom(intellijEnv, migrationEnv, configuration)
       }
 
     if (schemaOutputDirectory.getOrNull() != null) {
@@ -287,7 +287,7 @@ abstract class SqlDelightDatabase @Inject constructor(
         it.description = "Generate a .db file containing the current $name schema for ${source.name}."
         it.properties = getProperties()
         it.verifyMigrations = verifyMigrations.get()
-        it.classpath.setFrom(configuration, intellijEnv, migrationEnv)
+        it.classpath.setFrom(intellijEnv, migrationEnv, configuration)
       }
     }
     project.tasks.named("check").configure {
@@ -312,7 +312,7 @@ abstract class SqlDelightDatabase @Inject constructor(
       it.group = SqlDelightPlugin.GROUP
       it.description = "Generate valid sql migration files for ${source.name} $name."
       it.properties = getProperties()
-      it.classpath.setFrom(configuration, intellijEnv)
+      it.classpath.setFrom(intellijEnv, configuration)
     }
   }
 
@@ -328,7 +328,7 @@ abstract class SqlDelightDatabase @Inject constructor(
       it.group = SqlDelightPlugin.GROUP
       it.description = "Squash migrations into a single file for ${source.name} $name."
       it.properties = getProperties()
-      it.classpath.setFrom(configuration, intellijEnv)
+      it.classpath.setFrom(intellijEnv, configuration)
     }
   }
 

diff --git a/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/VerifyMigrationTask.kt b/sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/VerifyMigrationTask.kt
@@ -13,6 +13,7 @@ import app.cash.sqlite.migrations.ObjectDifferDatabaseComparator
 import app.cash.sqlite.migrations.findDatabaseFiles
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileTree
+import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.logging.Logging
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
@@ -65,7 +66,6 @@ abstract class VerifyMigrationTask : SqlDelightWorkerTask() {
 
   @TaskAction
   fun verifyMigrations() {
-    runCatching {
       val workQueue = workQueue()
       workQueue.submit(VerifyMigrationAction::class.java) {
         it.workingDirectory.set(workingDirectory)
@@ -75,13 +75,8 @@ abstract class VerifyMigrationTask : SqlDelightWorkerTask() {
         it.compilationUnit.set(compilationUnit)
         it.verifyDefinitions.set(verifyDefinitions)
         it.driverProperties.set(driverProperties.get())
+        it.outputFile.set(getDummyOutputFile())
       }
-      workQueue.await()
-    }.onSuccess {
-      getDummyOutputFile().createNewFile()
-    }.onFailure {
-      throw it
-    }
   }
 
   @InputFiles
@@ -100,6 +95,7 @@ abstract class VerifyMigrationTask : SqlDelightWorkerTask() {
     val verifyMigrations: Property<Boolean>
     val verifyDefinitions: Property<Boolean>
     val driverProperties: MapProperty<String, String>
+    val outputFile: RegularFileProperty
   }
 
   abstract class VerifyMigrationAction : WorkAction<VerifyMigrationWorkParameters> {
@@ -141,6 +137,7 @@ abstract class VerifyMigrationTask : SqlDelightWorkerTask() {
       }
 
       checkForGaps()
+      parameters.outputFile.get().asFile.createNewFile()
     }
 
     private fun createCurrentDb(): CatalogDatabase {

diff --git a/sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/tests/MigrationTest.kt b/sqldelight-gradle-plugin/src/test/kotlin/app/cash/sqldelight/tests/MigrationTest.kt
@@ -40,6 +40,7 @@ class MigrationTest {
     val output = GradleRunner.create()
       .withCommonConfiguration(File("src/test/migration-driver-initializer"))
       .withArguments("clean", "verifyMainDatabaseMigration", "--stacktrace")
+      .withDebug(true)
       .build()
 
     assertThat(output.output).contains("DriverInitializerImpl executed!")