diff --git a/freckle-app/CHANGELOG.md b/freckle-app/CHANGELOG.md index 0544127..022bb8a 100644 --- a/freckle-app/CHANGELOG.md +++ b/freckle-app/CHANGELOG.md @@ -1,4 +1,8 @@ -## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.22.0.0...main) +## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-app-v1.23.0.0...main) + +## [v1.23.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.22.0.0...freckle-app-v1.23.0.0) + +Removes `Freckle.App.HttpSpec` which had been included by mistake. ## [v1.22.0.0](https://github.com/freckle/freckle-app/compare/freckle-app-v1.21.0.0...freckle-app-v1.22.0.0) diff --git a/freckle-app/freckle-app.cabal b/freckle-app/freckle-app.cabal index 71171e6..e0bd769 100644 --- a/freckle-app/freckle-app.cabal +++ b/freckle-app/freckle-app.cabal @@ -5,7 +5,7 @@ cabal-version: 1.22 -- see: https://github.com/sol/hpack name: freckle-app -version: 1.22.0.0 +version: 1.23.0.0 synopsis: Haskell application toolkit used at Freckle description: Please see README.md category: Utils @@ -69,7 +69,6 @@ library , Freckle.App.Http.Header , Freckle.App.Http.Paginate , Freckle.App.Http.Retry - , Freckle.App.HttpSpec , Freckle.App.Prelude , Freckle.App.Exception , Freckle.App.Exception.MonadThrow @@ -203,7 +202,6 @@ test-suite spec Freckle.App.BugsnagSpec Freckle.App.CsvSpec Freckle.App.Test.Hspec.AnnotatedExceptionSpec - Freckle.App.Test.Http.MatchRequestSpec Freckle.App.Test.Properties.JSONSpec Freckle.App.Test.Properties.PathPieceSpec Freckle.App.Test.Properties.PersistValueSpec diff --git a/freckle-app/package.yaml b/freckle-app/package.yaml index d42f09b..a154bf9 100644 --- a/freckle-app/package.yaml +++ b/freckle-app/package.yaml @@ -1,5 +1,5 @@ name: freckle-app -version: 1.22.0.0 +version: 1.23.0.0 maintainer: Freckle Education category: Utils @@ -66,7 +66,6 @@ library: - Freckle.App.Http.Header - Freckle.App.Http.Paginate - Freckle.App.Http.Retry - - Freckle.App.HttpSpec - Freckle.App.Prelude - Freckle.App.Exception - Freckle.App.Exception.MonadThrow diff --git a/freckle-http/CHANGELOG.md b/freckle-http/CHANGELOG.md index 644360b..d2da003 100644 --- a/freckle-http/CHANGELOG.md +++ b/freckle-http/CHANGELOG.md @@ -1,4 +1,8 @@ -## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-http-v0.0.0.0...main) +## [_Unreleased_](https://github.com/freckle/freckle-app/compare/freckle-http-v0.1.0.0...main) + +## [v0.1.0.0](https://github.com/freckle/freckle-app/compare/freckle-http-v0.0.0.0...freckle-http-v0.1.0.0) + +Removes `Freckle.App.HttpSpec` which had been included by mistake. ## [v0.0.0.0](https://github.com/freckle/freckle-app/tree/freckle-http-v0.0.0.0/freckle-http) diff --git a/freckle-http/freckle-http.cabal b/freckle-http/freckle-http.cabal index b286ee6..795e658 100644 --- a/freckle-http/freckle-http.cabal +++ b/freckle-http/freckle-http.cabal @@ -1,11 +1,11 @@ cabal-version: 1.18 --- This file has been generated from package.yaml by hpack version 0.36.0. +-- This file has been generated from package.yaml by hpack version 0.37.0. -- -- see: https://github.com/sol/hpack name: freckle-http -version: 0.0.0.0 +version: 0.1.0.0 synopsis: Toolkit for making HTTP requests description: Please see README.md category: HTTP @@ -35,7 +35,6 @@ library Freckle.App.Http.Header Freckle.App.Http.Paginate Freckle.App.Http.Retry - Freckle.App.HttpSpec Freckle.App.Test.Http Freckle.App.Test.Http.MatchRequest other-modules: @@ -72,13 +71,11 @@ library , filepath , freckle-memcached , hs-opentelemetry-api - , hspec >=2.8.1 , http-client , http-conduit >=2.3.5 , http-link-header , http-types , lens - , lens-aeson , memcache , monad-logger , monad-validate @@ -102,6 +99,8 @@ test-suite spec main-is: Main.hs other-modules: Freckle.App.Http.CacheSpec + Freckle.App.HttpSpec + Freckle.App.Test.Http.MatchRequestSpec Paths_freckle_http hs-source-dirs: tests @@ -125,11 +124,13 @@ test-suite spec , base <5 , bytestring , freckle-http - , hspec + , freckle-prelude + , hspec >=2.8.1 , hspec-expectations-json , hspec-expectations-lifted , http-types , lens + , lens-aeson , mtl , time , unordered-containers diff --git a/freckle-http/package.yaml b/freckle-http/package.yaml index 9c508fe..d374f09 100644 --- a/freckle-http/package.yaml +++ b/freckle-http/package.yaml @@ -1,5 +1,5 @@ name: freckle-http -version: 0.0.0.0 +version: 0.1.0.0 maintainer: Freckle Education category: HTTP github: freckle/freckle-app @@ -70,13 +70,11 @@ library: - filepath - freckle-memcached - hs-opentelemetry-api - - hspec >= 2.8.1 - http-client - http-conduit >= 2.3.5 # addToRequestQueryString - http-link-header - http-types - lens - - lens-aeson - memcache - monad-logger - monad-validate @@ -101,11 +99,13 @@ tests: - aeson - bytestring - freckle-http - - hspec + - freckle-prelude + - hspec >= 2.8.1 - hspec-expectations-json - hspec-expectations-lifted - http-types - lens + - lens-aeson - mtl - time - unordered-containers diff --git a/freckle-http/library/Freckle/App/HttpSpec.hs b/freckle-http/tests/Freckle/App/HttpSpec.hs similarity index 100% rename from freckle-http/library/Freckle/App/HttpSpec.hs rename to freckle-http/tests/Freckle/App/HttpSpec.hs diff --git a/freckle-app/tests/Freckle/App/Test/Http/MatchRequestSpec.hs b/freckle-http/tests/Freckle/App/Test/Http/MatchRequestSpec.hs similarity index 100% rename from freckle-app/tests/Freckle/App/Test/Http/MatchRequestSpec.hs rename to freckle-http/tests/Freckle/App/Test/Http/MatchRequestSpec.hs