From db45dec59de2dce7bab69796bcdeacb41d20f59b Mon Sep 17 00:00:00 2001 From: qnga <32197639+qnga@users.noreply.github.com> Date: Tue, 4 Oct 2022 19:12:22 +0200 Subject: [PATCH] Upgrade dependencies (#282) --- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 2 +- readium/adapters/pdfium/build.gradle.kts | 17 ++--- .../pdfium/pdfium-document/build.gradle.kts | 23 +++---- .../pdfium/pdfium-navigator/build.gradle.kts | 23 +++---- readium/adapters/pspdfkit/build.gradle.kts | 17 ++--- .../pspdfkit-document/build.gradle.kts | 23 +++---- .../pspdfkit-navigator/build.gradle.kts | 23 +++---- readium/lcp/build.gradle.kts | 24 +++---- readium/navigator-media2/build.gradle.kts | 27 ++++---- .../navigator/media2/MediaNavigator.kt | 2 +- readium/navigator/build.gradle.kts | 63 ++++++++++--------- .../r2/navigator/media/ExoMediaPlayer.kt | 2 +- readium/opds/build.gradle.kts | 21 ++++--- readium/shared/build.gradle.kts | 33 +++++----- readium/streamer/build.gradle.kts | 22 ++++--- settings.gradle.kts | 6 +- test-app/build.gradle.kts | 58 +++++++++-------- 18 files changed, 201 insertions(+), 187 deletions(-) diff --git a/gradle.properties b/gradle.properties index cac7c68c14..c064741c76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,3 +19,5 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official + +android.disableAutomaticComponentCreation=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e5897b5..aa991fceae 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-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/readium/adapters/pdfium/build.gradle.kts b/readium/adapters/pdfium/build.gradle.kts index 87e7bd35a0..b9c20bb227 100644 --- a/readium/adapters/pdfium/build.gradle.kts +++ b/readium/adapters/pdfium/build.gradle.kts @@ -41,15 +41,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-adapter-pdfium" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-adapter-pdfium" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } diff --git a/readium/adapters/pdfium/pdfium-document/build.gradle.kts b/readium/adapters/pdfium/pdfium-document/build.gradle.kts index 4a4c21d1ef..728c0a0c81 100644 --- a/readium/adapters/pdfium/pdfium-document/build.gradle.kts +++ b/readium/adapters/pdfium/pdfium-document/build.gradle.kts @@ -44,15 +44,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-adapter-pdfium-document" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-adapter-pdfium-document" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -63,11 +64,11 @@ dependencies { api(project(":readium:shared")) - implementation("androidx.core:core-ktx:1.8.0") + implementation("androidx.core:core-ktx:1.9.0") implementation("com.github.barteksc:pdfium-android:1.8.2") implementation("com.jakewharton.timber:timber:5.0.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") testImplementation("junit:junit:4.13.2") diff --git a/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts b/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts index 4ccbfc340c..ff6131af30 100644 --- a/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts +++ b/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts @@ -44,15 +44,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-adapter-pdfium-navigator" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-adapter-pdfium-navigator" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -66,10 +67,10 @@ dependencies { api(project(":readium:adapters:pdfium:pdfium-document")) api("com.github.barteksc:android-pdf-viewer:2.8.2") - implementation("androidx.fragment:fragment-ktx:1.4.1") + implementation("androidx.fragment:fragment-ktx:1.5.3") implementation("com.jakewharton.timber:timber:5.0.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") testImplementation("junit:junit:4.13.2") diff --git a/readium/adapters/pspdfkit/build.gradle.kts b/readium/adapters/pspdfkit/build.gradle.kts index 3c20175fc1..b85e32ebdc 100644 --- a/readium/adapters/pspdfkit/build.gradle.kts +++ b/readium/adapters/pspdfkit/build.gradle.kts @@ -41,15 +41,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-adapter-pspdfkit" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-adapter-pspdfkit" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } diff --git a/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts b/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts index 4462d37fe4..124920d366 100644 --- a/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts +++ b/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts @@ -44,15 +44,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-adapter-pspdfkit-document" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-adapter-pspdfkit-document" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -63,11 +64,11 @@ dependencies { api(project(":readium:shared")) - implementation("androidx.core:core-ktx:1.8.0") + implementation("androidx.core:core-ktx:1.9.0") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.pspdfkit:pspdfkit:8.2.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") testImplementation("junit:junit:4.13.2") diff --git a/readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts b/readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts index 7c6eb6b22e..eb21f3618b 100644 --- a/readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts +++ b/readium/adapters/pspdfkit/pspdfkit-navigator/build.gradle.kts @@ -44,15 +44,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-adapter-pspdfkit-navigator" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-adapter-pspdfkit-navigator" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -65,11 +66,11 @@ dependencies { api(project(":readium:navigator")) api(project(":readium:adapters:pspdfkit:pspdfkit-document")) - implementation("androidx.fragment:fragment-ktx:1.4.1") + implementation("androidx.fragment:fragment-ktx:1.5.3") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.pspdfkit:pspdfkit:8.2.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") testImplementation("junit:junit:4.13.2") diff --git a/readium/lcp/build.gradle.kts b/readium/lcp/build.gradle.kts index 2987cf7418..4838e35749 100644 --- a/readium/lcp/build.gradle.kts +++ b/readium/lcp/build.gradle.kts @@ -41,15 +41,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-lcp" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-lcp" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -58,13 +59,13 @@ afterEvaluate { dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") api(project(":readium:shared")) implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.core:core-ktx:1.7.0") - implementation("com.google.android.material:material:1.6.0") + implementation("androidx.core:core-ktx:1.9.0") + implementation("com.google.android.material:material:1.6.1") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.mcxiaoke.koi:async:0.5.5") { exclude(module = "support-v4") @@ -81,6 +82,7 @@ dependencies { implementation("androidx.room:room-runtime:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion") kapt("androidx.room:room-compiler:$roomVersion") + kapt("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.5.0") // Tests testImplementation("junit:junit:4.13.2") diff --git a/readium/navigator-media2/build.gradle.kts b/readium/navigator-media2/build.gradle.kts index efa015a990..a6d881a40f 100644 --- a/readium/navigator-media2/build.gradle.kts +++ b/readium/navigator-media2/build.gradle.kts @@ -44,15 +44,17 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + + groupId = "com.github.readium" + artifactId = "readium-navigator-media2" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-navigator-media2" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -64,19 +66,18 @@ dependencies { api(project(":readium:shared")) api(project(":readium:navigator")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") implementation("com.jakewharton.timber:timber:5.0.1") implementation("androidx.media2:media2-session:1.2.1") implementation("androidx.media2:media2-player:1.2.1") - implementation("com.google.android.exoplayer:exoplayer-core:2.17.1") - implementation("com.google.android.exoplayer:extension-media2:2.17.1") + implementation("com.google.android.exoplayer:exoplayer-core:2.18.1") + implementation("com.google.android.exoplayer:extension-media2:2.18.1") testImplementation("junit:junit:4.13.2") - androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") } diff --git a/readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt b/readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt index 07bd20bc18..fb96b902df 100644 --- a/readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt +++ b/readium/navigator-media2/src/main/java/org/readium/navigator/media2/MediaNavigator.kt @@ -433,7 +433,7 @@ class MediaNavigator private constructor( .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory)) .setAudioAttributes( AudioAttributes.Builder() - .setContentType(C.CONTENT_TYPE_MUSIC) + .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC ) .setUsage(C.USAGE_MEDIA) .build(), true diff --git a/readium/navigator/build.gradle.kts b/readium/navigator/build.gradle.kts index f0d5e0852b..84eb22a984 100644 --- a/readium/navigator/build.gradle.kts +++ b/readium/navigator/build.gradle.kts @@ -46,15 +46,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-navigator" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-navigator" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -65,22 +66,22 @@ dependencies { api(project(":readium:shared")) - implementation("androidx.activity:activity-ktx:1.4.0") - implementation("androidx.appcompat:appcompat:1.4.1") + implementation("androidx.activity:activity-ktx:1.6.0") + implementation("androidx.appcompat:appcompat:1.5.1") implementation("androidx.browser:browser:1.4.0") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.core:core-ktx:1.7.0") - implementation("androidx.fragment:fragment-ktx:1.4.1") + implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.fragment:fragment-ktx:1.5.3") implementation("androidx.legacy:legacy-support-core-ui:1.0.0") implementation("androidx.legacy:legacy-support-v4:1.0.0") - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.1") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.5.1") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.media:media:1.6.0") implementation("androidx.viewpager2:viewpager2:1.0.0") - implementation("androidx.webkit:webkit:1.4.0") + implementation("androidx.webkit:webkit:1.5.0") // Needed to avoid a crash with API 31, see https://stackoverflow.com/a/69152986/1474476 implementation("androidx.work:work-runtime-ktx:2.7.1") implementation("com.duolingo.open:rtl-viewpager:1.0.3") @@ -90,25 +91,25 @@ dependencies { implementation("androidx.media2:media2-session:1.2.1") implementation("androidx.media2:media2-player:1.2.1") // ExoPlayer is used by the Audio Navigator. - api("com.google.android.exoplayer:exoplayer-core:2.17.1") - api("com.google.android.exoplayer:exoplayer-ui:2.17.1") - api("com.google.android.exoplayer:extension-mediasession:2.17.1") - api("com.google.android.exoplayer:extension-media2:2.17.1") - api("com.google.android.exoplayer:extension-workmanager:2.17.1") - implementation("com.google.android.material:material:1.6.0") + api("com.google.android.exoplayer:exoplayer-core:2.18.1") + api("com.google.android.exoplayer:exoplayer-ui:2.18.1") + api("com.google.android.exoplayer:extension-mediasession:2.18.1") + api("com.google.android.exoplayer:extension-media2:2.18.1") + api("com.google.android.exoplayer:extension-workmanager:2.18.1") + implementation("com.google.android.material:material:1.6.1") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.shopgun.android:utils:1.0.9") implementation("joda-time:joda-time:2.10.14") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.2") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0-RC") - // AM NOTE: needs to stay this version for now (June 24,2020) - //noinspection GradleDependency - implementation("org.jsoup:jsoup:1.15.1") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0") + implementation("org.jsoup:jsoup:1.15.2") // Tests testImplementation("junit:junit:4.13.2") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.21") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.2") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.7.10") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") testImplementation("org.robolectric:robolectric:4.8.1") + androidTestImplementation("androidx.test.ext:junit:1.1.3") + androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") } diff --git a/readium/navigator/src/main/java/org/readium/r2/navigator/media/ExoMediaPlayer.kt b/readium/navigator/src/main/java/org/readium/r2/navigator/media/ExoMediaPlayer.kt index 63a7481093..ca9a985915 100644 --- a/readium/navigator/src/main/java/org/readium/r2/navigator/media/ExoMediaPlayer.kt +++ b/readium/navigator/src/main/java/org/readium/r2/navigator/media/ExoMediaPlayer.kt @@ -78,7 +78,7 @@ class ExoMediaPlayer( .setSeekForwardIncrementMs(30.seconds.inWholeMilliseconds) .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory)) .setAudioAttributes(AudioAttributes.Builder() - .setContentType(C.CONTENT_TYPE_MUSIC) + .setContentType(C.AUDIO_CONTENT_TYPE_MUSIC) .setUsage(C.USAGE_MEDIA) .build(), true diff --git a/readium/opds/build.gradle.kts b/readium/opds/build.gradle.kts index 7ff2911ff5..7323becd56 100644 --- a/readium/opds/build.gradle.kts +++ b/readium/opds/build.gradle.kts @@ -41,15 +41,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-opds" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-opds" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -60,11 +61,11 @@ dependencies { api(project(":readium:shared")) - implementation("androidx.appcompat:appcompat:1.4.1") + implementation("androidx.appcompat:appcompat:1.5.1") implementation("com.jakewharton.timber:timber:5.0.1") implementation("joda-time:joda-time:2.10.14") implementation("nl.komponents.kovenant:kovenant:3.3.0") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") // Tests testImplementation("junit:junit:4.13.2") diff --git a/readium/shared/build.gradle.kts b/readium/shared/build.gradle.kts index 30dacdfe5a..10eecd4680 100644 --- a/readium/shared/build.gradle.kts +++ b/readium/shared/build.gradle.kts @@ -42,15 +42,16 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-shared" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-shared" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -59,7 +60,7 @@ afterEvaluate { dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation("androidx.appcompat:appcompat:1.4.1") + implementation("androidx.appcompat:appcompat:1.5.1") implementation("androidx.browser:browser:1.4.0") implementation("com.github.kittinunf.fuel:fuel-android:2.3.1") implementation("com.github.kittinunf.fuel:fuel:2.3.1") @@ -71,19 +72,19 @@ dependencies { implementation("nl.komponents.kovenant:kovenant-functional:3.3.0") implementation("nl.komponents.kovenant:kovenant-jvm:3.3.0") implementation("nl.komponents.kovenant:kovenant:3.3.0") - implementation("org.jetbrains.kotlin:kotlin-reflect:1.6.21") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0-RC") - implementation("org.jsoup:jsoup:1.15.1") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.7.20") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0") + implementation("org.jsoup:jsoup:1.15.2") // Tests testImplementation("junit:junit:4.13.2") testImplementation("org.assertj:assertj-core:3.23.1") - testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.21") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.2") + testImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.7.10") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") testImplementation("org.robolectric:robolectric:4.8.1") - androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.6.10") + androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit:1.7.10") androidTestImplementation("androidx.test.ext:junit:1.1.3") androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0") } diff --git a/readium/streamer/build.gradle.kts b/readium/streamer/build.gradle.kts index dca42b2b91..75d5276511 100644 --- a/readium/streamer/build.gradle.kts +++ b/readium/streamer/build.gradle.kts @@ -41,15 +41,17 @@ android { } } -afterEvaluate { - publishing { - publications { - create("release") { +publishing { + publications { + create("release") { + groupId = "com.github.readium" + artifactId = "readium-streamer" + artifact(tasks.findByName("sourcesJar")) + artifact(tasks.findByName("javadocsJar")) + + + afterEvaluate { from(components.getByName("release")) - groupId = "com.github.readium" - artifactId = "readium-streamer" - artifact(tasks.findByName("sourcesJar")) - artifact(tasks.findByName("javadocsJar")) } } } @@ -60,7 +62,7 @@ dependencies { api(project(":readium:shared")) - implementation("androidx.appcompat:appcompat:1.4.1") + implementation("androidx.appcompat:appcompat:1.5.1") @Suppress("GradleDependency") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.github.edrlab.nanohttpd:nanohttpd:master-SNAPSHOT") { @@ -78,7 +80,7 @@ dependencies { exclude(module = "support-v4") } implementation("joda-time:joda-time:2.10.14") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") // Tests testImplementation("junit:junit:4.13.2") diff --git a/settings.gradle.kts b/settings.gradle.kts index 0d338fa2a5..2d7d157d0d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,9 +24,9 @@ pluginManagement { plugins { id("com.android.application") version ("7.2.2") id("com.android.library") version ("7.2.2") - id("org.jetbrains.kotlin.android") version ("1.6.21") - id("org.jetbrains.dokka") version ("1.6.21") - id("org.jetbrains.kotlin.plugin.serialization") version ("1.6.21") + id("org.jetbrains.kotlin.android") version ("1.7.10") + id("org.jetbrains.dokka") version ("1.7.10") + id("org.jetbrains.kotlin.plugin.serialization") version ("1.7.10") } } dependencyResolutionManagement { diff --git a/test-app/build.gradle.kts b/test-app/build.gradle.kts index 3053734598..51f47901e9 100644 --- a/test-app/build.gradle.kts +++ b/test-app/build.gradle.kts @@ -12,7 +12,6 @@ plugins { } android { - compileSdk = 33 defaultConfig { minSdk = 21 @@ -37,7 +36,7 @@ android { freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn" } composeOptions { - kotlinCompilerExtensionVersion = "1.2.0-rc02" + kotlinCompilerExtensionVersion = "1.3.1" } buildFeatures { viewBinding = true @@ -64,7 +63,7 @@ android { dependencies { implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20") implementation("androidx.legacy:legacy-support-v4:1.0.0") implementation(project(":readium:shared")) @@ -76,59 +75,58 @@ dependencies { // Only required if you want to support PDF files using PDFium. implementation(project(":readium:adapters:pdfium")) - implementation("androidx.activity:activity-compose:1.4.0") - implementation("androidx.activity:activity-ktx:1.4.0") - implementation("androidx.appcompat:appcompat:1.4.1") + implementation("androidx.activity:activity-compose:1.6.0") + implementation("androidx.activity:activity-ktx:1.6.0") + implementation("androidx.appcompat:appcompat:1.5.1") implementation("androidx.browser:browser:1.4.0") implementation("androidx.cardview:cardview:1.0.0") - implementation("androidx.compose.animation:animation:1.1.1") - implementation("androidx.compose.foundation:foundation:1.2.0-rc02") - implementation("androidx.compose.material:material-icons-extended:1.1.1") - implementation("androidx.compose.material:material:1.1.1") + implementation("androidx.compose.animation:animation:1.3.0-beta03") + implementation("androidx.compose.foundation:foundation:1.3.0-beta03") + implementation("androidx.compose.material:material-icons-extended:1.3.0-beta03") + implementation("androidx.compose.material:material:1.3.0-beta03") + implementation("com.google.android.material:compose-theme-adapter:1.1.19") implementation("androidx.constraintlayout:constraintlayout:2.1.4") - implementation("androidx.core:core-ktx:1.7.0") - implementation("androidx.datastore:datastore-preferences:1.0.0") - implementation("androidx.fragment:fragment-ktx:1.4.1") - implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.1") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.4.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.4.1") - implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1") - implementation("androidx.navigation:navigation-fragment-ktx:2.4.2") - implementation("androidx.navigation:navigation-ui-ktx:2.4.2") + implementation("androidx.core:core-ktx:1.9.0") + implementation ("androidx.datastore:datastore-preferences:1.0.0") + implementation("androidx.fragment:fragment-ktx:1.5.3") + implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1") + implementation("androidx.lifecycle:lifecycle-common-java8:2.5.1") + implementation("androidx.navigation:navigation-fragment-ktx:2.5.2") + implementation("androidx.navigation:navigation-ui-ktx:2.5.2") implementation("androidx.paging:paging-runtime-ktx:3.1.1") implementation("androidx.recyclerview:recyclerview:1.2.1") implementation("androidx.viewpager2:viewpager2:1.0.0") - implementation("androidx.webkit:webkit:1.4.0") + implementation("androidx.webkit:webkit:1.5.0") implementation("com.github.edrlab.nanohttpd:nanohttpd:master-SNAPSHOT") { exclude(group = "org.parboiled") } implementation("com.github.edrlab.nanohttpd:nanohttpd-nanolets:master-SNAPSHOT") { exclude(group = "org.parboiled") } - implementation("com.google.android.material:compose-theme-adapter:1.1.14") implementation("com.google.android.material:material:1.6.1") implementation("com.jakewharton.timber:timber:5.0.1") // AM NOTE: needs to stay this version for now (June 24,2020) implementation("com.squareup.picasso:picasso:2.71828") implementation("joda-time:joda-time:2.10.14") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.2") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") // AM NOTE: needs to stay this version for now (June 24,2020) - implementation("org.jsoup:jsoup:1.15.1") + implementation("org.jsoup:jsoup:1.15.2") implementation("androidx.media2:media2-session:1.2.1") implementation("androidx.media2:media2-player:1.2.1") // Room database - val roomVersion = "2.4.2" - implementation("androidx.room:room-runtime:$roomVersion") - implementation("androidx.room:room-ktx:$roomVersion") - kapt("androidx.room:room-compiler:$roomVersion") + implementation("androidx.room:room-runtime:2.4.3") + implementation("androidx.room:room-ktx:2.4.3") + kapt("androidx.room:room-compiler:2.4.3") implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") - kapt("androidx.lifecycle:lifecycle-compiler:2.4.1") - debugImplementation("androidx.compose.ui:ui-tooling:1.1.1") - implementation("androidx.compose.ui:ui-tooling-preview:1.1.1") + debugImplementation("androidx.compose.ui:ui-tooling:1.2.1") + implementation("androidx.compose.ui:ui-tooling-preview:1.2.1") // Tests testImplementation("junit:junit:4.13.2")