Skip to content

Commit 0cb5961

Browse files
authored
Updating dependencies, SDKs, Kotlin and Gradle (#368)
1 parent ac9ff2b commit 0cb5961

File tree

35 files changed

+328
-274
lines changed

35 files changed

+328
-274
lines changed

.github/workflows/checks.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
if: ${{ !github.event.pull_request.draft }}
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
17-
- name: Set up JDK 11
18-
uses: actions/setup-java@v2
16+
uses: actions/checkout@v3
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v3
1919
with:
20-
java-version: '11'
20+
java-version: '17'
2121
distribution: 'adopt'
2222
- name: Build
2323
run: ./gradlew clean build -x test -x ktlintMainSourceSetCheck
@@ -30,11 +30,11 @@ jobs:
3030
if: ${{ !github.event.pull_request.draft }}
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v2
34-
- name: Set up JDK 11
35-
uses: actions/setup-java@v2
33+
uses: actions/checkout@v3
34+
- name: Set up JDK 17
35+
uses: actions/setup-java@v3
3636
with:
37-
java-version: '11'
37+
java-version: '17'
3838
distribution: 'adopt'
3939
- name: Lint
4040
run: ./gradlew ktlintCheck
@@ -50,7 +50,7 @@ jobs:
5050
scripts: ${{ 'src/main/assets/_scripts' }}
5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v2
53+
uses: actions/checkout@v3
5454
- name: Install dependencies
5555
run: yarn --cwd "$scripts" install --frozen-lockfile
5656
- name: Lint

.github/workflows/docs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313

1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v3
1717

1818
- name: Fetch tags
1919
run: git fetch --prune --unshallow
2020

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

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

3636
- name: Get current Readium version

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v3
1616
with:
1717
ref: develop
18-
- name: Set up JDK 11
19-
uses: actions/setup-java@v2
18+
- name: Set up JDK 17
19+
uses: actions/setup-java@v3
2020
with:
2121
distribution: adopt
22-
java-version: 11
22+
java-version: 17
2323

2424
# Builds the release artifacts of the library
2525
- name: Release build

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ A [Test App](test-app) demonstrates how to integrate the Readium Kotlin toolkit
2121

2222
| Readium | Android min SDK | Android compile SDK | Kotlin compiler | Gradle |
2323
|---------|-----------------|---------------------|-----------------|--------|
24-
| latest | 21 | 33 | 1.7.10 | 6.9.3 |
24+
| 3.0.0 | 21 | 34 | 1.9.0 | 8.0.0 |
25+
| 2.3.0 | 21 | 33 | 1.7.10 | 6.9.3 |
2526

2627
## Setting Up Readium
2728

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ plugins {
1212
id("io.github.gradle-nexus.publish-plugin") apply true
1313
id("org.jetbrains.dokka") apply true
1414
id("org.jetbrains.kotlin.android") apply false
15+
id("com.google.devtools.ksp") apply false
1516
id("org.jlleitschuh.gradle.ktlint") apply true
1617
}
1718

docs/guides/media-navigator.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ Don't forget to declare this new service in your `AndroidManifest.xml`.
123123
<manifest ...>
124124

125125
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
126+
<!-- If targeting Android SDK 34, you will need this permission -->
127+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
126128

127129
<application ...>
128130
...

docs/migration-guide.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,13 @@ Both the Fuel and Kovenant libraries have been completely removed from the toolk
138138

139139
* `Response.sniffMediaType(...)` has been replaced with `org.readium.r2.shared.util.mediatype.sniffMediaType`
140140

141+
### Targeting Android SDK 34
142+
143+
The modules now target Android SDK 34. If your app also targets that, you will need the `FOREGROUND_SERVICE_MEDIA_PLAYBACK` permission in you AndroidManifest.xml file in order to use TTS and audiobook playback.
144+
145+
### Gradle 8.0
146+
147+
The minimum required Gradle version is now 8.0.
141148

142149
## 2.3.0
143150

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,3 @@ android.useAndroidX=true
1919
android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
2121
kotlin.code.style=official
22-
23-
android.disableAutomaticComponentCreation=true

gradle/libs.versions.toml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,58 @@
11
[versions]
22

3-
androidx-activity = "1.6.1"
4-
androidx-appcompat = "1.5.1"
5-
androidx-browser = "1.4.0"
3+
androidx-activity = "1.7.2"
4+
androidx-appcompat = "1.6.1"
5+
androidx-browser = "1.5.0"
66
androidx-cardview = "1.0.0"
7-
androidx-compose-compiler = "1.3.2"
8-
androidx-compose-animation = "1.3.0-beta03"
9-
androidx-compose-foundation = "1.3.0-beta03"
10-
androidx-compose-material = "1.3.0-beta03"
11-
androidx-compose-material3 = "1.0.0-beta03"
12-
androidx-compose-runtime = "1.3.0-beta03"
7+
androidx-compose-compiler = "1.5.0"
8+
androidx-compose-animation = "1.4.3"
9+
androidx-compose-foundation = "1.4.3"
10+
androidx-compose-material = "1.4.3"
11+
androidx-compose-material3 = "1.1.1"
12+
androidx-compose-runtime = "1.4.3"
1313
androidx-compose-theme-adapter = "1.1.19"
14-
androidx-compose-ui = "1.3.0-beta03"
14+
androidx-compose-ui = "1.4.3"
1515
androidx-constraintlayout = "2.1.4"
16-
androidx-core = "1.9.0"
16+
androidx-core = "1.10.1"
1717
androidx-datastore = "1.0.0"
18-
androidx-expresso-core = "3.4.0"
19-
androidx-ext-junit = "1.1.3"
20-
androidx-fragment-ktx = "1.5.4"
18+
androidx-expresso-core = "3.5.1"
19+
androidx-ext-junit = "1.1.5"
20+
androidx-fragment-ktx = "1.6.0"
2121
androidx-legacy = "1.0.0"
22-
androidx-lifecycle = "2.5.1"
22+
androidx-lifecycle = "2.6.1"
2323
androidx-lifecycle-extensions = "2.2.0"
2424
androidx-media = "1.6.0"
2525
androidx-media2 = "1.2.1"
26-
androidx-media3 = "1.0.0"
26+
androidx-media3 = "1.1.0"
2727
androidx-navigation = "2.5.2"
2828
androidx-paging = "3.1.1"
29-
androidx-recyclerview = "1.2.1"
30-
androidx-room = "2.4.3"
29+
androidx-recyclerview = "1.3.0"
30+
androidx-room = "2.5.2"
3131
androidx-viewpager2 = "1.0.0"
32-
androidx-webkit = "1.5.0"
32+
androidx-webkit = "1.7.0"
3333

34-
assertj = "3.23.1"
34+
assertj = "3.24.2"
3535

36-
dokka = "1.7.20"
36+
dokka = "1.8.20"
3737

38-
google-exoplayer = "2.18.1"
39-
google-material = "1.7.0"
38+
google-exoplayer = "2.19.0"
39+
google-material = "1.9.0"
4040

41-
joda-time = "2.12.1"
42-
jsoup = "1.15.3"
41+
joda-time = "2.12.5"
42+
jsoup = "1.16.1"
4343
junit = "4.13.2"
4444

45-
kotlin = "1.7.20"
46-
kotlinx-coroutines = "1.6.4"
47-
kotlinx-coroutines-test = "1.6.4"
48-
kotlinx-serialization-json = "1.4.1"
45+
kotlin = "1.9.0"
46+
kotlinx-coroutines = "1.7.2"
47+
kotlinx-coroutines-test = "1.7.2"
48+
kotlinx-serialization-json = "1.5.1"
4949

5050
pdfium = "1.8.2"
5151
pdf-viewer = "2.8.2"
52-
picasso = "2.71828"
52+
picasso = "2.8"
5353
pspdfkit = "8.4.1"
5454

55-
robolectric = "4.9"
55+
robolectric = "4.10.3"
5656

5757
timber = "5.0.1"
5858

@@ -119,7 +119,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
119119
kotlin-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
120120
kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
121121
kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
122-
kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
122+
kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
123123

124124
kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
125125
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }

0 commit comments

Comments
 (0)