Merge pull request #99 from tmcgilchrist/topic/release

Prepare a new release.
riak-haskell-client · Dec 7, 2017 · 3be290d · 3be290d
2 parents 571bcc2 + fe432c7
commit 3be290d
Show file tree

Hide file tree

Showing 6 changed files with 3,887 additions and 3,647 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,5 @@
+* 1.1.2.2
+  - Fix for GHC 8.2.2 support
 * 1.1.2.1
   - PR #90. Add GHC 8.2.1 support
   - Bump time upper bound from <1.7 to <1.9

diff --git a/protobuf-lens/generate.sh b/protobuf-lens/generate.sh
@@ -72,7 +72,9 @@ for module in $LENS_MODULES; do
   echo "makeLenses ''$module.$type" >> $OUTFILE
 done
 
-./mafia build
+# Generate the sandbox/env
+./mafia lock
+cabal build generate
 
 ################################################################################
 ## Generate and build Network.Riak.Protocol.Lens with the dumped splices

diff --git a/protobuf-lens/riak-protobuf-lens.cabal b/protobuf-lens/riak-protobuf-lens.cabal
@@ -1,5 +1,5 @@
 name:           riak-protobuf-lens
-version:        0.22.0.0
+version:        0.23.0.0
 synopsis:       Lenses for riak-protobuf
 description:
   A set of Haskell lenses for interacting with the protocol buffer
@@ -23,31 +23,39 @@ source-repository head
   location: https://github.com/riak-haskell-client/riak-haskell-client
   subdir: protobuf-lens
 
-library
-  hs-source-dirs:
-      src
-  build-depends:
-      base             >= 3 && <5
-    , bytestring
-    , containers
-    , riak-protobuf    == 0.22.*
-  exposed-modules:
-      Network.Riak.Protocol.Lens
-  default-language: Haskell2010
+flag developer
+  description: operate in developer mode
+  default: False
+  manual: True
 
 executable generate
   main-is: MakeLenses.hs
   hs-source-dirs:
       app
-  ghc-options: -ddump-splices -dppr-cols=200 -ddump-to-file
+  if flag(developer)
+    ghc-options: -ddump-splices -dppr-cols=200 -ddump-to-file
+
   build-depends:
       base             >= 3 && <5
     , bytestring
     , containers
     , microlens        < 0.5
     , microlens-th     < 0.5
-    , riak-protobuf    == 0.22.*
+    , riak-protobuf    == 0.23.*
     , template-haskell
   other-modules:
       TH
   default-language: Haskell2010
+
+library
+  hs-source-dirs:
+      src
+  build-depends:
+      base             >= 3 && <5
+    , bytestring
+    , containers
+    , riak-protobuf    == 0.23.*
+  exposed-modules:
+      Network.Riak.Protocol.Lens
+  default-language: Haskell2010
+