2.1.0 (#163)

Author: mickael-menu

readium/streamer/CHANGELOG.md

@@ -4,7 +4,9 @@ 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]
 
 ### Added
 
@@ -14,7 +16,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-* Upgraded to Kotlin 1.5.21 and Gradle 7.1.1
+* Upgraded to Kotlin 1.5.31 and Gradle 7.1.1
 * The default EPUB positions service now uses the archive entry length when available. [This is similar to how Adobe RMSDK generates page numbers](https://github.com/readium/architecture/issues/123).
     * To use the former strategy, create the `Streamer` with: `Streamer(parsers = listOf(EpubParser(reflowablePositionsStrategy = OriginalLength(pageLength = 1024))))`
 
@@ -110,4 +112,5 @@ server.loadCustomResource(assets.open("scripts/highlight.js"), "highlight.js", I
 [2.0.0-beta.1]: https://github.com/readium/r2-streamer-kotlin/compare/2.0.0-alpha.2...2.0.0-beta.1
 [2.0.0-beta.2]: https://github.com/readium/r2-streamer-kotlin/compare/2.0.0-beta.1...2.0.0-beta.2
 [2.0.0]: https://github.com/readium/r2-streamer-kotlin/compare/2.0.0-beta.2...2.0.0
+[2.1.0]: https://github.com/readium/r2-streamer-kotlin/compare/2.0.0...2.1.0
 

readium/streamer/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()
         jcenter()
     }
     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/streamer/r2-streamer/build.gradle

@@ -14,10 +14,10 @@ plugins {
 group='com.github.readium'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
@@ -55,7 +55,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"
     }
 
     final JACKSON_VERSION = '2.12.2'
@@ -82,16 +82,16 @@ dependencies {
         exclude module: 'support-v4'
     }
     implementation "joda-time:joda-time:2.10.10"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0"
 
     testImplementation 'androidx.test.ext:junit-ktx:1.1.3'
     testImplementation 'androidx.test:core-ktx:1.4.0'
     testImplementation "junit:junit:4.13.2"
     testImplementation "net.sf.kxml:kxml2:2.3.0"
     testImplementation 'org.assertj:assertj-core:3.19.0'
-    testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.5.20"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.5.31"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0"
     // Latest version of org.json is incompatible with the one bundled in Android, breaking the tests.
     //noinspection GradleDependency
     testImplementation "org.json:json:20200518"

readium/streamer/r2-streamer/src/main/java/org/readium/r2/streamer/parser/pdf/PdfParser.kt

@@ -61,7 +61,7 @@ class PdfParser(
         )
 
         val servicesBuilder = Publication.ServicesBuilder(
-            positions = (PdfPositionsService)::create,
+            positions = PdfPositionsService.Companion::create,
             cover = document.cover?.let { InMemoryCoverService.createFactory(it) }
         )
 

readium/streamer/r2-streamer/src/test/resources/robolectric.properties

@@ -0,0 +1 @@
+sdk=30