diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 1c46de3..0123cca 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -10,7 +10,14 @@ jobs: - name: Setup GraalVM environment uses: DeLaGuardo/setup-graalvm@master with: - graalvm-version: "20.3.0.java8" + graalvm-version: "22.1.0.java17" + - uses: actions/cache@v3 + id: maven-cache # use this to check for `cache-hit` (`steps.yarn-and-maven-cache.outputs.cache-hit != 'true'`) + with: + path: ~/.m2/ + key: ${{ runner.os }}-maven-${{ hashFiles('./deps.edn') }} + restore-keys: | + ${{ runner.os }}-maven- - name: Install native image run: gu install native-image - name: Setup Clojure @@ -19,9 +26,7 @@ jobs: lein: latest - name: Install joker run: | - wget -q https://github.com/candid82/joker/releases/download/v0.15.7/joker-0.15.7-mac-amd64.zip - mkdir -p /usr/local/opt/joker/bin/ - unzip joker-0.15.7-mac-amd64.zip -d /usr/local/opt/joker/bin/ + brew install candid82/brew/joker - name: Checkout Code uses: actions/checkout@v3.0.1 - name: Install dependencies diff --git a/.gitignore b/.gitignore index 4c5e2bb..1ad1277 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ pom.xml.asc *~ /.lsp/ /.clj-kondo/.cache/ +/.cpcache/ +/karabiner-configurator-0.1.0-standalone.build_artifacts.txt diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..8c54b67 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +java graalvm-22.1.0+java17 diff --git a/CHANGELOG.org b/CHANGELOG.org index f710723..f05b1d6 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -3,7 +3,14 @@ All notable changes to this project will be documented in this file. This change ** Unreleased -[Unreleased Commits]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.2...HEAD +[Unreleased Commits]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.3...HEAD + +** 0.5.3 - 2022-05-16 + +*** Added +- Use graalvm-22.1.0+java17 and clojure 1.11.1. This enables user to build arm binary on their own (#172) + +[commits in 0.5.3]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.2...v0.5.3 ** 0.5.2 - 2022-04-25 diff --git a/Makefile.local.example b/Makefile.local.example index e91a30b..eae6f49 100644 --- a/Makefile.local.example +++ b/Makefile.local.example @@ -3,7 +3,7 @@ MAKE=make -f Makefile.local # change below path to graalvm native-image binary file GRAALVM=/path/to/graalvm-ce-xxxxx-xxx/Contents/Home/bin/native-image -GRAALVM_ARG=-H:+ReportUnsupportedElementsAtRuntime --no-server +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 JAR_NAME=karabiner-configurator-0.1.0-standalone TARGET_JAR=target/$(JAR_NAME).jar all: @@ -23,4 +23,4 @@ bin: test-binary: # mkdir -p ~/.config/ # cp ./resources/configurations/yqrashawn.edn ~/.config/karabiner.edn - ./goku \ No newline at end of file + ./goku diff --git a/deps.edn b/deps.edn new file mode 100644 index 0000000..3e57730 --- /dev/null +++ b/deps.edn @@ -0,0 +1,6 @@ +{:deps {org.clojure/clojure {:mvn/version "1.11.1"} + org.clojure/tools.cli {:mvn/version "1.0.206"} + me.raynes/fs {:mvn/version "1.4.6"} + cheshire/cheshire {:mvn/version "5.10.2"} + environ/environ {:mvn/version "1.2.0"} + com.github.clj-easy/graal-build-time {:mvn/version "0.1.4"}}} diff --git a/project.clj b/project.clj index bbf86ad..10a0ce3 100644 --- a/project.clj +++ b/project.clj @@ -2,17 +2,18 @@ :description "karabiner configuration manager" :url "http://https://github.com/yqrashawn/GokuRakuJoudo" :license {:name "GNU General Public License v3.0" - :url "http://www.eclipse.org/legal/epl-v10.html"} + :url "http://www.eclipse.org/legal/epl-v10.html"} :main karabiner-configurator.core :aot :all - :dependencies [[org.clojure/clojure "1.10.1"] + :dependencies [[org.clojure/clojure "1.11.1"] [org.clojure/tools.cli "1.0.206"] [me.raynes/fs "1.4.6"] [cheshire "5.10.2"] - [environ "1.2.0"]] + [environ "1.2.0"] + [com.github.clj-easy/graal-build-time "0.1.4"]] :plugins [[lein-cloverage "1.2.3"] [lein-environ "1.2.0"]] - :profiles {:dev {:env {:is-dev true}} + :profiles {:dev {:env {:is-dev true}} :test {:env {:is-dev true}}}) diff --git a/src/karabiner_configurator/core.clj b/src/karabiner_configurator/core.clj index 94a4db9..8a4188d 100644 --- a/src/karabiner_configurator/core.clj +++ b/src/karabiner_configurator/core.clj @@ -211,7 +211,7 @@ (:version options) {:action "exit-with-message" :ok? true - :exit-message "0.5.2"} + :exit-message "0.5.3"} ;; log (:log options) {:action "log"