Skip to content

Commit 5fecd44

Browse files
committed
Upgrade libraries
* Upgrade sqlite (https://ebce-lyrasis.atlassian.net/browse/PP-2780) * Upgrade datastore (https://ebce-lyrasis.atlassian.net/browse/PP-2779) * Upgrade firebase to prevent a conflict with the above.
1 parent 334c512 commit 5fecd44

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

README-CHANGES.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@
694694
</c:change>
695695
</c:changes>
696696
</c:release>
697-
<c:release date="2025-08-05T09:13:00+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.17.0">
697+
<c:release date="2025-08-06T12:14:22+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.17.0">
698698
<c:changes>
699699
<c:change date="2025-07-15T00:00:00+00:00" summary="Add support for Boundless DRM."/>
700700
<c:change date="2025-07-15T00:00:00+00:00" summary="Respect book cover aspect ratios.">
@@ -722,11 +722,21 @@
722722
<c:ticket id="PP-2736"/>
723723
</c:tickets>
724724
</c:change>
725-
<c:change date="2025-08-05T09:13:00+00:00" summary="Make Adobe DRM 16k page compatible, and remove libepub3.so.">
725+
<c:change date="2025-08-05T00:00:00+00:00" summary="Make Adobe DRM 16k page compatible, and remove libepub3.so.">
726726
<c:tickets>
727727
<c:ticket id="PP-2775"/>
728728
</c:tickets>
729729
</c:change>
730+
<c:change date="2025-08-06T00:00:00+00:00" summary="Update sqlite to be 16k page compatible.">
731+
<c:tickets>
732+
<c:ticket id="PP-2780"/>
733+
</c:tickets>
734+
</c:change>
735+
<c:change date="2025-08-06T12:14:22+00:00" summary="Update datastore to be 16k page compatible.">
736+
<c:tickets>
737+
<c:ticket id="PP-2779"/>
738+
</c:tickets>
739+
</c:change>
730740
</c:changes>
731741
</c:release>
732742
</c:releases>

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,7 @@ allprojects {
818818
afterEvaluate {
819819
configurations.all {
820820
isTransitive = transitiveConfigurations.contains(name)
821+
// isTransitive = true
821822
// resolutionStrategy.failOnVersionConflict()
822823
}
823824
}

simplified-app-palace/build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -496,13 +496,10 @@ dependencies {
496496
implementation(libs.firebase.analytics)
497497
implementation(libs.firebase.annotations)
498498
implementation(libs.firebase.common)
499-
implementation(libs.firebase.common.ktx)
500499
implementation(libs.firebase.components)
501500
implementation(libs.firebase.config.interop)
502501
implementation(libs.firebase.crashlytics)
503502
implementation(libs.firebase.datatransport)
504-
implementation(libs.firebase.dynamic.links)
505-
implementation(libs.firebase.dynamic.links.ktx)
506503
implementation(libs.firebase.encoders)
507504
implementation(libs.firebase.encoders.json)
508505
implementation(libs.firebase.encoders.proto)
@@ -511,7 +508,6 @@ dependencies {
511508
implementation(libs.firebase.installations.interop)
512509
implementation(libs.firebase.measurement.connector)
513510
implementation(libs.firebase.messaging)
514-
implementation(libs.firebase.messaging.ktx)
515511
implementation(libs.firebase.sessions)
516512
implementation(libs.google.exoplayer)
517513
implementation(libs.google.failureaccess)
@@ -548,6 +544,11 @@ dependencies {
548544
implementation(libs.kotlinx.coroutines.core.jvm)
549545
implementation(libs.kotlinx.coroutines.play.services)
550546
implementation(libs.kotlinx.datetime)
547+
implementation(libs.kotlinx.serialization.core)
548+
implementation(libs.kotlinx.serialization.core.jvm)
549+
implementation(libs.kotlinx.serialization.json)
550+
implementation(libs.kotlinx.serialization.json.jvm)
551+
implementation(libs.kotlinx.serialization.protobuf)
551552
implementation(libs.logback.android)
552553
implementation(libs.moznion.uribuildertiny)
553554
implementation(libs.okhttp3)

simplified-notifications/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ dependencies {
88

99
implementation(libs.androidx.core)
1010
implementation(libs.firebase.messaging)
11-
implementation(libs.firebase.messaging.ktx)
1211
implementation(libs.irradia.mime.api)
1312
implementation(libs.jackson.core)
1413
implementation(libs.jackson.databind)

simplified-tests/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,7 @@ val dependencyObjects = listOf(
144144
libs.conscrypt,
145145
libs.firebase.analytics,
146146
libs.firebase.crashlytics,
147-
libs.firebase.dynamic.links,
148-
libs.firebase.dynamic.links.ktx,
149147
libs.firebase.messaging,
150-
libs.firebase.messaging.ktx,
151148
libs.google.failureaccess,
152149
libs.google.guava,
153150
libs.google.material,
@@ -187,6 +184,11 @@ val dependencyObjects = listOf(
187184
libs.kotlin.stdlib,
188185
libs.kotlinx.coroutines,
189186
libs.kotlinx.datetime,
187+
libs.kotlinx.serialization.core,
188+
libs.kotlinx.serialization.core.jvm,
189+
libs.kotlinx.serialization.json,
190+
libs.kotlinx.serialization.json.jvm,
191+
libs.kotlinx.serialization.protobuf,
190192
libs.logback.classic,
191193
libs.logback.core,
192194
libs.media3.common,

simplified-ui/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,7 @@ dependencies {
129129
implementation(libs.androidx.vectordrawable)
130130
implementation(libs.androidx.vectordrawable.animated)
131131
implementation(libs.androidx.viewpager2)
132-
implementation(libs.firebase.dynamic.links)
133-
implementation(libs.firebase.dynamic.links.ktx)
134132
implementation(libs.firebase.messaging)
135-
implementation(libs.firebase.messaging.ktx)
136133
implementation(libs.google.failureaccess)
137134
implementation(libs.google.guava)
138135
implementation(libs.google.material)

0 commit comments

Comments
 (0)