Skip to content

Commit fecd9b6

Browse files
authored
Update dependencies and Android SDK (#678)
1 parent 52934c3 commit fecd9b6

File tree

6 files changed

+37
-34
lines changed

6 files changed

+37
-34
lines changed

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: git fetch --prune --unshallow
2020

2121
- name: Set up Python
22-
uses: actions/setup-python@v4
22+
uses: actions/setup-python@v5
2323
with:
2424
python-version: 3.11.6
2525

@@ -28,7 +28,7 @@ jobs:
2828
python -m pip install --upgrade pip
2929
pip install mkdocs mkdocs-material mike
3030
31-
- uses: actions/setup-java@v3
31+
- uses: actions/setup-java@v4
3232
with:
3333
java-version: 17
3434
distribution: 'adopt'

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: Set up JDK 17
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with:
1818
distribution: adopt
1919
java-version: 17

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Guides are available to help you make the most of the toolkit.
8585

8686
| Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) |
8787
|-----------|-----------------|---------------------|---------------------|------------|
88-
| `develop` | 21 | 35 | 2.1.20 | 8.13 |
88+
| `develop` | 21 | 36 | 2.1.21 | 8.14.1 |
8989
| 3.1.0 | 21 | 35 | 2.1.20 | 8.13 |
9090
| 3.0.0 | 21 | 34 | 1.9.24 | 8.6.0 |
9191
| 2.3.0 | 21 | 33 | 1.7.10 | 6.9.3 |

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pom.groupId=org.readium.kotlin-toolkit
99
pom.version=3.1.1
1010

1111
android.minSdk=21
12-
android.compileSdk=35
13-
android.targetSdk=35
12+
android.compileSdk=36
13+
android.targetSdk=36
1414

1515
# Specifies the JVM arguments used for the daemon process.
1616
# The setting is particularly useful for tweaking memory settings.

gradle/libs.versions.toml

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
11
[versions]
22

3-
kotlin = "2.1.20"
4-
agp = "8.9.1"
3+
kotlin = "2.1.21"
4+
agp = "8.10.1"
55
desugar_jdk_libs = "2.1.5"
6-
gradle-maven-publish-plugin = "0.28.0"
6+
gradle-maven-publish-plugin = "0.32.0"
77

88
androidx-activity = "1.10.1"
99
androidx-annotation = "1.9.1"
1010
androidx-appcompat = "1.7.0"
1111
androidx-browser = "1.8.0"
1212
androidx-cardview = "1.0.0"
13-
androidx-compose-animation = "1.7.8"
14-
androidx-compose-foundation = "1.7.8"
15-
androidx-compose-material = "1.7.8"
16-
androidx-compose-material3 = "1.3.1"
17-
androidx-compose-runtime = "1.7.8"
18-
androidx-compose-ui = "1.7.8"
13+
androidx-compose-animation = "1.8.2"
14+
androidx-compose-foundation = "1.8.2"
15+
androidx-compose-material = "1.8.2"
16+
androidx-compose-material-icons = "1.7.8"
17+
androidx-compose-material3 = "1.3.2"
18+
androidx-compose-runtime = "1.8.2"
19+
androidx-compose-ui = "1.8.2"
1920
androidx-constraintlayout = "2.2.1"
20-
androidx-core = "1.15.0"
21-
androidx-datastore = "1.1.4"
22-
androidx-fragment-ktx = "1.8.6"
21+
androidx-core = "1.16.0"
22+
androidx-datastore = "1.1.7"
23+
androidx-fragment-ktx = "1.8.7"
2324
androidx-legacy = "1.0.0"
24-
androidx-lifecycle = "2.8.7"
25-
androidx-media3 = "1.6.0"
26-
androidx-navigation = "2.8.9"
25+
androidx-lifecycle = "2.9.0"
26+
androidx-media3 = "1.7.1"
27+
androidx-navigation = "2.9.0"
2728
androidx-paging = "3.3.6"
2829
androidx-recyclerview = "1.4.0"
29-
androidx-room = "2.7.0"
30+
androidx-room = "2.7.1"
3031
androidx-viewpager2 = "1.1.0"
3132
androidx-webkit = "1.13.0"
3233

33-
assertj = "3.26.3"
34+
assertj = "3.27.3"
3435

3536
dokka = "1.9.20"
3637

3738
google-material = "1.12.0"
3839

39-
joda-time = "2.13.0"
40+
joda-time = "2.14.0"
41+
#Do not upgrade without fixing unit tests in HtmlResourceContentIteratorTest and regression testing
42+
#See https://github.com/jhy/jsoup/pull/2283
4043
jsoup = "1.18.1"
4144
junit = "4.13.2"
4245

43-
kotlinx-coroutines = "1.10.1"
44-
kotlinx-coroutines-test = "1.10.1"
45-
kotlinx-datetime = "0.6.1"
46-
kotlinx-serialization-json = "1.7.3"
46+
kotlinx-coroutines = "1.10.2"
47+
kotlinx-coroutines-test = "1.10.2"
48+
kotlinx-datetime = "0.6.2"
49+
kotlinx-serialization-json = "1.8.1"
4750

4851
# Make sure to align with the Kotlin version.
4952
# See https://github.com/google/ksp/releases
50-
ksp = "2.1.20-1.0.32"
53+
ksp = "2.1.21-2.0.1"
5154

5255
ktlint = "12.1.1"
5356

@@ -57,8 +60,8 @@ ktlint = "12.1.1"
5760
picasso = "2.8"
5861
pspdfkit = "8.4.1"
5962

60-
robolectric = "4.13"
61-
mockk = "1.13.14"
63+
robolectric = "4.14.1"
64+
mockk = "1.14.2"
6265

6366
timber = "5.0.1"
6467

@@ -75,7 +78,7 @@ androidx-compose-animation = { group = "androidx.compose.animation", name = "ani
7578
androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "androidx-compose-foundation" }
7679
androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "androidx-compose-material" }
7780
androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "androidx-compose-material3" }
78-
androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose-material" }
81+
androidx-compose-material-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "androidx-compose-material-icons" }
7982
androidx-compose-runtime = { group = "androidx.compose.runtime", name = "runtime", version.ref = "androidx-compose-runtime" }
8083
androidx-compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "androidx-compose-ui" }
8184
androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "androidx-compose-ui" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)