Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	README.md
#	build.gradle.kts
#	readium/lcp/src/main/java/org/readium/r2/lcp/license/LicenseValidation.kt
#	test-app/build.gradle.kts
  • Loading branch information
mickael-menu committed May 7, 2024
2 parents b77fa79 + b88e104 commit 0f23b6b
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ All notable changes to this project will be documented in this file. Take a look

## [Unreleased]

### Added

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

### Deprecated

#### Navigator
Expand Down Expand Up @@ -115,6 +111,15 @@ All notable changes to this project will be documented in this file. Take a look
* EPUB external links are no longer handled by the navigator. You need to open the link in your own Web View or Chrome Custom Tab.


## [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 @@ -831,6 +836,7 @@ 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
[3.0.0-alpha.1]: https://github.com/readium/kotlin-toolkit/compare/2.4.0...3.0.0-alpha.1
[2.4.1]: https://github.com/readium/kotlin-toolkit/compare/2.4.0...2.4.1
[3.0.0-alpha.1]: https://github.com/readium/kotlin-toolkit/compare/2.4.1...3.0.0-alpha.1
[3.0.0-alpha.2]: https://github.com/readium/kotlin-toolkit/compare/3.0.0-alpha.1...3.0.0-alpha.2

0 comments on commit 0f23b6b

Please sign in to comment.