diff --git a/.github/workflows/clojure.yml b/.github/workflows/clojure.yml index 39a3d4b..1386906 100644 --- a/.github/workflows/clojure.yml +++ b/.github/workflows/clojure.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: git submodule run: git submodule init && git submodule update - name: install dependencies - run: lein deps + run: bin/lein deps - name: run tests - run: lein test + run: bin/lein test diff --git a/.gitmodules b/.gitmodules index 0664a73..af5702b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "vendors/mmj2"] path = vendors/mmj2 url = https://github.com/digama0/mmj2.git -[submodule "vendors/JSON-java/org/json"] - path = vendors/JSON-java/org/json - url = https://github.com/digama0/JSON-java.git diff --git a/project.clj b/project.clj index bbe9ab9..9344b22 100644 --- a/project.clj +++ b/project.clj @@ -2,19 +2,20 @@ :description "metamath toolkit on top of mmj2" :url "https://github.com/mountain/mmtk" :license {:name "GPL-2.0"} - :dependencies [[org.openjdk.nashorn/nashorn-core "15.3"] - [org.clojure/clojure "1.10.3"] - [clj-commons/clj-yaml "0.7.107"] - [cli-matic "0.4.3"] - [clj-http "3.12.3"] - [hbs "1.0.3"] - [http-kit "2.5.3"] - [compojure "1.6.2"] - [ring/ring-core "1.9.5"] - [org.clojure/tools.logging "1.2.4"] - [org.slf4j/slf4j-nop "1.7.36"]] + :dependencies [[org.openjdk.nashorn/nashorn-core "15.7"] + [org.clojure/clojure "1.12.5"] + [org.json/json "20260719"] + [clj-commons/clj-yaml "1.0.29"] + [cli-matic "0.5.4"] + [clj-http "3.13.1"] + [hbs "1.1.0"] + [http-kit "2.8.1"] + [compojure "1.7.2"] + [ring/ring-core "1.15.5"] + [org.clojure/tools.logging "1.3.1"] + [org.slf4j/slf4j-nop "2.0.18"]] :source-paths ["src/main/clojure"] - :java-source-paths ["src/main/java" "vendors/mmj2/src" "vendors/JSON-java/"] + :java-source-paths ["src/main/java" "vendors/mmj2/src/main/java"] :resource-paths ["src/main/resources"] :test-paths ["src/tests/java/" "src/tests/clojure/"] diff --git a/vendors/JSON-java/org/json b/vendors/JSON-java/org/json deleted file mode 160000 index edfb0c5..0000000 --- a/vendors/JSON-java/org/json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit edfb0c57d5619bc7444364451a6d6201457136e7 diff --git a/vendors/mmj2 b/vendors/mmj2 index 8f49fb2..c8dd055 160000 --- a/vendors/mmj2 +++ b/vendors/mmj2 @@ -1 +1 @@ -Subproject commit 8f49fb2c93531c5c75fcb65886837c8d0617c033 +Subproject commit c8dd05548139c7003220caedde65a7abe44a00bf