Merge pull request #4 from elm-fluent/elm-018

Elm 0.18 compatibility
vanwagonet · Aug 20, 2018 · 8dfc0cf · 8dfc0cf
2 parents 5aec116 + 17c65cb
commit 8dfc0cf
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ node_js:
   - lts/*
   - stable
 install:
-  - npm install -g standard elm@0.17 elm-test@0.17
+  - npm install -g standard elm@0.18 elm-test@0.18
   - elm-package install -y
   - pushd tests && elm-package install -y && popd
 script:

diff --git a/elm-package.json b/elm-package.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.0",
+    "version": "2.0.0",
     "summary": "Bindings to JavaScript Internationalization API",
     "repository": "https://github.com/vanwagonet/elm-intl.git",
     "license": "BSD3",
@@ -16,7 +16,7 @@
     ],
     "native-modules": true,
     "dependencies": {
-        "elm-lang/core": "4.0.5 <= v < 5.0.0"
+        "elm-lang/core": "5.1.1 <= v < 6.0.0"
     },
-    "elm-version": "0.17.1 <= v < 0.18.0"
+    "elm-version": "0.18.0 <= v < 0.19.0"
 }
diff --git a/src/Native/Intl/DateTimeFormat.js b/src/Native/Intl/DateTimeFormat.js
@@ -56,7 +56,6 @@ var _thetalecrafter$elm_intl$Native_Intl_DateTimeFormat = function () {
         return 'long'
       case _thetalecrafter$elm_intl$Intl_DateTimeFormat$OmitName:
       default:
-        return
     }
   }
 
@@ -79,7 +78,6 @@ var _thetalecrafter$elm_intl$Native_Intl_DateTimeFormat = function () {
         return '2-digit'
       case _thetalecrafter$elm_intl$Intl_DateTimeFormat$OmitNumber:
       default:
-        return
     }
   }
 
@@ -114,7 +112,6 @@ var _thetalecrafter$elm_intl$Native_Intl_DateTimeFormat = function () {
         return '2-digit'
       case _thetalecrafter$elm_intl$Intl_DateTimeFormat$OmitMonth:
       default:
-        return
     }
   }
 
@@ -137,7 +134,6 @@ var _thetalecrafter$elm_intl$Native_Intl_DateTimeFormat = function () {
         return 'long'
       case _thetalecrafter$elm_intl$Intl_DateTimeFormat$OmitTimeZone:
       default:
-        return
     }
   }
 

diff --git a/tests/Main.elm b/tests/Main.elm
diff --git a/tests/Test/Collator.elm b/tests/Test/Collator.elm
@@ -33,7 +33,7 @@ all =
             describe "fromOptions and resolvedOptions"
                 (map
                     (\options ->
-                        test "options" <|
+                        test ("options " ++ toString options) <|
                             \() ->
                                 let
                                     resolved =

diff --git a/tests/Test/DateTimeFormat.elm b/tests/Test/DateTimeFormat.elm
@@ -32,7 +32,7 @@ all =
             describe "fromOptions and resolvedOptions"
                 (map
                     (\options ->
-                        test "options" <|
+                        test ("options " ++ toString options) <|
                             \() ->
                                 let
                                     resolved =

diff --git a/tests/Test/NumberFormat.elm b/tests/Test/NumberFormat.elm
@@ -38,7 +38,7 @@ all =
                     resolved =
                         NumberFormat.resolvedOptions (NumberFormat.fromOptions options)
                   in
-                    describe "percent"
+                    describe "percent maximumSignificantDigits"
                         [ test "format" <|
                             \() -> Expect.equal (format 0.12345) "12.3%"
                         , test "resolvedOptions" <|
@@ -60,7 +60,7 @@ all =
                     resolved =
                         NumberFormat.resolvedOptions (NumberFormat.fromOptions options)
                   in
-                    describe "percent"
+                    describe "percent minimumFractionDigits"
                         [ test "format" <|
                             \() -> Expect.equal (format 1) "100.00%"
                         , test "resolvedOptions" <|

diff --git a/tests/Tests.elm b/tests/Tests.elm
diff --git a/tests/elm-package.json b/tests/elm-package.json
@@ -10,9 +10,8 @@
     "exposed-modules": [],
     "native-modules": true,
     "dependencies": {
-        "elm-lang/core": "4.0.0 <= v < 5.0.0",
-        "elm-community/elm-test": "2.0.0 <= v < 3.0.0",
-        "rtfeldman/node-test-runner": "2.0.0 <= v < 3.0.0"
+        "elm-lang/core": "5.0.0 <= v < 6.0.0",
+        "elm-community/elm-test": "4.0.0 <= v < 5.0.0"
     },
-    "elm-version": "0.17.0 <= v < 0.18.0"
+    "elm-version": "0.18.0 <= v < 0.19.0"
 }