Skip to content

Commit e4fd4ec

Browse files
committed
feat: use new graalvm
1 parent ae5dd6f commit e4fd4ec

File tree

8 files changed

+34
-12
lines changed

8 files changed

+34
-12
lines changed

.github/workflows/build-and-release.yaml

+9-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@ jobs:
1010
- name: Setup GraalVM environment
1111
uses: DeLaGuardo/setup-graalvm@master
1212
with:
13-
graalvm-version: "20.3.0.java8"
13+
graalvm-version: "22.1.0.java17"
14+
- uses: actions/cache@v3
15+
id: maven-cache # use this to check for `cache-hit` (`steps.yarn-and-maven-cache.outputs.cache-hit != 'true'`)
16+
with:
17+
path: ~/.m2/
18+
key: ${{ runner.os }}-maven-${{ hashFiles('./deps.edn') }}
19+
restore-keys: |
20+
${{ runner.os }}-maven-
1421
- name: Install native image
1522
run: gu install native-image
1623
- name: Setup Clojure
@@ -19,9 +26,7 @@ jobs:
1926
lein: latest
2027
- name: Install joker
2128
run: |
22-
wget -q https://github.com/candid82/joker/releases/download/v0.15.7/joker-0.15.7-mac-amd64.zip
23-
mkdir -p /usr/local/opt/joker/bin/
24-
unzip joker-0.15.7-mac-amd64.zip -d /usr/local/opt/joker/bin/
29+
brew install candid82/brew/joker
2530
- name: Checkout Code
2631
uses: actions/[email protected]
2732
- name: Install dependencies

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ pom.xml.asc
1818
*~
1919
/.lsp/
2020
/.clj-kondo/.cache/
21+
/.cpcache/
22+
/karabiner-configurator-0.1.0-standalone.build_artifacts.txt

.tool-versions

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
java graalvm-22.1.0+java17

CHANGELOG.org

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

44
** Unreleased
55

6-
[Unreleased Commits]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.2...HEAD
6+
[Unreleased Commits]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.3...HEAD
7+
8+
** 0.5.3 - 2022-05-16
9+
10+
*** Added
11+
- Use graalvm-22.1.0+java17 and clojure 1.11.1. This enables user to build arm binary on their own (#172)
12+
13+
[commits in 0.5.3]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.2...v0.5.3
714

815
** 0.5.2 - 2022-04-25
916

Makefile.local.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
MAKE=make -f Makefile.local
44
# change below path to graalvm native-image binary file
55
GRAALVM=/path/to/graalvm-ce-xxxxx-xxx/Contents/Home/bin/native-image
6-
GRAALVM_ARG=-H:+ReportUnsupportedElementsAtRuntime --no-server
6+
GRAALVM_ARG=-H:+ReportUnsupportedElementsAtRuntime --no-server -J-Dclojure.compiler.elide-meta=[:doc :file :line :added] -J-Dclojure.spec.skip-macros=true -Djdk.internal.lambda.eagerlyInitialize=false
77
JAR_NAME=karabiner-configurator-0.1.0-standalone
88
TARGET_JAR=target/$(JAR_NAME).jar
99
all:
@@ -23,4 +23,4 @@ bin:
2323
test-binary:
2424
# mkdir -p ~/.config/
2525
# cp ./resources/configurations/yqrashawn.edn ~/.config/karabiner.edn
26-
./goku
26+
./goku

deps.edn

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{:deps {org.clojure/clojure {:mvn/version "1.11.1"}
2+
org.clojure/tools.cli {:mvn/version "1.0.206"}
3+
me.raynes/fs {:mvn/version "1.4.6"}
4+
cheshire/cheshire {:mvn/version "5.10.2"}
5+
environ/environ {:mvn/version "1.2.0"}
6+
com.github.clj-easy/graal-build-time {:mvn/version "0.1.4"}}}

project.clj

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
:description "karabiner configuration manager"
33
:url "http://https://github.com/yqrashawn/GokuRakuJoudo"
44
:license {:name "GNU General Public License v3.0"
5-
:url "http://www.eclipse.org/legal/epl-v10.html"}
5+
:url "http://www.eclipse.org/legal/epl-v10.html"}
66
:main karabiner-configurator.core
77
:aot :all
8-
:dependencies [[org.clojure/clojure "1.10.1"]
8+
:dependencies [[org.clojure/clojure "1.11.1"]
99
[org.clojure/tools.cli "1.0.206"]
1010
[me.raynes/fs "1.4.6"]
1111
[cheshire "5.10.2"]
12-
[environ "1.2.0"]]
12+
[environ "1.2.0"]
13+
[com.github.clj-easy/graal-build-time "0.1.4"]]
1314
:plugins [[lein-cloverage "1.2.3"]
1415
[lein-environ "1.2.0"]]
15-
:profiles {:dev {:env {:is-dev true}}
16+
:profiles {:dev {:env {:is-dev true}}
1617
:test {:env {:is-dev true}}})
1718

1819

src/karabiner_configurator/core.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
(:version options)
212212
{:action "exit-with-message"
213213
:ok? true
214-
:exit-message "0.5.2"}
214+
:exit-message "0.5.3"}
215215
;; log
216216
(:log options)
217217
{:action "log"

0 commit comments

Comments
 (0)