Remove some stuff we said we would remove (cashapp#1705)

MariusVolkhart · Jun 1, 2020 · ec4a5f2 · ec4a5f2
1 parent c15c8f4
commit ec4a5f2
Showing 1 changed file with 0 additions and 36 deletions.
diff --git a/...light-gradle-plugin/src/main/kotlin/com/squareup/sqldelight/gradle/SqlDelightExtension.kt b/...light-gradle-plugin/src/main/kotlin/com/squareup/sqldelight/gradle/SqlDelightExtension.kt
@@ -1,10 +1,7 @@
 package com.squareup.sqldelight.gradle
 
 import groovy.lang.Closure
-import java.io.File
-import org.gradle.api.GradleException
 import org.gradle.api.Project
-import org.gradle.api.file.FileCollection
 import org.gradle.util.ConfigureUtil
 
 open class SqlDelightExtension {
@@ -14,16 +11,6 @@ open class SqlDelightExtension {
 
   var linkSqlite = true
 
-  // TODO: Remove these after 1.1.0
-  var packageName: String? = null
-    set(value) = newDsl()
-  var className: String? = null
-    set(value) = newDsl()
-  var sourceSet: FileCollection? = null
-    set(value) = newDsl()
-  var schemaOutputDirectory: File? = null
-    set(value) = newDsl()
-
   fun methodMissing(name: String, args: Any): Any {
     configuringDatabase?.methodMissing(name, args)?.let { return it }
 
@@ -71,27 +58,4 @@ open class SqlDelightExtension {
 
     databases.add(database)
   }
-
-  companion object {
-    private fun newDsl(): Nothing = throw GradleException("""
-      |Format of specifying databases has changed from:
-      |
-      |sqldelight {
-      |  className = "MyDatabase"
-      |  packageName = "com.example"
-      |  sourceSet = files("src/main/sqldelight")
-      |  schemaOutputDirectory = file("src/main/sqldelight/migrations")
-      |}
-      |
-      |to
-      |
-      |sqldelight {
-      |  MyDatabase {
-      |    packageName = "com.example"
-      |    sourceFolders = ["sqldelight"]
-      |    schemaOutputDirectory = file("src/main/sqldelight/migrations")
-      |  }
-      |}
-    """.trimMargin())
-  }
 }