Update for Elm 0.18

hoelzro · Nov 17, 2016 · d598084 · d598084
1 parent 1742707
commit d598084
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/Main.elm b/Main.elm
@@ -1,5 +1,4 @@
 import Html exposing (Html)
-import Html.App as App
 import Keyboard
 import Random
 import Time exposing (Time)
@@ -89,8 +88,8 @@ subscriptions _ =
       inputChars = Keyboard.presses (Keypress << qwerty2jcuken)
   in Sub.batch [ clock, inputChars ]
 
-main : Program Never
-main = App.program {
+main : Program Never Model Message
+main = Html.program {
     init = init,
     update = update,
     subscriptions = subscriptions,

diff --git a/Tutor/Card.elm b/Tutor/Card.elm
@@ -10,7 +10,7 @@ isPrefixOf = flip String.startsWith
 
 renderTyped : String -> String -> Html a
 renderTyped expected got =
-  if expected `isPrefixOf` got
+  if isPrefixOf expected got
     then text got
     else span [] [ (text <| String.dropRight 1 got),
       span [style [("color", "red")]] [ text <| String.right 1 got ] ]
@@ -41,7 +41,7 @@ cardState : Card -> CardState
 cardState (Card target typed) =
   if target == typed
     then Complete
-    else if target `isPrefixOf` typed
+    else if isPrefixOf target typed
       then Incomplete
       else Incorrect
 

diff --git a/Tutor/Utils.elm b/Tutor/Utils.elm
@@ -21,7 +21,7 @@ last = unsafeFromJust << List.head << List.reverse
 selectValue : List (Float, a) -> Float -> a
 selectValue pairs selector =
   let lowerThanSelector = List.filter (\(p, _) -> p <= selector) pairs
-  in snd <| last lowerThanSelector
+  in Tuple.second <| last lowerThanSelector
 
 weightedChoice : List (Float, a) -> Random.Generator a
 weightedChoice possibilities =
@@ -47,5 +47,5 @@ randomMember values =
 
 randomNgram : List (Int, List (Float, String)) -> Random.Generator String
 randomNgram ngrams =
-  let randomNgramSet = randomMember <| List.map snd ngrams
-  in randomNgramSet `Random.andThen` weightedChoice
+  let randomNgramSet = randomMember <| List.map Tuple.second ngrams
+  in Random.andThen weightedChoice randomNgramSet
diff --git a/elm-package.json b/elm-package.json
@@ -8,9 +8,9 @@
     ],
     "exposed-modules": [],
     "dependencies": {
-        "elm-lang/core": "4.0.0 <= v < 5.0.0",
-        "elm-lang/html": "1.0.0 <= v < 2.0.0",
-        "elm-lang/keyboard": "1.0.0 <= v < 2.0.0"
+        "elm-lang/core": "5.0.0 <= v < 6.0.0",
+        "elm-lang/html": "2.0.0 <= v < 3.0.0",
+        "elm-lang/keyboard": "1.0.1 <= v < 2.0.0"
     },
-    "elm-version": "0.17.0 <= v < 0.18.0"
-}
+    "elm-version": "0.18.0 <= v < 0.19.0"
+}