Upgrade to elm 0.17.1

10 files changed, 18 insertions, 58 deletions

diff --git a/src/Model/Board.elm b/src/Model/Board.elm
index fe9ac4e..52c7630 100644
--- a/src/Model/Board.elm
+++ b/src/Model/Board.elm
@@ -1,7 +1,7 @@
-module Model.Board
+module Model.Board exposing
   ( initBoardSize
   , boardDiagonal
-  ) where
+  )
 
 import Model.Vec2 exposing (Vec2)
 
diff --git a/src/Model/Cloud.elm b/src/Model/Cloud.elm
index 26b4104..e397d16 100644
--- a/src/Model/Cloud.elm
+++ b/src/Model/Cloud.elm
@@ -1,9 +1,9 @@
-module Model.Cloud
+module Model.Cloud exposing
   ( Cloud
   , initCloud
   , playerPointsCollision
   , playerPointCollision
-  ) where
+  )
 
 import List
 
diff --git a/src/Model/Color.elm b/src/Model/Color.elm
index 8452efa..49ece2b 100644
--- a/src/Model/Color.elm
+++ b/src/Model/Color.elm
@@ -1,8 +1,8 @@
-module Model.Color
+module Model.Color exposing
   ( Color
   , htmlOutput
   , mergeColors
-  ) where
+  )
 
 type alias Color =
   { red : Int
diff --git a/src/Model/Config.elm b/src/Model/Config.elm
index 2973dc7..ea6f9dc 100644
--- a/src/Model/Config.elm
+++ b/src/Model/Config.elm
@@ -1,7 +1,7 @@
-module Model.Config
+module Model.Config exposing
   ( Config(..)
   , otherConfig
-  ) where
+  )
 
 type Config =
   White
diff --git a/src/Model/Game.elm b/src/Model/Game.elm
deleted file mode 100644
index 97fbc4c..0000000
--- a/src/Model/Game.elm
+++ /dev/null
@@ -1,40 +0,0 @@
-module Model.Game
-  ( Game
-  , initialGame
-  ) where
-
-import Random exposing (..)
-import Char exposing (KeyCode)
-import Time exposing (Time)
-import Set
-import Set exposing (Set)
-
-import Model.Player exposing (..)
-import Model.Cloud exposing (..)
-import Model.Vec2 exposing (Vec2)
-import Model.Config exposing (..)
-import Model.Round exposing (Round)
-import Model.Board exposing (initBoardSize)
-
-type alias Game =
-  { elapsedTime : Float
-  , boardSize : Vec2
-  , keysDown : Set KeyCode
-  , currentScore : Int
-  , player : Player
-  , cloud : Cloud
-  , rounds : List Round
-  , seed : Seed
-  }
-
-initialGame : Seed -> Game
-initialGame seed =
-  { elapsedTime = 0
-  , boardSize = initBoardSize
-  , keysDown = Set.empty
-  , currentScore = 0
-  , player = initPlayer
-  , cloud = initCloud
-  , rounds = []
-  , seed = seed
-  }
diff --git a/src/Model/Level.elm b/src/Model/Level.elm
index d058d53..9a60b9a 100644
--- a/src/Model/Level.elm
+++ b/src/Model/Level.elm
@@ -1,10 +1,10 @@
-module Model.Level
+module Model.Level exposing
   ( currentLevel
   , currentLevelScore
   , currentLevelNumber
   , progressiveColor
   , levelScoreDuration
-  ) where
+  )
 
 import Time exposing (Time)
 import Debug
diff --git a/src/Model/Player.elm b/src/Model/Player.elm
index 6858893..37a1a7f 100644
--- a/src/Model/Player.elm
+++ b/src/Model/Player.elm
@@ -1,9 +1,9 @@
-module Model.Player
+module Model.Player exposing
   ( Player
   , initPlayer
   , getPlayerSize
   , playerSpeed
-  ) where
+  )
 
 import Model.Vec2 exposing (..)
 import Model.Config exposing (..)
diff --git a/src/Model/Point.elm b/src/Model/Point.elm
index c0daeaf..929fda8 100644
--- a/src/Model/Point.elm
+++ b/src/Model/Point.elm
@@ -1,11 +1,11 @@
-module Model.Point
+module Model.Point exposing
   ( Point
   , pointMove
   , pointSize
   , pointSpeed
   , pointSpawnDist
   , pointAwayDist
-  ) where
+  )
 
 import Model.Vec2 exposing (..)
 import Model.Board exposing (boardDiagonal)
diff --git a/src/Model/Round.elm b/src/Model/Round.elm
index 4586ede..c983839 100644
--- a/src/Model/Round.elm
+++ b/src/Model/Round.elm
@@ -1,7 +1,7 @@
-module Model.Round
+module Model.Round exposing
   ( Round
   , maybeBestRound
-  ) where
+  )
 
 import List
 import Time exposing (Time)
diff --git a/src/Model/Vec2.elm b/src/Model/Vec2.elm
index 85ff008..4bb5f31 100644
--- a/src/Model/Vec2.elm
+++ b/src/Model/Vec2.elm
@@ -1,4 +1,4 @@
-module Model.Vec2
+module Model.Vec2 exposing
   ( Vec2
   , add
   , sub
@@ -8,7 +8,7 @@ module Model.Vec2
   , clockwiseRotate90
   , isNull
   , originVec
-  ) where
+  )
 
 type alias Vec2 =
   { x : Float