From 6fa7bae53f6fef733bbc903914816c0ef67bb365 Mon Sep 17 00:00:00 2001 From: Lee Spector Date: Mon, 21 Jun 2021 11:15:06 -0400 Subject: [PATCH] Update dependencies --- .gitignore | 90 ++----------------- bin/.gitignore | 1 - project.clj | 4 +- src/pucks/worlds/dev/world23.clj | 14 +-- .../stale/extract-native.dependencies | 2 +- target/stale/extract-native.dependencies | 2 +- 6 files changed, 20 insertions(+), 93 deletions(-) delete mode 100644 bin/.gitignore diff --git a/.gitignore b/.gitignore index 2cc3aeb..b549076 100644 --- a/.gitignore +++ b/.gitignore @@ -1,82 +1,10 @@ - -bin/pucks/agents/bondevolver.clj - -bin/pucks/agents/chest.clj - -bin/pucks/agents/darter.clj - -bin/pucks/agents/donor.clj - -bin/pucks/agents/gate.clj - -bin/pucks/agents/mapdonor.clj - -bin/pucks/agents/opener.clj - -bin/pucks/agents/shooter.clj - -bin/pucks/agents/spawner.clj - -bin/pucks/agents/swarmevolver.clj - -bin/pucks/agents/torpedo.clj - -bin/pucks/core.clj - -bin/pucks/draw.clj - -bin/pucks/neighbors.clj - -bin/pucks/physics.clj - -bin/pucks/reap.clj - -bin/pucks/worlds/ai/world2.clj - -bin/pucks/worlds/ai/world3.clj - -bin/pucks/worlds/ai/world4.clj - -bin/pucks/worlds/ai/world5.clj - -bin/pucks/worlds/ai/world6.clj - -bin/pucks/worlds/ai/world7.clj - -bin/pucks/worlds/ai/world8.clj - -bin/pucks/worlds/dev/world10.clj - -bin/pucks/worlds/dev/world11.clj - -bin/pucks/worlds/dev/world12.clj - -bin/pucks/worlds/dev/world13.clj - -bin/pucks/worlds/dev/world14.clj - -bin/pucks/worlds/dev/world15.clj - -bin/pucks/worlds/dev/world16.clj - -bin/pucks/worlds/dev/world17.clj - -bin/pucks/worlds/dev/world18.clj - -bin/pucks/worlds/dev/world19.clj - -bin/pucks/worlds/dev/world20.clj - -bin/pucks/worlds/dev/world6.clj - -bin/pucks/worlds/dev/world7.clj - -bin/pucks/worlds/dev/world8.clj - -bin/pucks/worlds/dev/world9.clj - -target/base+system+user+dev/classes/META-INF/maven/pucks/pucks/pom.properties - -target/base+system+user+dev/classes/META-INF/maven/pucks/pucks/pom.properties - +target/ +bin/ +*.iml +*.jar +*.class +/.lein-* +/.nrepl-port +.idea/ *.dependencies +*~ diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 05ea11c..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pucks/ diff --git a/project.clj b/project.clj index 5aba092..f8cf5da 100644 --- a/project.clj +++ b/project.clj @@ -3,8 +3,8 @@ :url "http://example.com/FIXME" :license {:name "Eclipse Public License" :url "https://github.com/lspector/pucks"} - :dependencies [[org.clojure/clojure "1.7.0"] - [quil "2.4.0"] + :dependencies [[org.clojure/clojure "1.10.1"] + [quil "4.0.0-SNAPSHOT"] [clojush "2.8.0"]] :main pucks.core :target-path "target/%s" diff --git a/src/pucks/worlds/dev/world23.clj b/src/pucks/worlds/dev/world23.clj index 349853f..40b34a4 100644 --- a/src/pucks/worlds/dev/world23.clj +++ b/src/pucks/worlds/dev/world23.clj @@ -2,7 +2,7 @@ (:use [pucks core globals] [pucks.agents stone vent nursery zapper pusher linear shooter startstop zigzag])) -(defn horizontal-wall [[x-min x-max] y] +(defn horizontal-wall [[x-min x-max] y] (for [x (range x-min x-max 20)] (merge (stone) {:position [x y]}))) @@ -16,15 +16,15 @@ (assoc (vent) :position [500 100] :solid false) (assoc (vent) :position [100 500] :solid false) (assoc (vent) :position [266 466] :solid false) - (assoc (vent) :position [466 266] :solid false)] + (assoc (vent) :position [466 266] :solid false)]) (defn settings [] - {:screen-size 600 - :scale 1.0 + {:screen-size 600 + :scale 1.0 :single-thread-mode false - :nursery-threshold 1000 - :neighborhood-size 150 - :cost-of-collision 0.01 + :nursery-threshold 1000 + :neighborhood-size 150 + :cost-of-collision 0.01 }) ;(run-pucks (agents) (settings)) \ No newline at end of file diff --git a/target/base+system+user+dev/stale/extract-native.dependencies b/target/base+system+user+dev/stale/extract-native.dependencies index 7cb774c..665c2d5 100644 --- a/target/base+system+user+dev/stale/extract-native.dependencies +++ b/target/base+system+user+dev/stale/extract-native.dependencies @@ -1 +1 @@ -([:dependencies ([cider/cider-nrepl "0.8.1"] [org.clojure/clojure "1.7.0"] [quil/quil "2.4.0"] [clojush/clojush "2.8.0"] [org.clojure/tools.nrepl "0.2.10" :exclusions ([org.clojure/clojure])] [clojure-complete/clojure-complete "0.2.3" :exclusions ([org.clojure/clojure])])]) \ No newline at end of file +([:dependencies ([cider/cider-nrepl "0.9.1"] [org.clojure/clojure "1.7.0"] [quil/quil "2.4.0"] [clojush/clojush "2.8.0"] [org.clojure/tools.nrepl "0.2.6" :exclusions ([org.clojure/clojure]) :scope "test"] [clojure-complete/clojure-complete "0.2.3" :exclusions ([org.clojure/clojure]) :scope "test"])]) \ No newline at end of file diff --git a/target/stale/extract-native.dependencies b/target/stale/extract-native.dependencies index ca3dd98..4aaf4bf 100644 --- a/target/stale/extract-native.dependencies +++ b/target/stale/extract-native.dependencies @@ -1 +1 @@ -([:dependencies ([org.clojure/clojure "1.6.0"] [quil/quil "2.2.2"] [org.clojure/tools.nrepl "0.2.3" :exclusions ([org.clojure/clojure])] [clojure-complete/clojure-complete "0.2.3" :exclusions ([org.clojure/clojure])])]) \ No newline at end of file +([:dependencies ([org.clojure/clojure "1.7.0"] [quil/quil "2.4.0"] [clojush/clojush "2.8.0"] [org.clojure/tools.nrepl "0.2.3" :exclusions ([org.clojure/clojure])] [clojure-complete/clojure-complete "0.2.3" :exclusions ([org.clojure/clojure])])]) \ No newline at end of file