From 49a5a88325d7fd281e5c0dae49cf4f3e43006408 Mon Sep 17 00:00:00 2001 From: Berthold Frank Date: Sun, 8 Aug 2021 17:31:09 +0200 Subject: [PATCH 1/2] Update ring version --- todo-app/cheats/01/project.clj | 2 +- todo-app/project.clj | 2 +- tutorial/project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/todo-app/cheats/01/project.clj b/todo-app/cheats/01/project.clj index 66b36d0..795b6b7 100644 --- a/todo-app/cheats/01/project.clj +++ b/todo-app/cheats/01/project.clj @@ -8,7 +8,7 @@ [ring/ring-core "1.6.1"] [ring/ring-defaults "0.3.0"] [ring/ring-jetty-adapter "1.6.1"]] - :plugins [[lein-ring "0.9.7"]] + :plugins [[lein-ring "0.12.5"]] :main todo-app.core :ring {:handler todo-app.handler/app} :profiles diff --git a/todo-app/project.clj b/todo-app/project.clj index d411f6d..1eb7119 100644 --- a/todo-app/project.clj +++ b/todo-app/project.clj @@ -7,7 +7,7 @@ [ring/ring-core "1.6.1"] [ring/ring-defaults "0.3.0"] [ring/ring-jetty-adapter "1.6.1"]] - :plugins [[lein-ring "0.9.7"]] + :plugins [[lein-ring "0.12.5"]] :main todo-app.core :ring {:handler todo-app.handler/app} :profiles diff --git a/tutorial/project.clj b/tutorial/project.clj index c03c1d8..fa54428 100644 --- a/tutorial/project.clj +++ b/tutorial/project.clj @@ -10,7 +10,7 @@ [hiccup "2.0.0-alpha1"] [markdown-clj "0.9.99"]] :main tutorial.core - :plugins [[lein-ring "0.9.7"]] + :plugins [[lein-ring "0.12.5"]] :ring {:handler tutorial.handler/app} :profiles {:dev {:dependencies [[javax.servlet/servlet-api "2.5"] From ef2a701902d5c707544a882fcd668113d9108994 Mon Sep 17 00:00:00 2001 From: Berthold Frank Date: Sun, 8 Aug 2021 17:31:09 +0200 Subject: [PATCH 2/2] Update dependencies --- todo-app/cheats/01/project.clj | 14 +++++++------- todo-app/project.clj | 12 ++++++------ tutorial/chapters/01_instructions.md | 2 +- tutorial/project.clj | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/todo-app/cheats/01/project.clj b/todo-app/cheats/01/project.clj index 795b6b7..e8ee920 100644 --- a/todo-app/cheats/01/project.clj +++ b/todo-app/cheats/01/project.clj @@ -2,15 +2,15 @@ :description "FIXME: write description" :url "http://example.com/FIXME" :min-lein-version "2.0.0" - :dependencies [[org.clojure/clojure "1.9.0-alpha14"] - [compojure "1.6.0"] - [hiccup "2.0.0-alpha1"] - [ring/ring-core "1.6.1"] - [ring/ring-defaults "0.3.0"] - [ring/ring-jetty-adapter "1.6.1"]] + :dependencies [[org.clojure/clojure "1.10.3"] + [compojure "1.6.2"] + [hiccup "2.0.0-alpha2"] + [ring/ring-core "1.9.4"] + [ring/ring-defaults "0.3.2"] + [ring/ring-jetty-adapter "1.9.4"]] :plugins [[lein-ring "0.12.5"]] :main todo-app.core :ring {:handler todo-app.handler/app} :profiles {:dev {:dependencies [[javax.servlet/servlet-api "2.5"] - [ring/ring-mock "0.3.0"]]}}) + [ring/ring-mock "0.3.2"]]}}) diff --git a/todo-app/project.clj b/todo-app/project.clj index 1eb7119..c1a6d54 100644 --- a/todo-app/project.clj +++ b/todo-app/project.clj @@ -2,14 +2,14 @@ :description "FIXME: write description" :url "http://example.com/FIXME" :min-lein-version "2.0.0" - :dependencies [[org.clojure/clojure "1.9.0-alpha14"] - [compojure "1.6.0"] - [ring/ring-core "1.6.1"] - [ring/ring-defaults "0.3.0"] - [ring/ring-jetty-adapter "1.6.1"]] + :dependencies [[org.clojure/clojure "1.10.3"] + [compojure "1.6.2"] + [ring/ring-core "1.9.4"] + [ring/ring-defaults "0.3.2"] + [ring/ring-jetty-adapter "1.9.4"]] :plugins [[lein-ring "0.12.5"]] :main todo-app.core :ring {:handler todo-app.handler/app} :profiles {:dev {:dependencies [[javax.servlet/servlet-api "2.5"] - [ring/ring-mock "0.3.0"]]}}) + [ring/ring-mock "0.3.2"]]}}) diff --git a/tutorial/chapters/01_instructions.md b/tutorial/chapters/01_instructions.md index 2768944..7437c83 100644 --- a/tutorial/chapters/01_instructions.md +++ b/tutorial/chapters/01_instructions.md @@ -116,7 +116,7 @@ Or you can just refer all of the functions from a namespace (only a good idea if ## Task 01: -Update your application by modifiying the `project.clj` file to include a dependency to hiccup (currently in version `2.0.0-alpha1`). +Update your application by modifiying the `project.clj` file to include a dependency to hiccup (the 2.x version). In the `src/todo_app/handler.clj` file, modify the `page` function so that it sets the title of the page and adds a variable number of elements to the body of the page. Also include the 'splendor.css' file that is a static resource in the project (found under `resources/public`) to the HTML page (HINT: use the `hiccup.page/include-css` function). diff --git a/tutorial/project.clj b/tutorial/project.clj index fa54428..d56b309 100644 --- a/tutorial/project.clj +++ b/tutorial/project.clj @@ -2,16 +2,16 @@ :description "FIXME: write description" :url "http://example.com/FIXME" :min-lein-version "2.0.0" - :dependencies [[org.clojure/clojure "1.8.0"] - [compojure "1.6.0"] - [ring/ring-core "1.6.1"] - [ring/ring-defaults "0.3.0"] - [ring/ring-jetty-adapter "1.6.1"] - [hiccup "2.0.0-alpha1"] - [markdown-clj "0.9.99"]] + :dependencies [[org.clojure/clojure "1.10.3"] + [compojure "1.6.2"] + [ring/ring-core "1.9.4"] + [ring/ring-defaults "0.3.2"] + [ring/ring-jetty-adapter "1.9.4"] + [hiccup "2.0.0-alpha2"] + [markdown-clj "1.10.5"]] :main tutorial.core :plugins [[lein-ring "0.12.5"]] :ring {:handler tutorial.handler/app} :profiles {:dev {:dependencies [[javax.servlet/servlet-api "2.5"] - [ring/ring-mock "0.3.0"]]}}) + [ring/ring-mock "0.3.2"]]}})