Skip to content

Commit

Permalink
[nop] Update project template
Browse files Browse the repository at this point in the history
  • Loading branch information
ptaoussanis committed Mar 19, 2024
1 parent 3f931fc commit a9ff895
Show file tree
Hide file tree
Showing 8 changed files with 63 additions and 41 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/graal-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ jobs:

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: graalvm/setup-graalvm@v1
with:
version: 'latest'
java-version: ${{ matrix.java }}
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}

- uses: DeLaGuardo/setup-clojure@10.0
- uses: DeLaGuardo/setup-clojure@12.5
with:
lein: latest
bb: latest

- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: deps-${{ hashFiles('deps.edn') }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ jobs:

runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: 'corretto'
java-version: ${{ matrix.java }}

- uses: DeLaGuardo/setup-clojure@10.0
- uses: DeLaGuardo/setup-clojure@12.5
with:
lein: latest

- uses: actions/cache@v3
- uses: actions/cache@v4
id: cache-deps
with:
path: ~/.m2/repository
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Sente

### Realtime web comms for Clojure/Script applications
### Realtime web comms library for Clojure/Script

**Sente** is a small client+server library that makes it easy to build **realtime web applications** with Clojure + ClojureScript.

Expand All @@ -15,7 +15,7 @@ Loosely inspired by [Socket.IO](https://socket.io/), it uses **core.async**, **W
## Latest release/s

- `2023-08-30` `1.19.2`: [changes](../../releases/tag/v1.19.2)
- `2023-08-30` `1.19.2`: [release info](../../releases/tag/v1.19.2)

[![Main tests][Main tests SVG]][Main tests URL]
[![Graal tests][Graal tests SVG]][Graal tests URL]
Expand Down Expand Up @@ -46,16 +46,16 @@ So you can ignore the underlying protocol and deal directly with Sente's unified

## Documentation

- [Full documentation][GitHub wiki] (**getting started** and more)
- Auto-generated API reference: [Codox][Codox docs], [clj-doc][clj-doc docs]
- [Wiki][GitHub wiki] (getting started, usage, etc.)
- API reference: [Codox][Codox docs], [clj-doc][clj-doc docs]

## Funding

You can [help support][sponsor] continued work on this project, thank you!! 🙏

## License

Copyright © 2012-2023 [Peter Taoussanis][].
Copyright © 2012-2024 [Peter Taoussanis][].
Licensed under [EPL 1.0](LICENSE.txt) (same as Clojure).

<!-- Common -->
Expand Down
13 changes: 13 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Security policy

## Advisories

All security advisories will be posted [on GitHub](https://github.com/taoensso/sente/security/advisories).

## Reporting a vulnerability

Please report possible security vulnerabilities [via GitHub](https://github.com/taoensso/sente/security/advisories), or by emailing me at `my first name at taoensso.com`. You may encrypt emails with [my public PGP/GPG key](https://www.taoensso.com/pgp).

Thank you!

\- [Peter Taoussanis](https://www.taoensso.com)
4 changes: 3 additions & 1 deletion bb/graal_tests.clj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@
(let [graalvm-home (System/getenv "GRAALVM_HOME")
bin-dir (str (fs/file graalvm-home "bin"))]
(shell (executable bin-dir "gu") "install" "native-image")
(shell (executable bin-dir "native-image") "-jar" "target/graal-tests.jar" "--no-fallback" "graal_tests")))
(shell (executable bin-dir "native-image")
"--features=clj_easy.graal_build_time.InitClojureClasses"
"--no-fallback" "-jar" "target/graal-tests.jar" "graal_tests")))

(defn run-tests []
(let [{:keys [out]} (shell {:out :string} (executable "." "graal_tests"))]
Expand Down
55 changes: 28 additions & 27 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(defproject com.taoensso/sente "1.19.2"
:author "Peter Taoussanis <https://www.taoensso.com>"
:description "Realtime web comms for Clojure/Script applications"
:description "Realtime web comms library for Clojure/Script"
:url "https://github.com/taoensso/sente"

:license
Expand All @@ -14,19 +14,31 @@
[org.clojure/tools.reader "1.3.6"]
[com.taoensso/timbre "6.2.2"]]

:test-paths ["test" #_"src"]

:profiles
{;; :default [:base :system :user :provided :dev]
:provided {:dependencies [[org.clojure/clojurescript "1.11.60"]
[org.clojure/clojure "1.11.1"]]}
:c1.12 {:dependencies [[org.clojure/clojure "1.12.0-alpha9"]]}
:c1.11 {:dependencies [[org.clojure/clojure "1.11.1"]]}
:c1.10 {:dependencies [[org.clojure/clojure "1.10.2"]]}

:graal-tests
{:source-paths ["test"]
:main taoensso.graal-tests
:aot [taoensso.graal-tests]
:uberjar-name "graal-tests.jar"
:dependencies
[[org.clojure/clojure "1.11.1"]
[com.github.clj-easy/graal-build-time "1.0.5"]]}

:community
{:dependencies
[[org.immutant/web "2.1.10"]
[nginx-clojure "0.6.0"]
[aleph "0.6.3"]
[macchiato/core "0.2.23"] ; Note 0.2.24 seems to fail?
[macchiato/core "0.2.23"] ; 0.2.24 seems to fail?
[luminus/ring-undertow-adapter "1.3.1"]
[info.sunng/ring-jetty9-adapter "0.22.0"]]

Expand All @@ -37,8 +49,9 @@
"--add-opens=java.base/sun.nio.cs=ALL-UNNAMED"
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED"]}

:test
{:jvm-opts ["-Dtaoensso.elide-deprecated=true"]
:dev [:dev+ :community]
:dev+
{:jvm-opts ["-server" "-Dtaoensso.elide-deprecated=true"]
:global-vars
{*warn-on-reflection* true
*assert* true
Expand All @@ -48,29 +61,17 @@
[[com.cognitect/transit-clj "1.0.333"]
[com.cognitect/transit-cljs "0.8.280"]
[org.clojure/test.check "1.1.1"]
[http-kit "2.7.0"]]}
[http-kit "2.7.0"]]

:graal-tests
{:dependencies [[org.clojure/clojure "1.11.1"]
[com.github.clj-easy/graal-build-time "0.1.4"]]
:main taoensso.graal-tests
:aot [taoensso.graal-tests]
:uberjar-name "graal-tests.jar"}
:plugins
[[lein-pprint "1.3.2"]
[lein-ancient "0.7.0"]
[lein-cljsbuild "1.1.8"]
[com.taoensso.forks/lein-codox "0.10.10"]]

:dev
[:c1.11 :community :test
{:jvm-opts ["-server"]
:plugins
[[lein-pprint "1.3.2"]
[lein-ancient "0.7.0"]
[lein-cljsbuild "1.1.8"]
[com.taoensso.forks/lein-codox "0.10.10"]]

:codox
{:language #{:clojure :clojurescript}
:base-language :clojure}}]}

:test-paths ["test" #_"src"]
:codox
{:language #{:clojure :clojurescript}
:base-language :clojure}}}

:cljsbuild
{:test-commands {"node" ["node" "target/test.js"]}
Expand All @@ -93,6 +94,6 @@
"build-once" ["do" ["clean"] ["cljsbuild" "once"]]
"deploy-lib" ["do" ["build-once"] ["deploy" "clojars"] ["install"]]

"test-clj" ["with-profile" "+c1.11:+c1.10:+c1.9" "test"]
"test-cljs" ["with-profile" "+test" "cljsbuild" "test"]
"test-clj" ["with-profile" "+c1.12:+c1.11:+c1.10" "test"]
"test-cljs" ["with-profile" "+c1.12" "cljsbuild" "test"]
"test-all" ["do" ["clean"] ["test-clj"] ["test-cljs"]]})
6 changes: 6 additions & 0 deletions test/taoensso/sente_tests.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,10 @@

;;;;

#?(:cljs
(defmethod test/report [:cljs.test/default :end-run-tests] [m]
(when-not (test/successful? m)
;; Trigger non-zero `lein test-cljs` exit code for CI
(throw (ex-info "ClojureScript tests failed" {})))))

#?(:cljs (test/run-tests))
2 changes: 1 addition & 1 deletion wiki/Home.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
See the menu to the right for content 👉
See the **menu to the right** for content 👉

# Contributions welcome

Expand Down

0 comments on commit a9ff895

Please sign in to comment.