Skip to content
This repository has been archived by the owner on Jun 1, 2019. It is now read-only.

Bump sqldelight plugin from 1.0.3 to 1.1.3 #51

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bump sqldelight plugin from 1.0.3 to 1.1.3 #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1509b9
Bump gradle-plugin from 1.0.3 to 1.1.3
dependabot-support Apr 15, 2019
5e4cc1c
Update config style
molikuner Apr 20, 2019
c6bbebd
Bump android-driver from 1.0.3 to 1.1.3
molikuner Apr 21, 2019
7208908
Bump ios-driver from 1.0.3 to 1.1.3
molikuner Apr 21, 2019
4872904
Update code to reflect changes in code generation of SQLDelight
molikuner Apr 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/sqldelight/app/.sqldelight
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 7 additions & 10 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}
Expand All @@ -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'
}
}
Expand Down Expand Up @@ -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'
}
}
6 changes: 3 additions & 3 deletions app/src/commonMain/kotlin/com/molikuner/vpapp/data/types/MenuSerializer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ object MenuSerializer : KSerializer<Menu> {
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)
Expand All @@ -31,7 +31,7 @@ object MenuSerializer : KSerializer<Menu> {
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)
Expand All @@ -47,7 +47,7 @@ object MenuSerializer : KSerializer<Menu> {
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)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down