From d1509b987541a73d3a202b14c5ebd304f997eba8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" Date: Mon, 15 Apr 2019 05:57:58 +0000 Subject: [PATCH 1/5] Bump gradle-plugin from 1.0.3 to 1.1.3 Bumps [gradle-plugin](https://github.com/square/sqldelight) from 1.0.3 to 1.1.3. - [Release notes](https://github.com/square/sqldelight/releases) - [Changelog](https://github.com/square/sqldelight/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/sqldelight/compare/1.0.3...1.1.3) Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8b22ca4..c8aa79d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.3.2' classpath "org.jetbrains.kotlin:kotlin-serialization:1.3.30" - classpath "com.squareup.sqldelight:gradle-plugin:1.0.3" + classpath "com.squareup.sqldelight:gradle-plugin:1.1.3" } } repositories { From 5e4cc1c5695675ee475dcaab0b1276ceb9206590 Mon Sep 17 00:00:00 2001 From: Molikuner Date: Sat, 20 Apr 2019 17:36:30 +0200 Subject: [PATCH 2/5] Update config style --- .idea/sqldelight/app/.sqldelight | 2 +- app/build.gradle | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.idea/sqldelight/app/.sqldelight b/.idea/sqldelight/app/.sqldelight index 807a9cc..cb8491d 100644 --- a/.idea/sqldelight/app/.sqldelight +++ b/.idea/sqldelight/app/.sqldelight @@ -1 +1 @@ -{"packageName":"com.molikuner.vpapp.data.local","sourceSets":[["src/commonMain/sqldelight"]],"outputDirectory":"build/sqldelight","className":"Database"} \ No newline at end of file +{"databases":[{"packageName":"com.molikuner.vpapp.data.local","compilationUnits":[{"name":"androidDebug","sourceFolders":[{"path":"src/androidDebug/sqldelight","dependency":false},{"path":"src/androidMain/sqldelight","dependency":false},{"path":"src/commonMain/sqldelight","dependency":false}]},{"name":"androidRelease","sourceFolders":[{"path":"src/androidMain/sqldelight","dependency":false},{"path":"src/androidRelease/sqldelight","dependency":false},{"path":"src/commonMain/sqldelight","dependency":false}]},{"name":"iosMain","sourceFolders":[{"path":"src/commonMain/sqldelight","dependency":false},{"path":"src/iosMain/sqldelight","dependency":false}]},{"name":"metadataMain","sourceFolders":[{"path":"src/commonMain/sqldelight","dependency":false}]}],"outputDirectory":"build/sqldelight/Database","className":"Database","dependencies":[]}]} \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4dc6240..2130ba1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,8 +67,8 @@ kotlin { } commonTest { dependencies { - implementation kotlin('test-common') - implementation kotlin('test-annotations-common') + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') implementation kotlin('reflect') api 'org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.1.1' api 'org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.10.0' @@ -139,10 +139,7 @@ kotlin { //} sqldelight { - packageName = 'com.molikuner.vpapp.data.local' - sourceSet = files('src/commonMain/sqldelight') - //Database { - // packageName = 'com.molikuner.vpapp.data.local' - // sourceFolders = ['sqldelight'] - //} + Database { + packageName = 'com.molikuner.vpapp.data.local' + } } From c6bbebdd62cd04161e4ce9f496bc834005980574 Mon Sep 17 00:00:00 2001 From: Molikuner Date: Sun, 21 Apr 2019 15:23:31 +0200 Subject: [PATCH 3/5] Bump android-driver from 1.0.3 to 1.1.3 Bumps [android-driver](https://github.com/square/sqldelight) from 1.0.3 to 1.1.3. - [Release notes](https://github.com/square/sqldelight/releases) - [Changelog](https://github.com/square/sqldelight/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/sqldelight/compare/1.0.3...1.1.3) Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 2130ba1..7e47109 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -90,7 +90,7 @@ kotlin { implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha04' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.2.0' - implementation 'com.squareup.sqldelight:android-driver:1.0.3' + implementation 'com.squareup.sqldelight:android-driver:1.1.3' implementation 'io.ktor:ktor-client-json-jvm:1.1.3' implementation 'io.ktor:ktor-client-android:1.1.3' } From 720890844cac81cd7566b518ee158131c64181e4 Mon Sep 17 00:00:00 2001 From: Molikuner Date: Sun, 21 Apr 2019 15:25:16 +0200 Subject: [PATCH 4/5] Bump ios-driver from 1.0.3 to 1.1.3 Bumps [ios-driver](https://github.com/square/sqldelight) from 1.0.3 to 1.1.3. - [Release notes](https://github.com/square/sqldelight/releases) - [Changelog](https://github.com/square/sqldelight/blob/master/CHANGELOG.md) - [Commits](https://github.com/square/sqldelight/compare/1.0.3...1.1.3) Signed-off-by: dependabot[bot] --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 7e47109..f64377f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -104,7 +104,7 @@ kotlin { } iosMain { dependencies { - implementation 'com.squareup.sqldelight:ios-driver:1.0.3' + implementation 'com.squareup.sqldelight:ios-driver:1.1.3' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.2.0' } } From 48729049a86ee3ef783d26a542c914c35eec3aed Mon Sep 17 00:00:00 2001 From: Molikuner Date: Sun, 21 Apr 2019 16:50:00 +0200 Subject: [PATCH 5/5] Update code to reflect changes in code generation of SQLDelight --- .idea/sqldelight/app/.sqldelight | 2 +- .../kotlin/com/molikuner/vpapp/data/types/MenuSerializer.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/sqldelight/app/.sqldelight b/.idea/sqldelight/app/.sqldelight index cb8491d..17de237 100644 --- a/.idea/sqldelight/app/.sqldelight +++ b/.idea/sqldelight/app/.sqldelight @@ -1 +1 @@ -{"databases":[{"packageName":"com.molikuner.vpapp.data.local","compilationUnits":[{"name":"androidDebug","sourceFolders":[{"path":"src/androidDebug/sqldelight","dependency":false},{"path":"src/androidMain/sqldelight","dependency":false},{"path":"src/commonMain/sqldelight","dependency":false}]},{"name":"androidRelease","sourceFolders":[{"path":"src/androidMain/sqldelight","dependency":false},{"path":"src/androidRelease/sqldelight","dependency":false},{"path":"src/commonMain/sqldelight","dependency":false}]},{"name":"iosMain","sourceFolders":[{"path":"src/commonMain/sqldelight","dependency":false},{"path":"src/iosMain/sqldelight","dependency":false}]},{"name":"metadataMain","sourceFolders":[{"path":"src/commonMain/sqldelight","dependency":false}]}],"outputDirectory":"build/sqldelight/Database","className":"Database","dependencies":[]}]} \ No newline at end of file +{"databases":[{"packageName":"com.molikuner.vpapp.data.local","compilationUnits":[{"name":"androidDebug","sourceFolders":[{"path":"src/androidDebug/sqldelight","dependency":false},{"path":"src/androidMain/sqldelight","dependency":false},{"path":"src/commonMain/sqldelight","dependency":false}]},{"name":"androidRelease","sourceFolders":[{"path":"src/androidMain/sqldelight","dependency":false},{"path":"src/androidRelease/sqldelight","dependency":false},{"path":"src/commonMain/sqldelight","dependency":false}]},{"name":"metadataMain","sourceFolders":[{"path":"src/commonMain/sqldelight","dependency":false}]}],"outputDirectory":"build/sqldelight/Database","className":"Database","dependencies":[]}]} \ No newline at end of file diff --git a/app/src/commonMain/kotlin/com/molikuner/vpapp/data/types/MenuSerializer.kt b/app/src/commonMain/kotlin/com/molikuner/vpapp/data/types/MenuSerializer.kt index 0ca48f2..21224b0 100644 --- a/app/src/commonMain/kotlin/com/molikuner/vpapp/data/types/MenuSerializer.kt +++ b/app/src/commonMain/kotlin/com/molikuner/vpapp/data/types/MenuSerializer.kt @@ -19,7 +19,7 @@ object MenuSerializer : KSerializer { init { addElement(Menu::id, 0) addElement(Menu::day, 1, Time.Day.descriptor) - addElement(Menu::_default_, 2) + addElement(Menu::default, 2) addElement(Menu::vegetarian, 3) addElement(Menu::dessert, 4) addElement(Menu::evening, 5) @@ -31,7 +31,7 @@ object MenuSerializer : KSerializer { Menu.Impl( id = decodeSerializableElement(0, UUID.serializer()), day = decodeSerializableElement(1, Time.Day.serializer()), - _default_ = decodeStringElement(2), + default = decodeStringElement(2), vegetarian = decodeNullableStringElement(3), dessert = decodeNullableStringElement(4), evening = decodeNullableStringElement(5) @@ -47,7 +47,7 @@ object MenuSerializer : KSerializer { return encoder.use(descriptor) { encodeSerializableElement(0, UUID.serializer(), obj.id) encodeSerializableElement(1, Time.Day.serializer(), obj.day) - encodeStringElement(2, obj._default_) + encodeStringElement(2, obj.default) encodeNullableStringElement(3, obj.vegetarian) encodeNullableStringElement(4, obj.dessert) encodeNullableStringElement(5, obj.evening)