2.1.0 (#118)

Author: mickael-menu

readium/lcp/CHANGELOG.md

@@ -4,11 +4,13 @@ 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]-->
+
+## [2.1.0]
 
 ### Changed
 
-* Upgraded to Kotlin 1.5.21 and Gradle 7.1.1.
+* Upgraded to Kotlin 1.5.31 and Gradle 7.1.1.
 * Migrated to Jetpack Room for the SQLite database storing rights and passphrases (contributed by [@stevenzeck](https://github.com/readium/r2-lcp-kotlin/pull/116)).
     * Note that the internal SQL schema changed. You will need to update your app if you were querying the database manually.
 
@@ -105,4 +107,5 @@ All notable changes to this project will be documented in this file.
 [2.0.0-beta.1]: https://github.com/readium/r2-lcp-kotlin/compare/2.0.0-alpha.2...2.0.0-beta.1
 [2.0.0-beta.2]: https://github.com/readium/r2-lcp-kotlin/compare/2.0.0-beta.1...2.0.0-beta.2
 [2.0.0]: https://github.com/readium/r2-lcp-kotlin/compare/2.0.0-beta.2...2.0.0
+[2.1.0]: https://github.com/readium/r2-lcp-kotlin/compare/2.0.0...2.1.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.5.21'
+    ext.kotlin_version = '1.5.31'
 
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
 
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 

readium/lcp/r2-lcp/build.gradle

@@ -16,10 +16,10 @@ group='com.github.readium'
 
 android {
 
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
@@ -56,7 +56,7 @@ dependencies {
     if (findProject(':r2-shared')) {
         implementation project(':r2-shared')
     } else {
-        implementation "com.github.readium:r2-shared-kotlin:develop-SNAPSHOT"
+        implementation "com.github.readium:r2-shared-kotlin:2.1.0"
     }
 
 

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

@@ -30,7 +30,9 @@ import org.readium.r2.shared.util.mediatype.MediaType
 import timber.log.Timber
 import java.net.HttpURLConnection
 import java.util.*
+import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalTime::class)
 internal class License(
     private var documents: ValidatedDocuments,
     private val validation: LicenseValidation,

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

@@ -19,7 +19,9 @@ import org.readium.r2.lcp.LcpException
 import org.readium.r2.shared.util.getOrElse
 import timber.log.Timber
 import java.util.*
+import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalTime::class)
 internal class CRLService(val network: NetworkService, val context: Context) {
 
     private val preferences: SharedPreferences = context.getSharedPreferences("org.readium.r2.lcp", Context.MODE_PRIVATE)

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

@@ -17,10 +17,12 @@ import org.readium.r2.lcp.license.model.components.Link
 import timber.log.Timber
 import java.io.Serializable
 import java.util.*
+import kotlin.time.ExperimentalTime
 
+@OptIn(ExperimentalTime::class)
 internal class DeviceService(private val repository: DeviceRepository, private val network: NetworkService, val context: Context):Serializable {
 
-    val preferences: SharedPreferences = context.getSharedPreferences("org.readium.r2.settings", Context.MODE_PRIVATE)
+    private val preferences: SharedPreferences = context.getSharedPreferences("org.readium.r2.settings", Context.MODE_PRIVATE)
 
     val id: String
         get() {

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

@@ -31,6 +31,7 @@ internal typealias URLParameters = Map<String, String?>
 
 internal class NetworkException(val status: Int?, cause: Throwable? = null) : Exception("Network failure with status $status", cause)
 
+@OptIn(ExperimentalTime::class)
 internal class NetworkService {
     enum class Method(val rawValue: String) {
         GET("GET"), POST("POST"), PUT("PUT");
@@ -40,7 +41,6 @@ internal class NetworkService {
         }
     }
 
-    @OptIn(ExperimentalTime::class)
     suspend fun fetch(url: String, method: Method = Method.GET, parameters: URLParameters = emptyMap(), timeout: Duration? = null): Try<ByteArray, NetworkException> =
         withContext(Dispatchers.IO) {
             try {