Upgrade to Kotlin 1.9.0 and bump dependencies (#558)

readium · Aug 22, 2024 · ee9e097 · ee9e097
1 parent 6f7923d
commit ee9e097
Show file tree

Hide file tree

Showing 62 changed files with 387 additions and 267 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -13,11 +13,11 @@ jobs:
     if: ${{ !github.event.pull_request.draft }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Build
         run: ./gradlew clean build -x test -x ktlintMainSourceSetCheck
@@ -30,11 +30,11 @@ jobs:
     if: ${{ !github.event.pull_request.draft }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Lint
         run: ./gradlew ktlintCheck
@@ -50,7 +50,7 @@ jobs:
       scripts: ${{ 'src/main/assets/_scripts' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn --cwd "$scripts" install --frozen-lockfile
       - name: Lint

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -13,13 +13,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Fetch tags
         run: git fetch --prune --unshallow
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.6
 
@@ -28,9 +28,9 @@ jobs:
           python -m pip install --upgrade pip
           pip install mkdocs mkdocs-material mike
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'adopt'
 
       - name: Get current Readium version

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: develop
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
         # Builds the release artifacts of the library
       - name: Release build

diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -21,7 +21,8 @@ A [Test App](test-app) demonstrates how to integrate the Readium Kotlin toolkit
 
 | Readium | Android min SDK | Android compile SDK | Kotlin compiler | Gradle |
 |---------|-----------------|---------------------|-----------------|--------|
-| latest  | 21              | 33                  | 1.7.10          | 6.9.3  |
+| latest  | 21              | 33                  | 1.9.0           | 8.6.0  |
+| 2.3.0   | 21              | 33                  | 1.7.10          | 6.9.3  |
 
 ## Setting Up Readium
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
     id("io.github.gradle-nexus.publish-plugin") apply true
     id("org.jetbrains.dokka") apply true
     id("org.jetbrains.kotlin.android") apply false
+    id("com.google.devtools.ksp") apply false
     id("org.jlleitschuh.gradle.ktlint") apply true
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -19,5 +19,3 @@ 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/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,58 +1,58 @@
 [versions]
 
-androidx-activity = "1.6.1"
-androidx-appcompat = "1.5.1"
-androidx-browser = "1.4.0"
+androidx-activity = "1.7.2"
+androidx-appcompat = "1.6.1"
+androidx-browser = "1.5.0"
 androidx-cardview = "1.0.0"
-androidx-compose-compiler = "1.3.2"
-androidx-compose-animation = "1.3.0-beta03"
-androidx-compose-foundation = "1.3.0-beta03"
-androidx-compose-material = "1.3.0-beta03"
-androidx-compose-material3 = "1.0.0-beta03"
-androidx-compose-runtime = "1.3.0-beta03"
+androidx-compose-compiler = "1.5.0"
+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-theme-adapter = "1.1.19"
-androidx-compose-ui = "1.3.0-beta03"
+androidx-compose-ui = "1.4.3"
 androidx-constraintlayout = "2.1.4"
-androidx-core = "1.9.0"
+androidx-core = "1.10.1"
 androidx-datastore = "1.0.0"
-androidx-expresso-core = "3.4.0"
-androidx-ext-junit = "1.1.3"
-androidx-fragment-ktx = "1.5.4"
+androidx-expresso-core = "3.5.1"
+androidx-ext-junit = "1.1.5"
+androidx-fragment-ktx = "1.6.0"
 androidx-legacy = "1.0.0"
-androidx-lifecycle = "2.5.1"
+androidx-lifecycle = "2.6.1"
 androidx-lifecycle-extensions = "2.2.0"
 androidx-media = "1.6.0"
 androidx-media2 = "1.2.1"
-androidx-media3 = "1.0.0-rc01"
+androidx-media3 = "1.1.0"
 androidx-navigation = "2.5.2"
 androidx-paging = "3.1.1"
-androidx-recyclerview = "1.2.1"
-androidx-room = "2.4.3"
+androidx-recyclerview = "1.3.0"
+androidx-room = "2.5.2"
 androidx-viewpager2 = "1.0.0"
-androidx-webkit = "1.5.0"
+androidx-webkit = "1.7.0"
 
-assertj = "3.23.1"
+assertj = "3.24.2"
 
-dokka = "1.7.20"
+dokka = "1.8.20"
 
-google-exoplayer = "2.18.1"
-google-material = "1.7.0"
+google-exoplayer = "2.19.0"
+google-material = "1.9.0"
 
-joda-time = "2.12.1"
-jsoup = "1.15.3"
+joda-time = "2.12.5"
+jsoup = "1.16.1"
 junit = "4.13.2"
 
-kotlin = "1.7.20"
-kotlinx-coroutines = "1.6.4"
-kotlinx-coroutines-test = "1.6.4"
-kotlinx-serialization-json = "1.4.1"
+kotlin = "1.9.0"
+kotlinx-coroutines = "1.7.2"
+kotlinx-coroutines-test = "1.7.2"
+kotlinx-serialization-json = "1.5.1"
 
 pdfium = "1.8.2"
 pdf-viewer = "2.8.2"
-picasso = "2.71828"
+picasso = "2.8"
 pspdfkit = "8.4.1"
 
-robolectric = "4.9"
+robolectric = "4.10.3"
 
 timber = "5.0.1"
 
@@ -119,7 +119,7 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 kotlin-gradle = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
 kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
-kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 
 kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Jul 01 10:00:22 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-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
@@ -13,19 +13,19 @@ plugins {
 android {
     resourcePrefix = "readium_"
 
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
         targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=kotlin.RequiresOptIn",
             "-opt-in=org.readium.r2.shared.InternalReadiumApi"

diff --git a/readium/adapters/pdfium/pdfium-document/build.gradle.kts b/readium/adapters/pdfium/pdfium-document/build.gradle.kts
@@ -13,19 +13,19 @@ plugins {
 android {
     resourcePrefix = "readium_"
 
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
         targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=kotlin.RequiresOptIn",
             "-opt-in=org.readium.r2.shared.InternalReadiumApi"

diff --git a/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts b/readium/adapters/pdfium/pdfium-navigator/build.gradle.kts
@@ -14,19 +14,19 @@ plugins {
 android {
     resourcePrefix = "readium_"
 
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
         targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=kotlin.RequiresOptIn",
             "-opt-in=org.readium.r2.shared.InternalReadiumApi"

diff --git a/...ium-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumEngineProvider.kt b/...ium-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumEngineProvider.kt
@@ -4,13 +4,16 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(org.readium.r2.shared.InternalReadiumApi::class)
+
 package org.readium.adapters.pdfium.navigator
 
 import org.readium.r2.navigator.SimplePresentation
 import org.readium.r2.navigator.VisualNavigator
 import org.readium.r2.navigator.pdf.PdfDocumentFragmentInput
 import org.readium.r2.navigator.pdf.PdfEngineProvider
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 import org.readium.r2.shared.publication.Publication
 

diff --git a/...-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumPreferencesEditor.kt b/...-navigator/src/main/java/org/readium/adapters/pdfium/navigator/PdfiumPreferencesEditor.kt
@@ -4,11 +4,14 @@
  * available in the top-level LICENSE file of the project.
  */
 
+@file:OptIn(org.readium.r2.shared.InternalReadiumApi::class)
+
 package org.readium.adapters.pdfium.navigator
 
 import org.readium.r2.navigator.extensions.format
 import org.readium.r2.navigator.preferences.*
 import org.readium.r2.shared.ExperimentalReadiumApi
+import org.readium.r2.shared.InternalReadiumApi
 import org.readium.r2.shared.publication.Metadata
 
 /**

diff --git a/readium/adapters/pspdfkit/build.gradle.kts b/readium/adapters/pspdfkit/build.gradle.kts
@@ -13,19 +13,19 @@ plugins {
 android {
     resourcePrefix = "readium_"
 
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
         targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=kotlin.RequiresOptIn",
             "-opt-in=org.readium.r2.shared.InternalReadiumApi"

diff --git a/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts b/readium/adapters/pspdfkit/pspdfkit-document/build.gradle.kts
@@ -13,19 +13,19 @@ plugins {
 android {
     resourcePrefix = "readium_"
 
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
         targetSdk = 33
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_17.toString()
         freeCompilerArgs = freeCompilerArgs + listOf(
             "-opt-in=kotlin.RequiresOptIn",
             "-opt-in=org.readium.r2.shared.InternalReadiumApi"