Create an iOS runtime stub

build.gradle

@@ -6,6 +6,9 @@ buildscript {
     google()
     jcenter()
     gradlePluginPortal()
+    maven {
+      url 'http://dl.bintray.com/kotlin/kotlin-eap'
+    }
     maven {
       url 'https://jitpack.io'
     }
@@ -31,6 +34,9 @@ allprojects {
     mavenCentral()
     google()
     jcenter()
+    maven {
+      url 'http://dl.bintray.com/kotlin/kotlin-eap'
+    }
   }
 
   tasks.withType(Test) {

gradle/dependencies.gradle

@@ -1,5 +1,5 @@
 ext.versions = [
-    kotlin: '1.2.70',
+    kotlin: '1.3.0-rc-57',
     compileSdk: 28,
     idea: '2018.1',
     dokka: '0.9.15',

runtime/sqldelight-runtime/build.gradle

@@ -36,10 +36,22 @@ kotlin {
         implementation deps.kotlin.test.js
       }
     }
+    nativeMain {
+    }
+    nativeTest {
+    }
   }
+
   targets {
     fromPreset(presets.jvm, 'jvm')
     fromPreset(presets.js, 'js')
+    fromPreset(presets.iosX64, 'iosX64')
+    fromPreset(presets.iosArm64, 'iosArm64')
+  }
+
+  configure([targets.iosX64, targets.iosArm64]) {
+    compilations.main.source(sourceSets.nativeMain)
+    compilations.test.source(sourceSets.nativeTest)
   }
 }
 
