Update Kotlin and Gradle (#58)

Author: stevenzeck

readium/opds/CHANGELOG.md

@@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file.
 
 * New APIs using coroutines and R2's `HttpClient` instead of Fuel and kovenant (contributed by [@stevenzeck](https://github.com/readium/r2-opds-kotlin/pull/55)).
 
+### Changed
+
+* Upgraded to Kotlin 1.5.20.
+
 ### Fixed
 
 * Links in an OPDS 2 feed are normalized to the feed base URL.

readium/opds/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/opds/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 29 14:00:53 CET 2020
+#Fri Jun 25 13:45:04 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/opds/r2-opds/build.gradle

@@ -1,10 +1,7 @@
 /*
- * Module: r2-opds-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'
@@ -45,18 +42,18 @@ dependencies {
         implementation "com.github.readium:r2-shared-kotlin:develop-SNAPSHOT"
     }
 
-    implementation "androidx.appcompat:appcompat:1.3.0-beta1"
+    implementation "androidx.appcompat:appcompat:1.3.0"
     implementation "com.jakewharton.timber:timber:4.7.1"
-    implementation "joda-time:joda-time:2.10.5"
+    implementation "joda-time:joda-time:2.10.10"
     implementation "nl.komponents.kovenant:kovenant:3.3.0"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt"
 
     testImplementation "androidx.test.ext:junit-ktx:1.1.2"
     testImplementation "androidx.test:core-ktx:1.3.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"
+    testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.5.20"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2"
     testImplementation "org.json:json:20200518"

readium/opds/r2-opds/src/test/java/org/readium/r2/opds/OPDS1ParserTest.kt

@@ -4,15 +4,18 @@ import org.joda.time.DateTime
 import org.json.JSONObject
 import org.junit.Assert.*
 import org.junit.Test
+import org.junit.runner.RunWith
 import org.readium.r2.shared.opds.Facet
 import org.readium.r2.shared.opds.Feed
 import org.readium.r2.shared.opds.OpdsMetadata
 import org.readium.r2.shared.opds.ParseData
 import org.readium.r2.shared.publication.*
 import org.readium.r2.shared.publication.Properties
+import org.robolectric.RobolectricTestRunner
 import java.net.URL
 import java.util.*
 
+@RunWith(RobolectricTestRunner::class)
 class OPDS1ParserTest {
 
     private val fixtures = Fixtures("opds1")

readium/opds/r2-opds/src/test/java/org/readium/r2/opds/TestUtils.kt

@@ -12,23 +12,21 @@ package org.readium.r2.opds
 import org.json.JSONArray
 import org.json.JSONObject
 import org.junit.Assert
-import org.readium.r2.shared.extensions.toList
-import org.readium.r2.shared.extensions.toMap
 import java.io.File
 import java.net.URL
 
 /**
  * Asserts that two [JSONObject] are equal.
  */
 fun assertJSONEquals(expected: JSONObject, actual: JSONObject) {
-    Assert.assertEquals(expected.toMap(), actual.toMap())
+    Assert.assertEquals(expected.toString(), actual.toString())
 }
 
 /**
  * Asserts that two [JSONArray] are equal.
  */
 fun assertJSONEquals(expected: JSONArray, actual: JSONArray) {
-    Assert.assertEquals(expected.toList(), actual.toList())
+    Assert.assertEquals(expected.toString(), actual.toString())
 }
 
 class Fixtures(val path: String? = null) {
@@ -47,4 +45,4 @@ class Fixtures(val path: String? = null) {
     fun bytesAt(resourcePath: String): ByteArray =
         fileAt(resourcePath).readBytes()
 
-}
+}