Skip to content

Fix broken dependency to NanoHTTPD #288

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

Merged
merged 1 commit into from
Oct 24, 2022
Merged

Fix broken dependency to NanoHTTPD #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ All notable changes to this project will be documented in this file. Take a look

**Warning:** Features marked as *experimental* may change or be removed in a future release without notice. Use with caution.

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

### Fixed

#### Streamer

* [#286](https://github.com/readium/kotlin-toolkit/issues/286) Fixed broken dependency to NanoHTTPD.


## [2.2.0]

Expand Down
4 changes: 2 additions & 2 deletions readium/streamer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ dependencies {
@Suppress("GradleDependency")
implementation("com.github.barteksc:pdfium-android:1.8.2")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.github.edrlab.nanohttpd:nanohttpd:master-SNAPSHOT") {
api("com.github.readium.nanohttpd:nanohttpd:master-SNAPSHOT") {
exclude(group = "org.parboiled")
}
implementation("com.github.edrlab.nanohttpd:nanohttpd-nanolets:master-SNAPSHOT") {
api("com.github.readium.nanohttpd:nanohttpd-nanolets:master-SNAPSHOT") {
exclude(group = "org.parboiled")
}
//AM NOTE: conflicting support libraries, excluding these
Expand Down
6 changes: 0 additions & 6 deletions test-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ dependencies {
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("androidx.viewpager2:viewpager2:1.0.0")
implementation("androidx.webkit:webkit:1.4.0")
implementation("com.github.edrlab.nanohttpd:nanohttpd:master-SNAPSHOT") {
exclude(group = "org.parboiled")
}
implementation("com.github.edrlab.nanohttpd:nanohttpd-nanolets:master-SNAPSHOT") {
exclude(group = "org.parboiled")
}
implementation("com.google.android.material:material:1.5.0")
implementation("com.jakewharton.timber:timber:5.0.1")
// AM NOTE: needs to stay this version for now (June 24,2020)
Expand Down