summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFacundoDominguez <>2018-07-11 18:31:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2018-07-11 18:31:00 (GMT)
commit65d5d5d52ff0e19e7b91ef5d4a92776630c2d47d (patch)
treedbbc7f9249878831dfa760c58e01c606ed80de4b
parent633fcd58b9c65b744ceeb2b972af73978324d0d3 (diff)
version 0.8.4HEAD0.8.4master
-rw-r--r--CHANGELOG.md7
-rw-r--r--inline-java.cabal4
-rw-r--r--src/Language/Java/Inline/Plugin.hs3
3 files changed, 10 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3619f9..b6157b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,14 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/).
-## Next release
+## [0.8.4] - 2018-07-11
-### Added
+### Changed
+
+* Dependency bounds and import declarations to build with ghc 8.4.1.
## [0.8.3] - 2018-07-04
### Changed
+* Rename all BUILD files to BUILD.bazel.
* Workaround Gradle sometimes trashing output in recent versions.
## [0.8.2] - 2018-02-27
diff --git a/inline-java.cabal b/inline-java.cabal
index 40536b3..388ccca 100644
--- a/inline-java.cabal
+++ b/inline-java.cabal
@@ -1,5 +1,5 @@
name: inline-java
-version: 0.8.3
+version: 0.8.4
synopsis: Java interop via inline Java code in Haskell modules.
description: Please see README.md.
homepage: http://github.com/tweag/inline-java#readme
@@ -41,7 +41,7 @@ library
Cabal >=1.24.2,
directory >=1.2,
filepath >=1,
- ghc >=8.0.2 && <8.3,
+ ghc >=8.0.2 && <8.5,
jni >=0.4 && <0.7,
jvm >=0.4 && <0.5,
language-java >=0.2,
diff --git a/src/Language/Java/Inline/Plugin.hs b/src/Language/Java/Inline/Plugin.hs
index b853875..48f63f8 100644
--- a/src/Language/Java/Inline/Plugin.hs
+++ b/src/Language/Java/Inline/Plugin.hs
@@ -33,6 +33,9 @@ import Language.Java.Inline.Magic
#if MIN_VERSION_ghc(8, 2, 1)
import NameCache (nsNames)
#endif
+#if MIN_VERSION_ghc(8, 4, 0)
+import Prelude hiding ((<>))
+#endif
import TyCoRep
import TysWiredIn (nilDataConName, consDataConName)
import System.Directory (listDirectory)