Skip to content

Commit

Permalink
Fixes for Clojure 1.10 + Linux (#9)
Browse files Browse the repository at this point in the history
* fix: linux systems clojure install path

Fix an error where the default clojure executable used by
lein-tools-deps looks in `/usr/local/bin` - a path commonly used by
macOS's homebrew. We keep that default path, but also add the default
used by many linux package mangers (`/usr/bin`).

* fix: remove non-conforming import for clojure 1.10

This commit removes an unnecessary import that doesn't conform to
clojure 1.10's `ns` specs. This was blocking this library from being
used in clojure projects using 1.10.
  • Loading branch information
rschmukler authored and cnuernber committed Mar 2, 2019
1 parent c035c93 commit 386b011
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 3 additions & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
:url "http://www.eclipse.org/legal/epl-v10.html"}
:plugins [[lein-tools-deps "0.4.1"]]
:middleware [lein-tools-deps.plugin/resolve-dependencies-with-deps-edn]
:lein-tools-deps/config {:config-files [:install :user :project]}
:lein-tools-deps/config {:config-files [:install :user :project]
:clojure-executables ["/usr/local/bin/clojure"
"/usr/bin/clojure"]}
:java-source-paths ["java"]
:profiles {:dev {:dependencies [[com.github.fommil.netlib/all "1.1.2" :extension "pom"]]}})
3 changes: 1 addition & 2 deletions src/tech/compute/cpu/typed_pointer.clj
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
[tech.compute.registry :as registry]
[tech.datatype.javacpp :as jcpp-dtype])
(:import [tech.datatype.jna TypedPointer]
[com.sun.jna Pointer]
[org.bytedeco.javacpp.Pointer]))
[com.sun.jna Pointer]))



Expand Down

0 comments on commit 386b011

Please sign in to comment.