Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.4.1 #511

Merged
merged 2 commits into from
May 7, 2024
Merged

2.4.1 #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
740d7a2
Support for the new 2.x LCP Profiles (#510)
mickael-menu May 6, 2024
388ea04
2.4.1
mickael-menu May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ All notable changes to this project will be documented in this file. Take a look

<!-- ## [Unreleased] -->

## [2.4.1]

### Added

#### LCP

* [#509](https://github.com/readium/kotlin-toolkit/issues/509) Support for the new 2.x LCP Profiles.


## [2.4.0]

* Readium is now distributed with [Maven Central](https://search.maven.org/search?q=g:org.readium.kotlin-toolkit). Take a look at [the migration guide](docs/migration-guide.md#240) to update your Gradle configuration.
Expand Down Expand Up @@ -698,4 +707,5 @@ progression. Now if no reading progression is set, the `effectiveReadingProgress
[2.2.1]: https://github.com/readium/kotlin-toolkit/compare/2.2.0...2.2.1
[2.3.0]: https://github.com/readium/kotlin-toolkit/compare/2.2.1...2.3.0
[2.4.0]: https://github.com/readium/kotlin-toolkit/compare/2.3.0...2.4.0
[2.4.1]: https://github.com/readium/kotlin-toolkit/compare/2.4.0...2.4.1

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Readium modules are distributed with [Maven Central](https://search.maven.org/se

```groovy
buildscript {
ext.readium_version = '2.4.0'
ext.readium_version = '2.4.1'
}

allprojects {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apply(from = "$rootDir/scripts/publish-root.gradle")

ext {
set("publish.groupId", "org.readium.kotlin-toolkit")
set("publish.version", "2.3.0")
set("publish.version", "2.4.1")
}

subprojects {
Expand Down
17 changes: 15 additions & 2 deletions readium/lcp/src/main/java/org/readium/r2/lcp/license/LicenseValidation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

package org.readium.r2.lcp.license

import java.util.*
import java.util.Date
import kotlin.time.Duration.Companion.seconds
import kotlin.time.ExperimentalTime
import kotlinx.coroutines.runBlocking
Expand All @@ -29,7 +29,20 @@ internal sealed class Either<A, B> {
class Right<A, B>(val right: B) : Either<A, B>()
}

private val supportedProfiles = listOf("http://readium.org/lcp/basic-profile", "http://readium.org/lcp/profile-1.0")
private val supportedProfiles = listOf(
"http://readium.org/lcp/basic-profile",
"http://readium.org/lcp/profile-1.0",
"http://readium.org/lcp/profile-2.0",
"http://readium.org/lcp/profile-2.1",
"http://readium.org/lcp/profile-2.2",
"http://readium.org/lcp/profile-2.3",
"http://readium.org/lcp/profile-2.4",
"http://readium.org/lcp/profile-2.5",
"http://readium.org/lcp/profile-2.6",
"http://readium.org/lcp/profile-2.7",
"http://readium.org/lcp/profile-2.8",
"http://readium.org/lcp/profile-2.9"
)

internal typealias Context = Either<LcpClient.Context, LcpException.LicenseStatus>

Expand Down
2 changes: 1 addition & 1 deletion test-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {

applicationId = "org.readium.r2reader"

versionName = "2.4.0"
versionName = "2.4.1"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
ndk.abiFilters.add("armeabi-v7a")
Expand Down
Loading