Update Kotlin and Gradle (#114)

Author: stevenzeck

readium/lcp/CHANGELOG.md

@@ -4,7 +4,12 @@ All notable changes to this project will be documented in this file.
 
 **Warning:** Features marked as *alpha* may change or be removed in a future release without notice. Use with caution.
 
-<!-- ## [Unreleased] -->
+## [Unreleased]
+
+### Changed
+
+* Upgraded to Kotlin 1.5.20.
+
 
 ## [2.0.0]
 

readium/lcp/build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext.kotlin_version = '1.5.20'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
 
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 

readium/lcp/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 29 14:00:53 CET 2020
+#Fri Jun 25 13:42:26 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME

readium/lcp/r2-lcp/build.gradle

@@ -1,10 +1,7 @@
 /*
- * Module: r2-lcp-kotlin
- * Developers: Aferdita Muriqi, Clément Baumann
- *
- * Copyright (c) 2018. Readium Foundation. All rights reserved.
- * Use of this source code is governed by a BSD-style license which is detailed in the
- * LICENSE file present in the project repository where this source code is maintained.
+ * Copyright 2018 Readium Foundation. All rights reserved.
+ * Use of this source code is governed by the BSD-style license
+ * available in the top-level LICENSE file of the project.
  */
 
 apply plugin: 'com.android.library'
@@ -40,7 +37,7 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt"
 
     if (findProject(':r2-shared')) {
         implementation project(':r2-shared')

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/LcpDecryptor.kt

@@ -180,7 +180,7 @@ private suspend fun LcpLicense.decryptFully(data:  ResourceTry<ByteArray>, isDef
     }
 
 private val Link.isDeflated: Boolean get() =
-    properties.encryption?.compression?.toLowerCase(java.util.Locale.ROOT) == "deflate"
+    properties.encryption?.compression?.lowercase(java.util.Locale.ROOT) == "deflate"
 
 private val Link.isCbcEncrypted: Boolean get() =
     properties.encryption?.algorithm == "http://www.w3.org/2001/04/xmlenc#aes256-cbc"

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/LcpLicense.kt

@@ -6,6 +6,7 @@
 
 package org.readium.r2.lcp
 
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -123,6 +124,7 @@ interface LcpLicense : ContentProtectionService.UserRights {
     fun renewLoan(end: DateTime?, present: (URL, dismissed: () -> Unit) -> Unit, completion: (LcpException?) -> Unit) {}
 
     @Deprecated("Use `returnPublication()` with coroutines instead", ReplaceWith("returnPublication"))
+    @DelicateCoroutinesApi
     fun returnPublication(completion: (LcpException?) -> Unit) {
         GlobalScope.launch {
             completion(returnPublication().exceptionOrNull())

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/LcpService.kt

@@ -10,10 +10,7 @@
 package org.readium.r2.lcp
 
 import android.content.Context
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.coroutines.*
 import org.readium.r2.lcp.auth.LcpDialogAuthentication
 import org.readium.r2.lcp.persistence.Database
 import org.readium.r2.lcp.service.*
@@ -125,6 +122,7 @@ interface LcpService {
 
 
     @Deprecated("Use `acquirePublication()` with coroutines instead", ReplaceWith("acquirePublication(lcpl)"))
+    @DelicateCoroutinesApi
     fun importPublication(lcpl: ByteArray, authentication: LcpAuthenticating?, completion: (AcquiredPublication?, LcpException?) -> Unit) {
         GlobalScope.launch {
             acquirePublication(lcpl)
@@ -134,6 +132,7 @@ interface LcpService {
     }
 
     @Deprecated("Use `retrieveLicense()` with coroutines instead", ReplaceWith("retrieveLicense(File(publication), authentication, allowUserInteraction = true)"))
+    @DelicateCoroutinesApi
     fun retrieveLicense(publication: String, authentication: LcpAuthenticating?, completion: (LcpLicense?, LcpException?) -> Unit) {
         GlobalScope.launch {
             val result = retrieveLicense(File(publication), authentication ?: LcpDialogAuthentication(), allowUserInteraction = true)

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/auth/LcpDialogAuthentication.kt

@@ -145,7 +145,7 @@ class LcpDialogAuthentication : LcpAuthenticating {
     private fun Context.startActivityForLink(link: Link) {
         val url = tryOrNull { Uri.parse(link.href) } ?: return
 
-        val action = when (url.scheme?.toLowerCase(Locale.ROOT)) {
+        val action = when (url.scheme?.lowercase(Locale.ROOT)) {
             "http", "https" -> Intent(Intent.ACTION_VIEW)
             "tel" -> Intent(Intent.ACTION_CALL)
             "mailto" -> Intent(Intent.ACTION_SEND)

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/license/LicenseValidation.kt

@@ -21,6 +21,7 @@ import org.readium.r2.shared.util.getOrElse
 import org.readium.r2.shared.util.mediatype.MediaType
 import timber.log.Timber
 import java.util.*
+import kotlin.time.Duration
 import kotlin.time.ExperimentalTime
 import kotlin.time.seconds
 
@@ -315,7 +316,7 @@ internal class LicenseValidation(
     private suspend fun fetchStatus(license: LicenseDocument) {
         val url = license.url(LicenseDocument.Rel.status, preferredType = MediaType.LCP_STATUS_DOCUMENT).toString()
         // Short timeout to avoid blocking the License, since the LSD is optional.
-        val data = network.fetch(url, timeout = 5.seconds)
+        val data = network.fetch(url, timeout = Duration.seconds(5))
             .getOrElse { throw LcpException.Network(it) }
 
         raise(Event.retrievedStatusData(data))
@@ -329,7 +330,7 @@ internal class LicenseValidation(
     private suspend fun fetchLicense(status: StatusDocument) {
         val url = status.url(StatusDocument.Rel.license, preferredType = MediaType.LCP_LICENSE_DOCUMENT).toString()
         // Short timeout to avoid blocking the License, since it can be updated next time.
-        val data = network.fetch(url, timeout = 5.seconds)
+        val data = network.fetch(url, timeout = Duration.seconds(5))
             .getOrElse { throw LcpException.Network(it) }
 
         raise(Event.retrievedLicenseData(data))

readium/lcp/r2-lcp/src/main/java/org/readium/r2/lcp/service/NetworkService.kt

@@ -50,7 +50,7 @@ internal class NetworkService {
                 val connection = url.openConnection() as HttpURLConnection
                 connection.requestMethod = method.rawValue
                 if (timeout != null) {
-                    connection.connectTimeout = timeout.toLongMilliseconds().toInt()
+                    connection.connectTimeout = timeout.inWholeMilliseconds.toInt()
                 }
 
                 val status = connection.responseCode