Skip to content
This repository has been archived by the owner on Jul 29, 2022. It is now read-only.

Commit

Permalink
2.1.0 (#170)
Browse files Browse the repository at this point in the history
  • Loading branch information
mickael-menu authored Sep 23, 2021
1 parent 1f353fe commit 3e57eae
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 10 deletions.
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -22,7 +24,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

### Fixed

Expand Down Expand Up @@ -139,4 +141,5 @@ All notable changes to this project will be documented in this file.
[2.0.0-beta.1]: https://github.com/readium/r2-shared-kotlin/compare/2.0.0-alpha.2...2.0.0-beta.1
[2.0.0-beta.2]: https://github.com/readium/r2-shared-kotlin/compare/2.0.0-beta.1...2.0.0-beta.2
[2.0.0]: https://github.com/readium/r2-shared-kotlin/compare/2.0.0-beta.2...2.0.0
[2.1.0]: https://github.com/readium/r2-shared-kotlin/compare/2.0.0...2.1.0

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
12 changes: 6 additions & 6 deletions r2-shared/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -63,18 +63,18 @@ dependencies {
implementation "nl.komponents.kovenant:kovenant-functional:3.3.0"
implementation "nl.komponents.kovenant:kovenant-jvm:3.3.0"
implementation "nl.komponents.kovenant:kovenant:3.3.0"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.5.20"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0-native-mt"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.5.31"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0"
implementation "org.jsoup:jsoup:1.13.1"

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"
Expand Down
1 change: 1 addition & 0 deletions r2-shared/src/test/resources/robolectric.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sdk=30

0 comments on commit 3e57eae

Please sign in to comment.