Fixes for travis

Author: hamishmack

.travis.yml

@@ -10,10 +10,6 @@ cache:
 env:
  - CABALVER=1.24 GHCVER=7.10.3 OSVER=xenial
  - CABALVER=1.24 GHCVER=8.0.1 OSVER=xenial
- - CABALVER=1.24 GHCVER=7.10.3 OSVER=wily
- - CABALVER=1.24 GHCVER=8.0.1 OSVER=wily
- - CABALVER=1.24 GHCVER=7.10.3 OSVER=vivid
- - CABALVER=1.24 GHCVER=8.0.1 OSVER=vivid
 
 before_install:
  - docker build -t leksah -f travis/$OSVER.Dockerfile travis

cabal.project

@@ -0,0 +1,37 @@
+flags: -overloaded-methods -overloaded-signals -overloaded-properties
+
+packages: .
+
+package gi-atk
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-cairo
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gdk
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gdkpixbuf
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gio
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-glib
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gobject
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gtk
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gtk-hs
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gtkosxapplication
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-gtksource
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-javascriptcore
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-pango
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-soup
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-webkit
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+package gi-webkit2
+ flags: -overloaded-methods -overloaded-signals -overloaded-properties
+

vcsgui/src/VCSGui/Common/Commit.hs

@@ -38,7 +38,6 @@ import Data.GI.Gtk.ModelView.SeqStore
 import GI.Gtk.Objects.Action (onActionActivate)
 import GI.Gtk.Objects.Widget (widgetShowAll)
 import GI.Gtk.Objects.Builder (builderGetObject, Builder(..))
-import Foreign.ForeignPtr (ForeignPtr)
 import Data.GI.Base.BasicTypes
        (ManagedPtr(..), NullToNothing(..), GObject)
 import Data.GI.Base.ManagedPtr (unsafeCastTo)

vcsgui/src/VCSGui/Common/FilesInConflict.hs

@@ -43,7 +43,6 @@ import GI.Gtk.Interfaces.TreeModel (treeModelGetIterFromString)
 import GI.Gtk.Objects.Builder (builderGetObject, Builder(..))
 import Data.GI.Base.BasicTypes
        (ManagedPtr(..), NullToNothing(..), GObject)
-import Foreign.ForeignPtr (ForeignPtr)
 import Data.GI.Base.ManagedPtr (unsafeCastTo)
 import Data.GI.Gtk.ModelView.SeqStore
        (seqStoreAppend, seqStoreClear, seqStoreToList,

vcsgui/src/VCSGui/Common/GtkHelper.hs

@@ -109,7 +109,6 @@ import qualified Data.GI.Gtk.ModelView.CellLayout as Gtk
 import qualified GI.Gtk.Objects.CellRendererText as Gtk
        (cellRendererTextNew, CellRendererText(..))
 import qualified Data.GI.Base.BasicTypes as Gtk (GObject)
-import Foreign.ForeignPtr (ForeignPtr)
 import Data.GI.Base.ManagedPtr (unsafeCastTo)
 import Data.GI.Base.BasicTypes (ManagedPtr(..), NullToNothing(..))
 import Data.Maybe (fromJust)