From 4622e146816f10210ceb4dab8d7b24b603266931 Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Mon, 4 Apr 2022 20:29:39 -0700 Subject: [PATCH] Relax text bounds to allow text-2.0 This was tested by using an explicit override with this diff: --- a/stack-9.2.yaml +++ b/stack-9.2.yaml @@ -21,5 +21,10 @@ packages: - proto-lens-tests - proto-lens-tests-dep +extra-deps: + - text-2.0 + - Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459 + - parsec-3.1.15.0@sha256:a162d4cc8884014ba35192545cad293af0529fe11497aad8834bbaaa3dfffc26,4429 + ghc-options: "$locals": -Wall -Werror --- proto-lens-arbitrary/Changelog.md | 3 +++ proto-lens-arbitrary/package.yaml | 2 +- proto-lens-arbitrary/proto-lens-arbitrary.cabal | 2 +- proto-lens-discrimination/package.yaml | 2 +- proto-lens-discrimination/proto-lens-discrimination.cabal | 4 ++-- proto-lens-protobuf-types/Changelog.md | 3 +++ proto-lens-protobuf-types/package.yaml | 4 ++-- proto-lens-protobuf-types/proto-lens-protobuf-types.cabal | 4 ++-- proto-lens-protoc/Changelog.md | 3 +++ proto-lens-protoc/package.yaml | 4 ++-- proto-lens-protoc/proto-lens-protoc.cabal | 4 ++-- proto-lens-runtime/Changelog.md | 3 +++ proto-lens-runtime/package.yaml | 2 +- proto-lens-runtime/proto-lens-runtime.cabal | 2 +- proto-lens-setup/Changelog.md | 3 +++ proto-lens-setup/package.yaml | 2 +- proto-lens-setup/proto-lens-setup.cabal | 2 +- proto-lens/Changelog.md | 4 ++++ proto-lens/package.yaml | 4 ++-- proto-lens/proto-lens.cabal | 4 ++-- 20 files changed, 40 insertions(+), 21 deletions(-) diff --git a/proto-lens-arbitrary/Changelog.md b/proto-lens-arbitrary/Changelog.md index 4bd9e852..2deb138d 100644 --- a/proto-lens-arbitrary/Changelog.md +++ b/proto-lens-arbitrary/Changelog.md @@ -1,5 +1,8 @@ # Changelog for `proto-lens-arbitrary` +## v0.1.2.10 +- Relax upper bounds for ghc-9.2 + ## v0.1.2.9 - Bump upper bound to allow base-4.14. diff --git a/proto-lens-arbitrary/package.yaml b/proto-lens-arbitrary/package.yaml index 95722aa9..7ab350e5 100644 --- a/proto-lens-arbitrary/package.yaml +++ b/proto-lens-arbitrary/package.yaml @@ -18,7 +18,7 @@ dependencies: - base >= 4.10 && < 4.17 - bytestring >= 0.10 && < 0.12 - containers >= 0.5 && < 0.7 - - text == 1.2.* + - text >= 1.2 && < 2.1 - lens-family >= 1.2 && < 2.2 - QuickCheck >= 2.8 && < 2.15 diff --git a/proto-lens-arbitrary/proto-lens-arbitrary.cabal b/proto-lens-arbitrary/proto-lens-arbitrary.cabal index 84cf8828..49b6dae0 100644 --- a/proto-lens-arbitrary/proto-lens-arbitrary.cabal +++ b/proto-lens-arbitrary/proto-lens-arbitrary.cabal @@ -39,5 +39,5 @@ library , containers >=0.5 && <0.7 , lens-family >=1.2 && <2.2 , proto-lens >=0.4 && <0.8 - , text ==1.2.* + , text >=1.2 && <2.1 default-language: Haskell2010 diff --git a/proto-lens-discrimination/package.yaml b/proto-lens-discrimination/package.yaml index 390abbe0..50f99aa4 100644 --- a/proto-lens-discrimination/package.yaml +++ b/proto-lens-discrimination/package.yaml @@ -30,7 +30,7 @@ dependencies: - discrimination-ieee754 == 0.1.* - lens-family >= 1.2 && < 2.2 - proto-lens >= 0.6 && < 0.8 - - text == 1.2.* + - text >= 1.2 && < 2.1 library: source-dirs: src diff --git a/proto-lens-discrimination/proto-lens-discrimination.cabal b/proto-lens-discrimination/proto-lens-discrimination.cabal index 176d4330..b93e1bae 100644 --- a/proto-lens-discrimination/proto-lens-discrimination.cabal +++ b/proto-lens-discrimination/proto-lens-discrimination.cabal @@ -52,7 +52,7 @@ library , discrimination-ieee754 ==0.1.* , lens-family >=1.2 && <2.2 , proto-lens >=0.6 && <0.8 - , text ==1.2.* + , text >=1.2 && <2.1 default-language: Haskell2010 test-suite discrimination_test @@ -90,5 +90,5 @@ test-suite discrimination_test , test-framework ==0.8.* , test-framework-hunit ==0.3.* , test-framework-quickcheck2 ==0.3.* - , text ==1.2.* + , text >=1.2 && <2.1 default-language: Haskell2010 diff --git a/proto-lens-protobuf-types/Changelog.md b/proto-lens-protobuf-types/Changelog.md index 2e9f2731..91a76285 100644 --- a/proto-lens-protobuf-types/Changelog.md +++ b/proto-lens-protobuf-types/Changelog.md @@ -1,5 +1,8 @@ # Changelog for `proto-lens-protobuf-types` +## v0.7.1.1 +- Relax upper bounds for ghc-9.2 + ## v0.7.1.0 - Support GHC 9.0. - Add ServiceDescriptor to generated services (#409) diff --git a/proto-lens-protobuf-types/package.yaml b/proto-lens-protobuf-types/package.yaml index 3cd7745d..baab4c4d 100644 --- a/proto-lens-protobuf-types/package.yaml +++ b/proto-lens-protobuf-types/package.yaml @@ -1,5 +1,5 @@ name: proto-lens-protobuf-types -version: '0.7.1.0' +version: '0.7.1.1' synopsis: Basic protocol buffer message types. description: > This package provides bindings standard protocol message types, @@ -33,7 +33,7 @@ dependencies: - lens-family >= 1.2 && < 2.2 - proto-lens == 0.7.* - proto-lens-runtime == 0.7.* - - text == 1.2.* + - text >= 1.2 && < 2.1 library: source-dirs: src diff --git a/proto-lens-protobuf-types/proto-lens-protobuf-types.cabal b/proto-lens-protobuf-types/proto-lens-protobuf-types.cabal index ab717c94..3325558c 100644 --- a/proto-lens-protobuf-types/proto-lens-protobuf-types.cabal +++ b/proto-lens-protobuf-types/proto-lens-protobuf-types.cabal @@ -5,7 +5,7 @@ cabal-version: 2.0 -- see: https://github.com/sol/hpack name: proto-lens-protobuf-types -version: 0.7.1.0 +version: 0.7.1.1 synopsis: Basic protocol buffer message types. description: This package provides bindings standard protocol message types, for use with the proto-lens library. category: Data @@ -80,5 +80,5 @@ library , lens-family >=1.2 && <2.2 , proto-lens ==0.7.* , proto-lens-runtime ==0.7.* - , text ==1.2.* + , text >=1.2 && <2.1 default-language: Haskell2010 diff --git a/proto-lens-protoc/Changelog.md b/proto-lens-protoc/Changelog.md index 96cd3875..43b81531 100644 --- a/proto-lens-protoc/Changelog.md +++ b/proto-lens-protoc/Changelog.md @@ -1,5 +1,8 @@ # Changelog for `proto-lens-protoc` +## v0.7.1.1 +- Relax upper bounds for ghc-9.2 + ## v0.7.1.0 - Support GHC 9.0. - Add ServiceDescriptor to generated services. (#409) diff --git a/proto-lens-protoc/package.yaml b/proto-lens-protoc/package.yaml index 07ef2906..d4dc516c 100644 --- a/proto-lens-protoc/package.yaml +++ b/proto-lens-protoc/package.yaml @@ -1,5 +1,5 @@ name: proto-lens-protoc -version: '0.7.1.0' +version: '0.7.1.1' synopsis: Protocol buffer compiler for the proto-lens library. description: > Turn protocol buffer files (.proto) into Haskell files (.hs) which @@ -40,4 +40,4 @@ executables: - proto-lens == 0.7.* - proto-lens-protoc - proto-lens-runtime == 0.7.* - - text == 1.2.* + - text >= 1.2 && < 2.1 diff --git a/proto-lens-protoc/proto-lens-protoc.cabal b/proto-lens-protoc/proto-lens-protoc.cabal index ccaf5d18..b1db73dd 100644 --- a/proto-lens-protoc/proto-lens-protoc.cabal +++ b/proto-lens-protoc/proto-lens-protoc.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: proto-lens-protoc -version: 0.7.1.0 +version: 0.7.1.1 synopsis: Protocol buffer compiler for the proto-lens library. description: Turn protocol buffer files (.proto) into Haskell files (.hs) which can be used with the proto-lens package. The library component of this package contains compiler code (namely Data.ProtoLens.Compiler.*) is not guaranteed to have stable APIs.' @@ -67,5 +67,5 @@ executable proto-lens-protoc , proto-lens ==0.7.* , proto-lens-protoc , proto-lens-runtime ==0.7.* - , text ==1.2.* + , text >=1.2 && <2.1 default-language: Haskell2010 diff --git a/proto-lens-runtime/Changelog.md b/proto-lens-runtime/Changelog.md index b4c755f7..a43cc086 100644 --- a/proto-lens-runtime/Changelog.md +++ b/proto-lens-runtime/Changelog.md @@ -1,5 +1,8 @@ # Changelog for `proto-lens-runtime` +## v0.7.0.1 +- Relax upper bounds for ghc-9.2 + ## v0.7.0.0 - Bump upper bound to allow base-4.14. diff --git a/proto-lens-runtime/package.yaml b/proto-lens-runtime/package.yaml index 0cffcb43..1ac51e8c 100644 --- a/proto-lens-runtime/package.yaml +++ b/proto-lens-runtime/package.yaml @@ -23,7 +23,7 @@ library: - filepath >= 1.4 && < 1.6 - lens-family >= 1.2 && < 2.2 - proto-lens == 0.7.* - - text == 1.2.* + - text >= 1.2 && < 2.1 - vector >= 0.11 && < 0.13 diff --git a/proto-lens-runtime/proto-lens-runtime.cabal b/proto-lens-runtime/proto-lens-runtime.cabal index 5ff95495..ae3c3dd7 100644 --- a/proto-lens-runtime/proto-lens-runtime.cabal +++ b/proto-lens-runtime/proto-lens-runtime.cabal @@ -60,6 +60,6 @@ library , filepath >=1.4 && <1.6 , lens-family >=1.2 && <2.2 , proto-lens ==0.7.* - , text ==1.2.* + , text >=1.2 && <2.1 , vector >=0.11 && <0.13 default-language: Haskell2010 diff --git a/proto-lens-setup/Changelog.md b/proto-lens-setup/Changelog.md index 977081f1..65faf611 100644 --- a/proto-lens-setup/Changelog.md +++ b/proto-lens-setup/Changelog.md @@ -1,5 +1,8 @@ # Changelog for `proto-lens-setup` +## v0.4.0.5 +- Relax upper bounds for ghc-9.2 + ## v0.4.0.4 - Bump upper bound to allow base-4.14. - Bump upper bound to allow Cabal-3.2. diff --git a/proto-lens-setup/package.yaml b/proto-lens-setup/package.yaml index c02cd34a..5b909521 100644 --- a/proto-lens-setup/package.yaml +++ b/proto-lens-setup/package.yaml @@ -63,7 +63,7 @@ library: # make this a build-tool dependency. - proto-lens-protoc >= 0.4 && < 0.8 - temporary >= 1.2 && < 1.4 - - text == 1.2.* + - text >= 1.2 && < 2.1 exposed-modules: - Data.ProtoLens.Setup diff --git a/proto-lens-setup/proto-lens-setup.cabal b/proto-lens-setup/proto-lens-setup.cabal index 5aea2fc2..714c9e98 100644 --- a/proto-lens-setup/proto-lens-setup.cabal +++ b/proto-lens-setup/proto-lens-setup.cabal @@ -78,5 +78,5 @@ library , process >=1.2 && <1.7 , proto-lens-protoc >=0.4 && <0.8 , temporary >=1.2 && <1.4 - , text ==1.2.* + , text >=1.2 && <2.1 default-language: Haskell2010 diff --git a/proto-lens/Changelog.md b/proto-lens/Changelog.md index a4ceec2e..ccfe43c5 100644 --- a/proto-lens/Changelog.md +++ b/proto-lens/Changelog.md @@ -1,5 +1,9 @@ # Changelog for `proto-lens` + +## v0.7.1.1 +- Relax upper bounds for ghc-9.2 + ## v0.7.1.0 - Support GHC 9.0. - Fixed parsing of UTF8 chars in text format proto string literals. diff --git a/proto-lens/package.yaml b/proto-lens/package.yaml index 175a7ad1..d5f2acf4 100644 --- a/proto-lens/package.yaml +++ b/proto-lens/package.yaml @@ -1,5 +1,5 @@ name: proto-lens -version: "0.7.1.0" +version: "0.7.1.1" synopsis: A lens-based implementation of protocol buffers in Haskell. description: > The proto-lens library provides an API for protocol buffers using modern @@ -45,7 +45,7 @@ library: - primitive >= 0.6 && < 0.8 - profunctors >= 5.2 && < 6.0 - tagged == 0.8.* - - text == 1.2.* + - text >= 1.2 && < 2.1 - transformers >= 0.4 && < 0.6 - vector >= 0.11 && < 0.13 diff --git a/proto-lens/proto-lens.cabal b/proto-lens/proto-lens.cabal index ad5a6350..b21e6a51 100644 --- a/proto-lens/proto-lens.cabal +++ b/proto-lens/proto-lens.cabal @@ -5,7 +5,7 @@ cabal-version: 1.12 -- see: https://github.com/sol/hpack name: proto-lens -version: 0.7.1.0 +version: 0.7.1.1 synopsis: A lens-based implementation of protocol buffers in Haskell. description: The proto-lens library provides an API for protocol buffers using modern Haskell language and library patterns. Specifically, it provides: . @@ -69,7 +69,7 @@ library , primitive >=0.6 && <0.8 , profunctors >=5.2 && <6.0 , tagged ==0.8.* - , text ==1.2.* + , text >=1.2 && <2.1 , transformers >=0.4 && <0.6 , vector >=0.11 && <0.13 default-language: Haskell2010