diff --git a/.github/workflows/pr_flow.yml b/.github/workflows/pr_flow.yml index 48a25273..2078bbe5 100644 --- a/.github/workflows/pr_flow.yml +++ b/.github/workflows/pr_flow.yml @@ -27,8 +27,8 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} files: ./target/coverage/codecov.json - #- name: Run Java Tests - # run: lein pom && mvn test --batch-mode --fail-at-end + - name: Run Java Tests + run: clojure -T:pom && mvn test --batch-mode --fail-at-end - name: Unit tests in Clojure run: clojure -M:test - name: Test Report diff --git a/build.clj b/build.clj index 2fdb1499..951282a4 100644 --- a/build.clj +++ b/build.clj @@ -5,7 +5,7 @@ (def jar-content (str build-folder "/classes")) (def basis (b/create-basis {:project "deps.edn"})) -(def version "0.0.1") +(def version "0.5.10-SNAPSHOT") (def app-name "stencil-core") (def uber-file-name (format "%s/%s-%s-standalone.jar" build-folder app-name version)) ; path for result uber file @@ -13,7 +13,6 @@ (b/delete {:path build-folder}) (println (format "Build folder \"%s\" removed" build-folder))) - (defn compile-java [_] (clean nil) (println :should-compile-java-here) @@ -30,7 +29,6 @@ :class-dir jar-content}) (println "jar done?")) - (defn uber [_] (clean nil) diff --git a/deps.edn b/deps.edn index 768c9a06..56acdcde 100644 --- a/deps.edn +++ b/deps.edn @@ -2,12 +2,9 @@ org.clojure/data.xml {:mvn/version "0.2.0-alpha8"} org.slf4j/slf4j-api {:mvn/version "2.0.9"}} :paths ["src" "target/classes"] - :deps/prep-lib - {:ensure "target/classes" - :alias :build - :fn compile-java} :aliases - {:build {:deps {io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}} + {:build {:deps {org.clojure/clojure {:mvn/version "1.12.0-beta1"} + io.github.clojure/tools.build {:git/tag "v0.8.1" :git/sha "7d40500"}} :ns-default build} :lint/clj-kondo diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..41046772 --- /dev/null +++ b/pom.xml @@ -0,0 +1,94 @@ + + + 4.0.0 + io.github.erdos + stencil-core + jar + stencil-core + Templating engine for office documents. + https://github.com/erdos/stencil + + + Eclipse Public License - v 2.0 + https://www.eclipse.org/legal/epl-2.0/ + + + + src + java-test + + + resources + + + + + test-resources + + + resources + + + target + target/classes + + + org.apache.maven.plugins + maven-surefire-plugin + 2.20 + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + add-source + generate-sources + + add-source + + + + java-src + + + + + add-test-source + generate-test-sources + + add-test-source + + + + test + + + + + + + + + + clojars + https://repo.clojars.org/ + + + + + + + + junit + junit + 4.13.2 + test + + + + 8 + 8 + + diff --git a/project.clj b/project.clj deleted file mode 100644 index adef04e5..00000000 --- a/project.clj +++ /dev/null @@ -1,48 +0,0 @@ -(defproject io.github.erdos/stencil-core "0.5.10-SNAPSHOT" - :url "https://github.com/erdos/stencil" - :description "Templating engine for office documents." - :license {:name "Eclipse Public License - v 2.0" - :url "https://www.eclipse.org/legal/epl-2.0/"} - :min-lein-version "2.0.0" - :java-source-paths ["java-src"] - :javac-options ["-target" "8" "-source" "8"] - :dependencies [[org.clojure/clojure "1.11.1"] - [org.clojure/data.xml "0.2.0-alpha8"] - [org.slf4j/slf4j-api "2.0.9"]] - :pom-addition ([:properties ["maven.compiler.source" "8"] ["maven.compiler.target" "8"]]) - :pom-plugins [[org.apache.maven.plugins/maven-surefire-plugin "2.20"]] - :main io.github.erdos.stencil.Main - :aliases {"coverage" ["with-profile" "+ci" "cloverage" "--codecov" - "--exclude-call" "clojure.core/assert" - "--exclude-call" "stencil.util/trace" - "--exclude-call" "stencil.util/fail" - "--exclude-call" "clojure.spec.alpha/def"]} - :javadoc-opts {:package-names ["stencil"] - :additional-args ["-overview" "java-src/overview.html" - "-top" ""]} - :repl-options {:init-ns stencil.api} - :jar-exclusions [#".*\.xml"] - :repositories [["snapshots" {:url "https://clojars.org/repo" - :username :env/clojars_user - :password :env/clojars_pass - :sign-releases false}]] - :filespecs [{:type :bytes, :path "stencil-version", :bytes ~(-> "project.clj" slurp read-string nnext first)}] - :profiles {:uberjar {:aot :all} - :dev {:aot :all - :injections [(require 'stencil.spec) - (require '[clojure.spec.alpha :as s])] - :dependencies [[org.slf4j/slf4j-simple "1.7.32"]] - :jvm-opts ["-Dorg.slf4j.simpleLogger.defaultLogLevel=debug"]} - :test {:aot :all - :dependencies [[junit/junit "4.13.2"] - [org.xmlunit/xmlunit-core "2.5.1"] - [hiccup "1.0.5"]] - :plugins [[lein-test-report-junit-xml "0.2.0"]] - :resource-paths ["test-resources"] - :test-paths ["java-test"] - :injections [(require 'stencil.spec) - (require '[clojure.spec.test.alpha :as sta]) - (eval '(sta/instrument))]} - :ci {:plugins [[lein-javadoc "0.3.0"] - [lein-cloverage "1.2.2"]] - }})