Skip to content

Commit

Permalink
Update submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelm committed Apr 18, 2024
1 parent 0c3d696 commit d88673a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
26 changes: 14 additions & 12 deletions pretixscan/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ try {
// Optional
}

apply from: '../libpretixsync-repo/libpretixsync/versions.gradle'

android {
namespace 'eu.pretix.pretixscan.droid'

Expand Down Expand Up @@ -131,21 +133,21 @@ dependencies {
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
implementation 'com.github.kizitonwose:CalendarView:1.0.4'

implementation 'com.squareup.okhttp3:okhttp:4.9.3'
implementation 'com.squareup.okhttp3:okhttp-tls:4.9.3'
implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
implementation "com.squareup.okhttp3:okhttp-tls:$okhttp_version"
implementation 'io.sentry:sentry-android:6.29.0'
implementation 'org.slf4j:slf4j-nop:1.7.30'
implementation 'joda-time:joda-time:2.10.10'
implementation 'io.requery:requery:1.6.0'
implementation 'io.requery:requery-android:1.6.0'
implementation 'io.requery:requery-kotlin:1.6.0'
implementation "joda-time:joda-time:$joda_version"
implementation "io.requery:requery:$requery_version"
implementation "io.requery:requery-android:$requery_version"
implementation "io.requery:requery-kotlin:$requery_version"
implementation 'net.zetetic:android-database-sqlcipher:3.5.9'
implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.3'
implementation "com.fasterxml.jackson.core:jackson-databind:2.13.0"
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.13.0"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:2.13.0"
implementation 'net.i2p.crypto:eddsa:0.3.0'
implementation 'com.google.protobuf:protobuf-javalite:3.21.1'
implementation "net.sourceforge.streamsupport:streamsupport-cfuture:$cfuture_version"
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_core_version"
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:$jackson_kotlin_version"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_core_version"
implementation "net.i2p.crypto:eddsa:$eddsa_version"
implementation "com.google.protobuf:protobuf-javalite:$protobuf_version"

implementation 'com.facebook.soloader:soloader:0.10.5'
debugImplementation 'com.facebook.flipper:flipper:0.191.0'
Expand Down
2 changes: 1 addition & 1 deletion pretixscan/libpretixsync-repo
Submodule libpretixsync-repo updated 51 files
+22 −15 libpretixsync/build-postgres.gradle
+22 −17 libpretixsync/build.gradle
+23 −0 libpretixsync/src/main/java/eu/pretix/libpretixsync/api/PermissionDeniedApiException.java
+1 −1 libpretixsync/src/main/java/eu/pretix/libpretixsync/api/PretixApi.kt
+19 −6 libpretixsync/src/main/java/eu/pretix/libpretixsync/check/AsyncCheckProvider.kt
+2 −1 libpretixsync/src/main/java/eu/pretix/libpretixsync/check/OnlineCheckProvider.kt
+1 −1 libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractCashier.java
+2 −0 libpretixsync/src/main/java/eu/pretix/libpretixsync/db/AbstractQuestion.java
+1 −1 libpretixsync/src/main/java/eu/pretix/libpretixsync/db/CashierLike.java
+4 −0 libpretixsync/src/main/java/eu/pretix/libpretixsync/db/QuestionLike.java
+4 −0 libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/SyncException.java
+23 −13 libpretixsync/src/main/java/eu/pretix/libpretixsync/sync/SyncManager.java
+12 −0 libpretixsync/src/main/java/eu/pretix/libpretixsync/utils/InputUtils.kt
+68 −14 libpretixsync/src/test/java/eu/pretix/libpretixsync/check/AsyncCheckProviderTest.kt
+8 −7 libpretixsync/src/test/java/eu/pretix/libpretixsync/sync/OrderSyncTest.kt
+1 −1 libpretixsync/src/test/java/eu/pretix/libpretixsync/utils/JsonLogicTests.kt
+1 −1 libpretixsync/src/testFixtures/java/eu/pretix/pretixscan/scanproxy/tests/db/BaseDatabaseTest.java
+1 −1 libpretixsync/src/testFixtures/java/eu/pretix/pretixscan/scanproxy/tests/test/FakeConfigStore.kt
+1 −1 libpretixsync/src/testFixtures/java/eu/pretix/pretixscan/scanproxy/tests/test/FakeFileStorage.kt
+12 −1 libpretixsync/src/testFixtures/java/eu/pretix/pretixscan/scanproxy/tests/test/FakePretixApi.kt
+1 −1 libpretixsync/src/testFixtures/java/eu/pretix/pretixscan/scanproxy/tests/test/ResUtils.kt
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/event2-list7.json
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/list1.json
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/list2.json
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/list3.json
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/list4.json
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/list5.json
+0 −0 libpretixsync/src/testFixtures/resources/checkinlists/list6.json
+0 −0 libpretixsync/src/testFixtures/resources/events/event1-secret-key.txt
+0 −0 libpretixsync/src/testFixtures/resources/events/event1.json
+0 −0 libpretixsync/src/testFixtures/resources/events/event2.json
+0 −0 libpretixsync/src/testFixtures/resources/items/event2-item3.json
+0 −0 libpretixsync/src/testFixtures/resources/items/item1.json
+0 −0 libpretixsync/src/testFixtures/resources/items/item2.json
+0 −0 libpretixsync/src/testFixtures/resources/jsonlogic/tests.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/event2-order1.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order1-modified.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order1.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order2.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order3.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order4.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order5.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order6.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order7.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order8.json
+0 −0 libpretixsync/src/testFixtures/resources/orders/order9.json
+0 −0 libpretixsync/src/testFixtures/resources/questions/question1.json
+0 −0 libpretixsync/src/testFixtures/resources/questions/question2.json
+0 −0 libpretixsync/src/testFixtures/resources/questions/question3.json
+0 −0 libpretixsync/src/testFixtures/resources/subevents/subevent1.json
+13 −0 libpretixsync/versions.gradle

0 comments on commit d88673a

Please sign in to comment.