From fa8ade2a5f0aaf1c5db785ed97212849b4272c8c Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Tue, 7 Jun 2016 11:29:57 -0700 Subject: [PATCH 1/3] Update link to JS style guide Fix #1384, thanks to @lorenzo! --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61c2c9ec4..d32d9b7f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,7 +15,7 @@ and send it to before opening your pull request. * JavaScript — use [Google's JS style guide][js] [haskell]: https://gist.github.com/evancz/0a1f3717c92fe71702be -[js]: https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml +[js]: https://google.github.io/styleguide/javascriptguide.xml ## Branches From c454cf4716fc8773c58392f447db207f2acdfac9 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Tue, 7 Jun 2016 11:38:17 -0700 Subject: [PATCH 2/3] Bump to 0.17.1 --- elm-compiler.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elm-compiler.cabal b/elm-compiler.cabal index e46911663..8765ebbcc 100644 --- a/elm-compiler.cabal +++ b/elm-compiler.cabal @@ -1,6 +1,6 @@ Name: elm-compiler -Version: 0.17 +Version: 0.17.1 Synopsis: Values to help with elm-package, elm-make, and elm-lang.org. From 1950b466f2713022ed3eb8a110db6a8802b1f930 Mon Sep 17 00:00:00 2001 From: Evan Czaplicki Date: Tue, 7 Jun 2016 11:41:29 -0700 Subject: [PATCH 3/3] Fix #1286, support --version flag --- src/CommandLineRouter.hs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CommandLineRouter.hs b/src/CommandLineRouter.hs index ab138b0ad..b77b0e6cb 100644 --- a/src/CommandLineRouter.hs +++ b/src/CommandLineRouter.hs @@ -10,6 +10,8 @@ import GHC.IO.Encoding (setLocaleEncoding, utf8) import qualified Elm.Compiler.Version as Compiler import qualified Elm.Package as Pkg + + main :: IO () main = do setLocaleEncoding utf8 @@ -19,6 +21,12 @@ main = [] -> putStrLn usageMessage + "--version" -> + putStrLn $ Pkg.versionToString Compiler.version + + "-v" -> + putStrLn $ Pkg.versionToString Compiler.version + command : args -> attemptToRun command args @@ -50,7 +58,7 @@ attemptToRun command args = usageMessage :: String usageMessage = - "Elm Platform " ++ (Pkg.versionToString Compiler.version) ++ " - a way to run all Elm tools\n\ + "Elm Platform " ++ Pkg.versionToString Compiler.version ++ " - a way to run all Elm tools\n\ \\n\ \Usage: elm []\n\ \\n\