Skip to content

Commit ebbcd76

Browse files
joreillyjoreilly
authored
Merge pull request #40 from joreilly/sql_delight_2
SQLDelight 2.0
2 parents d94da5a + 088cbdc commit ebbcd76

8 files changed

Lines changed: 26 additions & 31 deletions

File tree

‎SharedCode/build.gradle.kts‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
kotlin("multiplatform")
44
id("kotlinx-serialization")
55
id("com.android.library")
6-
id("com.squareup.sqldelight")
6+
id("app.cash.sqldelight")
77
id("com.google.devtools.ksp")
88
id("com.rickclephas.kmp.nativecoroutines")
99
}
@@ -100,21 +100,21 @@ kotlin {
100100
val androidMain by getting {
101101
dependencies {
102102
implementation("io.ktor:ktor-client-android:${Versions.ktor}")
103-
implementation("com.squareup.sqldelight:android-driver:${Versions.sqlDelight}")
103+
implementation("app.cash.sqldelight:android-driver:${Versions.sqlDelight}")
104104
}
105105
}
106106

107107
val iOSMain by getting {
108108
dependencies {
109109
implementation("io.ktor:ktor-client-ios:${Versions.ktor}")
110-
implementation("com.squareup.sqldelight:native-driver:${Versions.sqlDelight}")
110+
implementation("app.cash.sqldelight:native-driver:${Versions.sqlDelight}")
111111
}
112112
}
113113

114114
val macOSMain by getting {
115115
dependencies {
116116
implementation("io.ktor:ktor-client-ios:${Versions.ktor}")
117-
implementation("com.squareup.sqldelight:native-driver-macosx64:${Versions.sqlDelight}")
117+
implementation("app.cash.sqldelight:native-driver-macosx64:${Versions.sqlDelight}")
118118
}
119119
}
120120

@@ -123,7 +123,7 @@ kotlin {
123123
dependencies {
124124
implementation(Deps.Ktor.clientJava)
125125
//implementation(Ktor.slf4j)
126-
implementation("com.squareup.sqldelight:sqlite-driver:${Versions.sqlDelight}")
126+
implementation("app.cash.sqldelight:sqlite-driver:${Versions.sqlDelight}")
127127
}
128128
}
129129

@@ -141,9 +141,11 @@ kotlin {
141141
}
142142

143143
sqldelight {
144-
database("MyDatabase") {
145-
packageName = "com.surrus.galwaybus.db"
146-
sourceFolders = listOf("sqldelight")
144+
databases {
145+
create("MyDatabase") {
146+
packageName.set("com.surrus.galwaybus.db")
147+
//sourceFolders = listOf("sqldelight")
148+
}
147149
}
148150
}
149151

‎SharedCode/src/androidMain/kotlin/com/surrus/galwaybus/common/di/KoinAndroid.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.surrus.galwaybus.common.di
22

33
import android.content.Context
4+
import app.cash.sqldelight.driver.android.AndroidSqliteDriver
45
import com.russhwolf.settings.ObservableSettings
56
import com.russhwolf.settings.SharedPreferencesSettings
6-
import com.squareup.sqldelight.android.AndroidSqliteDriver
77
import com.surrus.galwaybus.db.MyDatabase
88
import org.koin.dsl.module
99

‎SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/GalwayBusRepository.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package com.surrus.galwaybus.common
22

3+
import app.cash.sqldelight.coroutines.asFlow
4+
import app.cash.sqldelight.coroutines.mapToList
35
import co.touchlab.kermit.Logger
46
import com.rickclephas.kmp.nativecoroutines.NativeCoroutineScope
57
import com.rickclephas.kmp.nativecoroutines.NativeCoroutines
6-
import com.squareup.sqldelight.runtime.coroutines.asFlow
7-
import com.squareup.sqldelight.runtime.coroutines.mapToList
88
import com.surrus.galwaybus.common.model.*
99
import com.surrus.galwaybus.common.remote.CityBikesApi
1010
import com.surrus.galwaybus.common.remote.GalwayBusApi
1111
import com.surrus.galwaybus.common.remote.Station
1212
import com.surrus.galwaybus.db.MyDatabase
1313
import kotlinx.coroutines.CoroutineScope
14+
import kotlinx.coroutines.Dispatchers
1415
import kotlinx.coroutines.MainScope
1516
import kotlinx.coroutines.flow.combine
1617
import kotlinx.datetime.Clock
@@ -34,7 +35,7 @@ open class GalwayBusRepository : KoinComponent {
3435

3536
val busStops = galwayBusQueries.selectAll(mapper = { stop_id, stop_ref, short_name, long_name, latitude, longitude ->
3637
BusStop(stop_id, short_name, long_name, stop_ref, latitude = latitude, longitude = longitude)
37-
}).asFlow().mapToList()
38+
}).asFlow().mapToList(Dispatchers.Default)
3839

3940
@NativeCoroutines
4041
val favorites = appSettings.favorites

‎SharedCode/src/iosMain/kotlin/com/surrus/galwaybus/common/di/KoiniOS.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.surrus.galwaybus.common.di
22

3+
import app.cash.sqldelight.driver.native.NativeSqliteDriver
34
import com.russhwolf.settings.NSUserDefaultsSettings
45
import com.russhwolf.settings.ObservableSettings
5-
import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
66
import com.surrus.galwaybus.db.MyDatabase
77
import org.koin.dsl.module
88
import platform.Foundation.NSUserDefaults

‎SharedCode/src/jvmMain/kotlin/com/surrus/galwaybus/common/di/KoinJVM.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.surrus.galwaybus.common.di
22

3+
import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
34
import com.russhwolf.settings.ExperimentalSettingsApi
45
import com.russhwolf.settings.ExperimentalSettingsImplementation
56
import com.russhwolf.settings.JvmPreferencesSettings
67
import com.russhwolf.settings.ObservableSettings
7-
import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
88
import com.surrus.galwaybus.db.MyDatabase
99
import org.koin.dsl.module
1010
import java.util.prefs.Preferences

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
classpath("com.android.tools.build:gradle:8.1.0")
1111
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
1212
classpath("org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}")
13-
classpath("com.squareup.sqldelight:gradle-plugin:${Versions.sqlDelight}")
13+
classpath("app.cash.sqldelight:gradle-plugin:${Versions.sqlDelight}")
1414
classpath("com.google.gms:google-services:4.3.15")
1515
classpath("com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.kspPlugin}")
1616
classpath("com.rickclephas.kmp:kmp-nativecoroutines-gradle-plugin:${Versions.kmpNativeCoroutines}")

‎buildSrc/src/main/java/Dependencies.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11

22
object Versions {
33
const val kotlin = "1.9.0"
4-
const val kspPlugin = "1.9.0-1.0.12"
4+
const val kspPlugin = "1.9.0-1.0.13"
55
const val kotlinCoroutines = "1.7.3"
66
const val kotlinxSerialization = "1.5.1"
77
const val ktor = "2.3.2"
88
const val koinCore = "3.4.3"
99
const val koinAndroid = "3.4.3"
1010
const val koinAndroidCompose = "3.4.6"
1111

12-
const val sqlDelight = "1.5.5"
12+
const val sqlDelight = "2.0.0"
1313
const val kotlinxDateTime = "0.4.0"
1414
const val multiplatformSettings = "1.0.0"
1515

@@ -101,12 +101,12 @@ object Deps {
101101
}
102102

103103
object SqlDelight {
104-
const val runtime = "com.squareup.sqldelight:runtime:${Versions.sqlDelight}"
105-
const val coroutineExtensions = "com.squareup.sqldelight:coroutines-extensions:${Versions.sqlDelight}"
106-
const val androidDriver = "com.squareup.sqldelight:android-driver:${Versions.sqlDelight}"
107-
const val nativeDriver = "com.squareup.sqldelight:native-driver:${Versions.sqlDelight}"
108-
const val nativeDriverMacos = "com.squareup.sqldelight:native-driver-macosx64:${Versions.sqlDelight}"
109-
const val sqliteDriver = "com.squareup.sqldelight:sqlite-driver:${Versions.sqlDelight}"
104+
const val runtime = "app.cash.sqldelight:runtime:${Versions.sqlDelight}"
105+
const val coroutineExtensions = "app.cash.sqldelight:coroutines-extensions:${Versions.sqlDelight}"
106+
const val androidDriver = "app.cash.sqldelight:android-driver:${Versions.sqlDelight}"
107+
const val nativeDriver = "app.cash.sqldelight:native-driver:${Versions.sqlDelight}"
108+
const val nativeDriverMacos = "app.cash.sqldelight:native-driver-macosx64:${Versions.sqlDelight}"
109+
const val sqliteDriver = "app.cash.sqldelight:sqlite-driver:${Versions.sqlDelight}"
110110
}
111111

112112
object Log {

‎ios/GalwayBusAppSwiftUI/GalwayBusAppSwiftUI/AppDelegate.swift‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
//
2-
// AppDelegate.swift
3-
// GalwayBusAppSwiftUI
4-
//
5-
// Created by jooreill on 03/06/2019.
6-
// Copyright © 2019 Surrus. All rights reserved.
7-
//
8-
91
import UIKit
102
import SharedCode
113

0 commit comments

Comments
 (0)