Skip to content

Commit

Permalink
Update dependencies (readium#443)
Browse files Browse the repository at this point in the history
  • Loading branch information
mickael-menu committed Jan 15, 2024
1 parent 5b718ad commit 54383a5
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ A [Test App](test-app) demonstrates how to integrate the Readium Kotlin toolkit

| Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) |
|---------|-----------------|---------------------|---------------------|------------|
| 3.0.0 | 21 | 34 | 1.9.0 | 8.0.0 |
| 3.0.0 | 21 | 34 | 1.9.22 | 8.2.0 |
| 2.3.0 | 21 | 33 | 1.7.10 | 6.9.3 |

✻ Only required if you integrate Readium as a submodule instead of using Maven Central.
Expand Down
2 changes: 1 addition & 1 deletion docs/migration-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ First of all, upgrade to version 2.4.0 and resolve any deprecation notices. This

### Minimum requirements

If you integrate Readium 3.0 as a submodule, it requires Kotlin 1.9.0 and Gradle 8.0.0. You should start by updating these dependencies in your application.
If you integrate Readium 3.0 as a submodule, it requires Kotlin 1.9.22 and Gradle 8.2.0. You should start by updating these dependencies in your application.

#### Targeting Android SDK 34

Expand Down
45 changes: 24 additions & 21 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,57 @@

accompanist = "0.30.1"

androidx-activity = "1.7.2"
androidx-activity = "1.8.2"
androidx-appcompat = "1.6.1"
androidx-browser = "1.5.0"
androidx-browser = "1.7.0"
androidx-cardview = "1.0.0"
androidx-compose-compiler = "1.5.1"
androidx-compose-animation = "1.4.3"
androidx-compose-foundation = "1.4.3"
androidx-compose-material = "1.4.3"
androidx-compose-material3 = "1.1.1"
androidx-compose-runtime = "1.4.3"
androidx-compose-ui = "1.4.3"
# Make sure to align with the Kotlin version
# https://developer.android.com/jetpack/androidx/releases/compose-kotlin
androidx-compose-compiler = "1.5.8"
androidx-compose-animation = "1.5.4"
androidx-compose-foundation = "1.5.4"
androidx-compose-material = "1.5.4"
androidx-compose-material3 = "1.1.2"
androidx-compose-runtime = "1.5.4"
androidx-compose-ui = "1.5.4"
androidx-constraintlayout = "2.1.4"
androidx-core = "1.10.1"
androidx-core = "1.12.0"
androidx-datastore = "1.0.0"
androidx-expresso-core = "3.5.1"
androidx-ext-junit = "1.1.5"
androidx-fragment-ktx = "1.6.1"
androidx-fragment-ktx = "1.6.2"
androidx-legacy = "1.0.0"
androidx-lifecycle = "2.6.1"
androidx-lifecycle = "2.6.2"
androidx-lifecycle-extensions = "2.2.0"
androidx-media = "1.6.0"
androidx-media = "1.7.0"
androidx-media2 = "1.2.1"
androidx-media3 = "1.1.0"
androidx-navigation = "2.6.0"
androidx-paging = "3.2.0"
androidx-recyclerview = "1.3.1"
androidx-room = "2.5.2"
androidx-navigation = "2.7.6"
androidx-paging = "3.2.1"
androidx-recyclerview = "1.3.2"
androidx-room = "2.6.1"
androidx-viewpager2 = "1.0.0"
androidx-webkit = "1.7.0"
androidx-webkit = "1.9.0"

assertj = "3.24.2"

dokka = "1.8.20"

google-exoplayer = "2.19.0"
google-material = "1.9.0"
google-exoplayer = "2.19.1"
google-material = "1.11.0"

joda-time = "2.12.5"
jsoup = "1.16.1"
junit = "4.13.2"

kotlin = "1.9.0"
kotlin = "1.9.22"
kotlinx-coroutines = "1.7.3"
kotlinx-coroutines-test = "1.7.3"
kotlinx-serialization-json = "1.5.1"

pdfium = "1.8.2"
pdf-viewer = "2.8.2"
#noinspection GradleDependency
picasso = "2.8"
pspdfkit = "8.4.1"

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ pluginManagement {
// it to integrate Readium in submodules.
// See https://github.com/readium/kotlin-toolkit/pull/97
plugins {
id("com.android.application") version ("8.1.0")
id("com.android.library") version ("8.1.0")
id("com.android.application") version ("8.2.0")
id("com.android.library") version ("8.2.0")
id("io.github.gradle-nexus.publish-plugin") version ("1.3.0")
id("org.jetbrains.dokka") version ("1.8.20")
id("org.jetbrains.kotlin.android") version ("1.9.0")
id("org.jetbrains.kotlin.plugin.serialization") version ("1.9.0")
id("org.jetbrains.kotlin.android") version ("1.9.22")
id("org.jetbrains.kotlin.plugin.serialization") version ("1.9.22")
id("org.jlleitschuh.gradle.ktlint") version ("11.5.1")
// Make sure to align with the Kotlin version.
// See https://github.com/google/ksp/releases
id("com.google.devtools.ksp") version ("1.9.0-1.0.12")
id("com.google.devtools.ksp") version ("1.9.22-1.0.16")
}
}
dependencyResolutionManagement {
Expand Down

0 comments on commit 54383a5

Please sign in to comment.