@@ -76,7 +88,7 @@ signing {
 
 publishing {
   afterEvaluate {
-    publications.getByName('kotlin') {
+    publications.getByName('kotlinMultiplatform') {
       artifactId = POM_ARTIFACT_ID
 
       pom.withXml {
@@ -128,12 +140,12 @@ publishing {
 
 afterEvaluate {
   // TODO https://youtrack.jetbrains.com/issue/KT-26920
-  tasks.getByName('publishKotlinPublicationToMavenLocal').dependsOn('assemble')
-  tasks.getByName('publishKotlinPublicationToMavenRepository').dependsOn('assemble')
-  tasks.getByName('publishKotlinPublicationToTestRepository').dependsOn('assemble')
+  tasks.getByName('publishKotlinMultiplatformPublicationToMavenLocal').dependsOn('assemble')
+  tasks.getByName('publishKotlinMultiplatformPublicationToMavenRepository').dependsOn('assemble')
+  tasks.getByName('publishKotlinMultiplatformPublicationToTestRepository').dependsOn('assemble')
 
   // Alias the task names we use elsewhere to the new task names.
-  tasks.create('install').dependsOn('publishKotlinPublicationToMavenLocal')
-  tasks.create('installLocally').dependsOn('publishKotlinPublicationToTestRepository')
-  tasks.create('uploadArchives').dependsOn('publishKotlinPublicationToMavenRepository')
-}
+  tasks.create('install').dependsOn('publishKotlinMultiplatformPublicationToMavenLocal')
+  tasks.create('installLocally').dependsOn('publishKotlinMultiplatformPublicationToTestRepository')
+  tasks.create('uploadArchives').dependsOn('publishKotlinMultiplatformPublicationToMavenRepository')
+}

runtime/sqldelight-runtime/src/commonMain/kotlin/com/squareup/sqldelight/Query.kt

@@ -21,6 +21,7 @@ import com.squareup.sqldelight.db.SqlPreparedStatement.Type.SELECT
 import com.squareup.sqldelight.db.SqlResultSet
 import com.squareup.sqldelight.db.use
 import com.squareup.sqldelight.internal.QueryList
+import com.squareup.sqldelight.internal.sync
 
 fun <RowType : Any> Query(
   queries: QueryList,
@@ -63,7 +64,7 @@ abstract class Query<out RowType : Any>(
    * some false positives but never misses a true positive.
    */
   fun notifyResultSetChanged() {
-    synchronized(listeners) {
+    sync(listeners) {
       listeners.forEach(Listener::queryResultsChanged)
     }
   }
@@ -72,14 +73,14 @@ abstract class Query<out RowType : Any>(
    * Register a listener to be notified of future changes in the result set.
    */
   fun addListener(listener: Listener) {
-    synchronized(listeners) {
+    sync(listeners) {
       if (listeners.isEmpty()) queries.addQuery(this)
       listeners.add(listener)
     }
   }
 
   fun removeListener(listener: Listener) {
-    synchronized(listeners) {
+    sync(listeners) {
       listeners.remove(listener)
       if (listeners.isEmpty()) queries.removeQuery(this)
     }

runtime/sqldelight-runtime/src/commonMain/kotlin/com/squareup/sqldelight/internal/QueryList.kt

@@ -9,13 +9,13 @@ class QueryList {
   internal var queries: List<Query<*>> = emptyList()
 
   fun addQuery(query: Query<*>) {
-    synchronized(queries) {
+    sync(queries) {
       queries += query
     }
   }
 
   fun removeQuery(query: Query<*>) {
-    synchronized(queries) {
+    sync(queries) {
       queries -= query
     }
   }

runtime/sqldelight-runtime/src/commonMain/kotlin/com/squareup/sqldelight/internal/sync.kt

@@ -0,0 +1,3 @@
+package com.squareup.sqldelight.internal
+
+internal expect inline fun <R> sync(lock: Any, body: () -> R): R

runtime/sqldelight-runtime/src/jsMain/kotlin/com/squareup/sqldelight/internal/sync.kt

@@ -0,0 +1,3 @@
+package com.squareup.sqldelight.internal
+
+internal actual inline fun <R> sync(lock: Any, body: () -> R): R = body()

runtime/sqldelight-runtime/src/jvmMain/kotlin/com/squareup/sqldelight/internal/sync.kt

@@ -0,0 +1,3 @@
+package com.squareup.sqldelight.internal
+
+internal actual inline fun <R> sync(lock: Any, body: () -> R): R = synchronized(lock, body)

runtime/sqldelight-runtime/src/nativeMain/kotlin/com/squareup/sqldelight/db/Closeable.kt

@@ -0,0 +1,26 @@
+package com.squareup.sqldelight.db
+
+actual interface Closeable {
+  actual fun close()
+}
+
+actual inline fun <T : Closeable?, R> T.use(body: (T) -> R): R {
+  var exception: Throwable? = null
+  try {
+    return body(this)
+  } catch (e: Throwable) {
+    exception = e
+    throw e
+  } finally {
+    when {
+      this == null -> {}
+      exception == null -> close()
+      else ->
+        try {
+          close()
+        } catch (closeException: Throwable) {
+          // Nothing to do...
+        }
+    }
+  }
+}

runtime/sqldelight-runtime/src/nativeMain/kotlin/com/squareup/sqldelight/internal/sync.kt

@@ -0,0 +1,3 @@
+package com.squareup.sqldelight.internal
+
+internal actual inline fun <R> sync(lock: Any, body: () -> R): R = body()

runtime/sqldelight-runtime/src/nativeTest/kotlin/com/squareup/sqldelight/platform.kt

@@ -0,0 +1,7 @@
+package com.squareup.sqldelight
+
+import com.squareup.sqldelight.db.SqlDatabase
+
+actual fun createSqlDatabase(): SqlDatabase {
+  TODO("Create a native sqlite driver")
+}

sqldelight-core/src/main/kotlin/com/squareup/sqldelight/core/compiler/SelectQueryGenerator.kt

@@ -185,7 +185,7 @@ class SelectQueryGenerator(private val query: NamedQuery) : QueryGenerator(query
 
     // The custom return type variable:
     // <out T>
-    val returnType = TypeVariableName("T", bounds = ANY, variance = OUT)
+    val returnType = TypeVariableName("T", bounds = *arrayOf(ANY), variance = OUT)
     queryType.addTypeVariable(returnType)
 
     // The superclass:
@@ -213,7 +213,7 @@ class SelectQueryGenerator(private val query: NamedQuery) : QueryGenerator(query
 
     // Add the mapper constructor parameter and pass to the super constructor
     constructor.addParameter(MAPPER_NAME, LambdaTypeName.get(
-        parameters = RESULT_SET_TYPE,
+        parameters = *arrayOf(RESULT_SET_TYPE),
         returnType = returnType
     ))
     queryType.addSuperclassConstructorParameter(MAPPER_NAME)

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

@@ -27,6 +27,9 @@ repositories {
   }
   mavenCentral()
   google()
+  maven {
+    url 'http://dl.bintray.com/kotlin/kotlin-eap'
+  }
 }
 
 dependencies {

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

@@ -10,6 +10,9 @@ repositories {
     url "file://${projectDir.absolutePath}/../../../../build/localMaven"
   }
   mavenCentral()
+  maven {
+    url 'http://dl.bintray.com/kotlin/kotlin-eap'
+  }
 }
 
 sqldelight {

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

@@ -12,6 +12,9 @@ repositories {
     url "file://${projectDir.absolutePath}/../../../../build/localMaven"
   }
   mavenCentral()
+  maven {
+    url 'http://dl.bintray.com/kotlin/kotlin-eap'
+  }
 }
 
 android {

sqldelight-idea-plugin/build.gradle

@@ -9,7 +9,7 @@ intellij {
   version "IC-${versions.idea}"
   pluginName = 'SQLDelight'
   plugins = [
-      "org.jetbrains.kotlin:${versions.kotlin}-release-IJ${versions.idea}-1",
+      "org.jetbrains.kotlin:${versions.kotlin}-IJ${versions.idea}-1@EAP-NEXT",
       "gradle",
       "Groovy",
       "properties",