Skip to content

Commit 0c2e7f7

Browse files
committed
Fix for native image
1 parent aecb891 commit 0c2e7f7

File tree

7 files changed

+11
-9
lines changed

7 files changed

+11
-9
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
paths-ignore:
88
- '**/README.md'
99
- '**/CHANGELOG.md'
10-
- 'resources/lib/STUB_VERSION'
10+
- 'resources/STUB_VERSION'
1111
- 'docs/**'
1212
pull_request:
1313

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. This change
33

44
## Unreleased
55

6+
- Fix resources not being included for native image
7+
68
## 0.2.2
79

810
- Upload both standalone and normal jar

build.clj

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
(defn uber [opts]
3030
(clean nil)
3131
(let [default-aliases [:cli]]
32-
(b/copy-dir {:src-dirs ["src/lib" "src/cli" "resources/cli"]
32+
(b/copy-dir {:src-dirs ["src/lib" "src/cli" "resources"]
3333
:target-dir class-dir})
3434
(b/compile-clj {:basis (b/create-basis (update basis :aliases concat default-aliases (:extra-aliases opts)))
3535
:src-dirs ["src/lib" "src/cli"]
@@ -77,10 +77,10 @@
7777
(replace-in-file "CHANGELOG.md"
7878
#"## Unreleased"
7979
(format "## Unreleased\n\n## %s" (name version)))
80-
(replace-in-file "resources/lib/STUB_VERSION"
80+
(replace-in-file "resources/STUB_VERSION"
8181
current-version
8282
version)
83-
(b/process {:command-args ["git" "add" "pom.xml" "CHANGELOG.md" "resources/lib/STUB_VERSION"]})
83+
(b/process {:command-args ["git" "add" "pom.xml" "CHANGELOG.md" "resources/STUB_VERSION"]})
8484
(b/process {:command-args ["git" "commit" "-m" (str "\"Release: " version "\"")]})
8585
(b/process {:command-args ["git" "tag" (str "v" version)]})
8686
(b/process {:command-args ["git" "push" "origin" "HEAD"]})

deps.edn

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
{:paths ["src/lib" "resources/lib"]
1+
{:paths ["src/lib" "resources"]
22
:deps {org.clojure/clojure {:mvn/version "1.10.3"}}
33
:aliases
4-
{:dev {:extra-paths ["src/cli" "resources/cli"]}
4+
{:dev {:extra-paths ["src/cli"]}
55
:run
66
{:main-opts ["-m" "clj-easy.stub.main"]}
77

88
:test
9-
{:extra-paths ["test" "src/cli" "resources/cli"]
9+
{:extra-paths ["test" "src/cli"]
1010
:extra-deps {io.github.cognitect-labs/test-runner
1111
{:git/tag "v0.5.0" :git/sha "b3fd0d2"}}
1212
:main-opts ["-m" "cognitect.test-runner"]
1313
:exec-fn cognitect.test-runner.api/test}
1414

1515
:build
16-
{:extra-paths ["resources/lib"]
16+
{:extra-paths ["resources"]
1717
:deps {io.github.clojure/tools.build {:tag "v0.5.1" :sha "21da7d4"}
1818
slipset/deps-deploy {:mvn/version "0.2.0"}}
1919
:ns-default build}
@@ -23,7 +23,7 @@
2323
:main-opts ["-m" "clojure-lsp.main"]}
2424

2525
:cli
26-
{:extra-paths ["src/cli" "resources/cli"]
26+
{:extra-paths ["src/cli"]
2727
:extra-deps {org.clojure/tools.cli {:mvn/version "1.0.206"}}}
2828

2929
:native
File renamed without changes.

0 commit comments

Comments
 (0)