Skip to content

Commit 12f778a

Browse files
committed
added incubator module, and move new resource loading code into it.
1 parent 26e78c1 commit 12f778a

24 files changed

+29
-25
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
This list is not currently intended to be all-encompassing - it will document major and breaking API changes with their rationale when appropriate:
44

55
### v3.36.0 (uncut)
6-
- Added first cut of `http4-testing-chaos` module. Massive H/T to @IgorPerikov for the PR which drove this module's creation. API might change a bit as we experiment/expand it.
7-
- Remove deprecations.
6+
- Added `http4k-testing-chaos` module, designed to enhance failure-mode testing for http4k apps. Massive H/T to @IgorPerikov for the PR which drove this module's creation.
7+
- Added `http4k-incubator` module, for hosting developing projects and other code which might be promoted to top-level modules in the future.
88

99
### v3.35.2
1010
- Fix #167 - Reintroduce `hasBody` compatibility with common matchers such as `containsString()`
11+
- Remove deprecations.
1112

1213
### v3.35.1
1314
- Fix #165 - AWS auth filter does not replace headers - it sets them (which breaks for request signing)

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ task jacocoRootReport(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
175175
dependencies {
176176
provided kotlin_lib
177177

178-
provided project(":http4k-aws")
179178
provided project(":http4k-core")
179+
provided project(":http4k-aws")
180180
provided project(":http4k-client-apache")
181181
provided project(":http4k-client-apache-async")
182182
provided project(":http4k-client-jetty")

http4k-contract/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
description = 'Typesafe HTTP contracts for Reekwest'
1+
description = 'http4k typesafe HTTP contracts and OpenApi support'
22

33
dependencies {
44
provided kotlin_lib

http4k-experimental/build.gradle

Lines changed: 0 additions & 10 deletions
This file was deleted.

http4k-incubator/build.gradle

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
description = 'http4k incubator module'
2+
3+
dependencies {
4+
provided kotlin_lib
5+
6+
provided project(":http4k-core")
7+
testCompile testing
8+
testCompile project(":http4k-client-apache")
9+
testCompile project(":http4k-testing-hamkrest")
10+
}
11+
12+

http4k-experimental/src/main/kotlin/org/http4k/routing/experimental/DirectoryResourceLoader.kt renamed to http4k-incubator/src/main/kotlin/org/http4k/routing/experimental/DirectoryResourceLoader.kt

File renamed without changes.

http4k-experimental/src/main/kotlin/org/http4k/routing/experimental/FileResource.kt renamed to http4k-incubator/src/main/kotlin/org/http4k/routing/experimental/FileResource.kt

File renamed without changes.

http4k-experimental/src/main/kotlin/org/http4k/routing/experimental/InMemoryResource.kt renamed to http4k-incubator/src/main/kotlin/org/http4k/routing/experimental/InMemoryResource.kt

File renamed without changes.

http4k-experimental/src/main/kotlin/org/http4k/routing/experimental/Resource.kt renamed to http4k-incubator/src/main/kotlin/org/http4k/routing/experimental/Resource.kt

File renamed without changes.

http4k-experimental/src/main/kotlin/org/http4k/routing/experimental/ResourceListingHandler.kt renamed to http4k-incubator/src/main/kotlin/org/http4k/routing/experimental/ResourceListingHandler.kt

File renamed without changes.

0 commit comments

Comments
 (0)