diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index bb4493707f..131e44d798 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/README.md b/README.md index 21c9610da3..83b80c9cb6 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ | Readium | Android min SDK | Android compile SDK | Kotlin compiler (✻) | Gradle (✻) | |-----------|-----------------|---------------------|---------------------|------------| -| `develop` | 21 | 35 | 2.1.0 | 8.11 | +| `develop` | 21 | 35 | 2.1.20 | 8.13 | | 3.0.0 | 21 | 34 | 1.9.24 | 8.6.0 | | 2.3.0 | 21 | 33 | 1.7.10 | 6.9.3 | diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index daa1ad3540..ea97309d89 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,34 +1,34 @@ [versions] -kotlin = "2.1.0" -agp = "8.7.2" -desugar_jdk_libs = "2.1.2" +kotlin = "2.1.20" +agp = "8.9.1" +desugar_jdk_libs = "2.1.5" gradle-maven-publish-plugin = "0.28.0" -androidx-activity = "1.9.3" +androidx-activity = "1.10.1" androidx-annotation = "1.9.1" androidx-appcompat = "1.7.0" androidx-browser = "1.8.0" androidx-cardview = "1.0.0" -androidx-compose-animation = "1.7.5" -androidx-compose-foundation = "1.7.5" -androidx-compose-material = "1.7.5" +androidx-compose-animation = "1.7.8" +androidx-compose-foundation = "1.7.8" +androidx-compose-material = "1.7.8" androidx-compose-material3 = "1.3.1" -androidx-compose-runtime = "1.7.5" -androidx-compose-ui = "1.7.5" -androidx-constraintlayout = "2.2.0" +androidx-compose-runtime = "1.7.8" +androidx-compose-ui = "1.7.8" +androidx-constraintlayout = "2.2.1" androidx-core = "1.15.0" -androidx-datastore = "1.1.1" -androidx-fragment-ktx = "1.8.5" +androidx-datastore = "1.1.4" +androidx-fragment-ktx = "1.8.6" androidx-legacy = "1.0.0" androidx-lifecycle = "2.8.7" -androidx-media3 = "1.5.0" -androidx-navigation = "2.8.4" -androidx-paging = "3.3.4" -androidx-recyclerview = "1.3.2" +androidx-media3 = "1.6.0" +androidx-navigation = "2.8.9" +androidx-paging = "3.3.6" +androidx-recyclerview = "1.4.0" androidx-room = "2.6.1" androidx-viewpager2 = "1.1.0" -androidx-webkit = "1.12.1" +androidx-webkit = "1.13.0" assertj = "3.26.3" @@ -40,14 +40,14 @@ joda-time = "2.13.0" jsoup = "1.18.1" junit = "4.13.2" -kotlinx-coroutines = "1.9.0" -kotlinx-coroutines-test = "1.9.0" +kotlinx-coroutines = "1.10.1" +kotlinx-coroutines-test = "1.10.1" kotlinx-datetime = "0.6.1" kotlinx-serialization-json = "1.7.3" # Make sure to align with the Kotlin version. # See https://github.com/google/ksp/releases -ksp = "2.1.0-1.0.29" +ksp = "2.1.20-1.0.32" ktlint = "12.1.1" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e48eca5755..2733ed5dc3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt b/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt index bf82d849bf..8ff52c20ce 100644 --- a/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt +++ b/readium/navigators/media/tts/src/main/java/org/readium/navigator/media/tts/session/TtsSessionAdapter.kt @@ -85,7 +85,7 @@ internal class TtsSessionAdapter( ) init { - val streamType = Util.getStreamTypeForAudioUsage(audioAttributes.usage) + val streamType = audioAttributes.streamType streamVolumeManager.setStreamType(streamType) } @@ -452,7 +452,7 @@ internal class TtsSessionAdapter( } override fun getTrackSelectionParameters(): TrackSelectionParameters { - return TrackSelectionParameters.Builder(application) + return TrackSelectionParameters.Builder() .build() }