Skip to content

Commit c3dd58f

Browse files
authored
Merge pull request #55 from pretix/sqldelight2
Remove requery
2 parents 13a605e + b0b484c commit c3dd58f

File tree

74 files changed

+144
-3440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+144
-3440
lines changed

libpretixsync/build-postgres.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@ check.dependsOn jacocoTestReport
9090
dependencies {
9191
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
9292
testFixturesImplementation "com.squareup.okhttp3:okhttp:$okhttp_version"
93-
implementation "io.requery:requery:$requery_version"
94-
testFixturesImplementation "io.requery:requery:$requery_version"
95-
implementation "io.requery:requery-kotlin:$requery_version"
96-
testFixturesImplementation "io.requery:requery-kotlin:$requery_version"
9793
implementation "joda-time:joda-time:$joda_version"
9894

9995
implementation "org.json:json:$json_version"
@@ -110,7 +106,6 @@ dependencies {
110106

111107
implementation "app.cash.sqldelight:jdbc-driver:$sqldelight_version"
112108

113-
kapt "io.requery:requery-processor:$requery_version"
114109
annotationProcessor "javax.annotation:jsr250-api:$jsr250_version"
115110

116111
testFixturesImplementation "junit:junit:$junit_version"

libpretixsync/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ check.dependsOn jacocoTestReport
8787
dependencies {
8888
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
8989
testFixturesImplementation "com.squareup.okhttp3:okhttp:$okhttp_version"
90-
implementation "io.requery:requery:$requery_version"
91-
testFixturesImplementation "io.requery:requery:$requery_version"
92-
implementation "io.requery:requery-kotlin:$requery_version"
93-
testFixturesImplementation "io.requery:requery-kotlin:$requery_version"
9490
implementation "joda-time:joda-time:$joda_version"
9591

9692
implementation "org.json:json:$json_version"
@@ -107,7 +103,6 @@ dependencies {
107103

108104
implementation "app.cash.sqldelight:sqlite-driver:$sqldelight_version"
109105

110-
kapt "io.requery:requery-processor:$requery_version"
111106
annotationProcessor "javax.annotation:jsr250-api:$jsr250_version"
112107

113108
testFixturesImplementation "junit:junit:$junit_version"
@@ -141,7 +136,7 @@ sqldelight {
141136
schemaOutputDirectory.set(file("src/main/sqldelight/sqlite"))
142137

143138

144-
// Oldest dialect supported by SQLDelight 2.0.2
139+
// Oldest dialect supported by SQLDelight 2.1.0
145140
// In Android projects, it will auto-select based on SDK
146141
// but not go lower than 3.18 (Android 9 is still on 3.8)
147142
dialect "app.cash.sqldelight:sqlite-3-18-dialect:$sqldelight_version"

libpretixsync/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pluginManagement {
1313
plugins {
1414
id "org.jetbrains.kotlin.jvm" version "1.9.23" apply false
1515
id "com.google.protobuf" version "0.9.4" apply false
16-
id "app.cash.sqldelight" version "2.0.2" apply false
16+
id "app.cash.sqldelight" version "2.1.0" apply false
1717
}
1818

1919
rootProject.name = 'eu.pretix.libpretixsync'

libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractBadgeLayout.java

Lines changed: 0 additions & 32 deletions
This file was deleted.

libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractBadgeLayoutItem.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractBlockedTicketSecret.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractCachedPdfImage.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractCashier.java

Lines changed: 0 additions & 103 deletions
This file was deleted.

libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractCheckIn.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)