Update dependencies and JVM target (#717)

Author: qnga

.idea/kotlinc.xml

@@ -1,4 +1,5 @@
 import com.vanniktech.maven.publish.SonatypeHost
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     // FIXME: For now, we cannot use the versions catalog in precompiled scripts: https://github.com/gradle/gradle/issues/15383
@@ -21,16 +22,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
         isCoreLibraryDesugaringEnabled = true
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        allWarningsAsErrors = true
-    }
-
     testOptions {
         unitTests.isIncludeAndroidResources = true
     }
@@ -50,10 +46,17 @@ android {
 
 kotlin {
     explicitApi()
+    
+    compilerOptions {
+        freeCompilerArgs.add("-Xannotation-default-target=param-property")
+        jvmTarget = JvmTarget.JVM_11
+        allWarningsAsErrors = true
+    }
 }
 
 dependencies {
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4")
+    //noinspection UseTomlInstead
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
 }
 
 mavenPublishing {

buildSrc/src/main/kotlin/readium.library-conventions.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -10,7 +12,7 @@ android {
     compileSdk = (property("android.compileSdk") as String).toInt()
 
     defaultConfig {
-        minSdk = 23
+        minSdk = (property("android.minSdk") as String).toInt()
         targetSdk = (property("android.targetSdk") as String).toInt()
 
         applicationId = "org.readium.navigator.demo"
@@ -22,14 +24,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        freeCompilerArgs = freeCompilerArgs + "-opt-in=kotlin.RequiresOptIn"
-    }
+
     buildFeatures {
         viewBinding = true
         compose = true
@@ -59,6 +58,14 @@ android {
     namespace = "org.readium.demo.navigator"
 }
 
+kotlin {
+
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_11
+        freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
+    }
+}
+
 dependencies {
     implementation(project(":readium:readium-shared"))
     implementation(project(":readium:readium-streamer"))

demos/navigator/build.gradle.kts

@@ -26,7 +26,7 @@ import org.readium.r2.shared.publication.epub.pageList
  *
  * This is an example of a custom Decoration Style declaration.
  */
-data class DecorationStyleAnnotationMark(@ColorInt val tint: Int) : Decoration.Style
+data class DecorationStyleAnnotationMark(@param:ColorInt val tint: Int) : Decoration.Style
 
 /**
  * Decoration Style for a page number label.

demos/navigator/src/main/java/org/readium/demo/navigator/decorations/CustomDecorationStyles.kt

@@ -1,41 +1,41 @@
 [versions]
 
-kotlin = "2.1.21"
-agp = "8.10.1"
+kotlin = "2.2.20"
+agp = "8.11.1"
 desugar_jdk_libs = "2.1.5"
 gradle-maven-publish-plugin = "0.32.0"
 
-androidx-activity = "1.10.1"
+androidx-activity = "1.11.0"
 androidx-annotation = "1.9.1"
-androidx-appcompat = "1.7.0"
-androidx-browser = "1.8.0"
+androidx-appcompat = "1.7.1"
+androidx-browser = "1.9.0"
 androidx-cardview = "1.0.0"
-androidx-compose-animation = "1.8.2"
-androidx-compose-foundation = "1.8.2"
-androidx-compose-material = "1.8.2"
+androidx-compose-animation = "1.9.2"
+androidx-compose-foundation = "1.9.2"
+androidx-compose-material = "1.9.2"
 androidx-compose-material-icons = "1.7.8"
-androidx-compose-material3 = "1.3.2"
-androidx-compose-runtime = "1.8.2"
-androidx-compose-ui = "1.8.2"
+androidx-compose-material3 = "1.4.0"
+androidx-compose-runtime = "1.9.2"
+androidx-compose-ui = "1.9.2"
 androidx-constraintlayout = "2.2.1"
-androidx-core = "1.16.0"
+androidx-core = "1.17.0"
 androidx-datastore = "1.1.7"
-androidx-fragment-ktx = "1.8.7"
+androidx-fragment-ktx = "1.8.9"
 androidx-legacy = "1.0.0"
-androidx-lifecycle = "2.9.0"
-androidx-media3 = "1.7.1"
-androidx-navigation = "2.9.0"
+androidx-lifecycle = "2.9.4"
+androidx-media3 = "1.8.0"
+androidx-navigation = "2.9.5"
 androidx-paging = "3.3.6"
 androidx-recyclerview = "1.4.0"
-androidx-room = "2.7.1"
+androidx-room = "2.8.1"
 androidx-viewpager2 = "1.1.0"
-androidx-webkit = "1.13.0"
+androidx-webkit = "1.14.0"
 
-assertj = "3.27.3"
+assertj = "3.27.6"
 
 dokka = "1.9.20"
 
-google-material = "1.12.0"
+google-material = "1.13.0"
 
 joda-time = "2.14.0"
 #Do not upgrade without fixing unit tests in HtmlResourceContentIteratorTest and regression testing
@@ -52,7 +52,7 @@ kotlinx-collections-immutable = "0.4.0"
 
 # Make sure to align with the Kotlin version.
 # See https://github.com/google/ksp/releases
-ksp = "2.1.21-2.0.1"
+ksp = "2.2.20-2.0.3"
 
 ktlint = "12.1.1"
 
@@ -62,8 +62,8 @@ pdf-viewer = "3.2.8"
 picasso = "2.8"
 pspdfkit = "8.4.1"
 
-robolectric = "4.14.1"
-mockk = "1.14.2"
+robolectric = "4.16"
+mockk = "1.14.6"
 
 timber = "5.0.1"
 

gradle/libs.versions.toml

@@ -11,10 +11,12 @@ plugins {
 
 android {
     namespace = "org.readium.r2.lcp"
+}
 
-    kotlinOptions {
+kotlin {
+    compilerOptions {
         // See https://github.com/readium/kotlin-toolkit/pull/525#issuecomment-2300084041
-        freeCompilerArgs = freeCompilerArgs + ("-Xconsistent-data-class-copy-visibility")
+        freeCompilerArgs.add("-Xconsistent-data-class-copy-visibility")
     }
 }
 

readium/lcp/build.gradle.kts

@@ -17,8 +17,13 @@ android {
     }
 
     kotlinOptions {
+    }
+}
+
+kotlin {
+    compilerOptions {
         // See https://github.com/readium/kotlin-toolkit/pull/525#issuecomment-2300084041
-        freeCompilerArgs = freeCompilerArgs + ("-Xconsistent-data-class-copy-visibility")
+        freeCompilerArgs.add("-Xconsistent-data-class-copy-visibility")
     }
 }
 

readium/navigator/build.gradle.kts

@@ -14,7 +14,7 @@ import androidx.core.content.ContextCompat
 /** returns true if the resolved layout direction of the content view in this
  * activity is ViewCompat.LAYOUT_DIRECTION_RTL. Otherwise false. */
 internal fun Activity.layoutDirectionIsRTL(): Boolean {
-    return findViewById<View?>(android.R.id.content).layoutDirection == View.LAYOUT_DIRECTION_RTL
+    return findViewById<View>(android.R.id.content).layoutDirection == View.LAYOUT_DIRECTION_RTL
 }
 
 @ColorInt

readium/navigator/src/main/java/org/readium/r2/navigator/extensions/Extensions.kt

@@ -31,6 +31,7 @@
 import androidx.viewpager.widget.ViewPager;
 
 import org.readium.r2.navigator.preferences.ReadingProgression;
+import org.readium.r2.shared.InternalReadiumApi;
 
 import java.util.HashMap;
 
@@ -44,7 +45,8 @@
  * <code>OnPageChangeListener</code>s so that clients can be agnostic to layout direction and
  * modifications are kept internal to <code>RtlViewPager</code>.
  */
-class R2RTLViewPager extends ViewPager {
+@InternalReadiumApi
+public class R2RTLViewPager extends ViewPager {
     public ReadingProgression direction = ReadingProgression.LTR;
     private int mLayoutDirection = ViewCompat.LAYOUT_DIRECTION_LTR;
     private HashMap<OnPageChangeListener, ReversingOnPageChangeListener> mPageChangeListeners = new HashMap<>();
@@ -59,9 +61,9 @@ public R2RTLViewPager(Context context, AttributeSet attrs) {
     @Override
     public void onRtlPropertiesChanged(int layoutDirection) {
         super.onRtlPropertiesChanged(layoutDirection);
-        int viewCompatLayoutDirection = layoutDirection == View.LAYOUT_DIRECTION_RTL  ? ViewCompat.LAYOUT_DIRECTION_RTL : ViewCompat.LAYOUT_DIRECTION_LTR;
+        int viewCompatLayoutDirection = layoutDirection == View.LAYOUT_DIRECTION_RTL  ? View.LAYOUT_DIRECTION_RTL : ViewCompat.LAYOUT_DIRECTION_LTR;
         if (direction == ReadingProgression.RTL) {
-            viewCompatLayoutDirection = ViewCompat.LAYOUT_DIRECTION_RTL;
+            viewCompatLayoutDirection = View.LAYOUT_DIRECTION_RTL;
         }
         if (viewCompatLayoutDirection != mLayoutDirection) {
             PagerAdapter adapter = super.getAdapter();

readium/navigator/src/main/java/org/readium/r2/navigator/pager/R2RTLViewPager.java

@@ -14,9 +14,12 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
 import org.readium.r2.navigator.BuildConfig.DEBUG
+import org.readium.r2.shared.InternalReadiumApi
 import timber.log.Timber
 
-internal class R2ViewPager : R2RTLViewPager {
+// See https://youtrack.jetbrains.com/issue/KTLC-271 for visibility issue.
+@InternalReadiumApi
+public class R2ViewPager : R2RTLViewPager {
 
     internal enum class PublicationType {
         EPUB,
@@ -29,8 +32,8 @@ internal class R2ViewPager : R2RTLViewPager {
 
     internal lateinit var publicationType: PublicationType
 
-    constructor(context: Context) : super(context)
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+    internal constructor(context: Context) : super(context)
+    internal constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
 
     override fun setCurrentItem(item: Int) {
         super.setCurrentItem(item, false)