diff --git a/.github/actions/cache-clojure-deps/action.yaml b/.github/actions/cache-clojure-deps/action.yaml index cc269ae..b89d741 100644 --- a/.github/actions/cache-clojure-deps/action.yaml +++ b/.github/actions/cache-clojure-deps/action.yaml @@ -8,7 +8,7 @@ inputs: runs: using: composite steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Cache Clojure deps uses: actions/cache@v4 with: diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml index f9e6d9d..7f8577e 100644 --- a/.github/workflows/checks.yaml +++ b/.github/workflows/checks.yaml @@ -12,9 +12,9 @@ jobs: tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./.github/actions/cache-clojure-deps - - uses: jdx/mise-action@v2 + - uses: jdx/mise-action@v3.2.0 with: install_args: "babashka java clojure" - name: Run tests diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 937248f..3f3afb3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Publish GitHub Release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/deps.edn b/deps.edn index 75142f5..7de4629 100644 --- a/deps.edn +++ b/deps.edn @@ -1,4 +1,4 @@ -{:deps {org.clojure/clojure {:mvn/version "1.12.0"} +{:deps {org.clojure/clojure {:mvn/version "1.12.2"} io.github.seancorfield/deps-new {:git/tag "v0.8.0" :git/sha "2f96530"}} :paths ["src" "resources"] diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/github_workflows_deploy_yaml_kamal/deploy.yaml b/resources/io/github/abogoyavlensky/clojure_stack_lite/github_workflows_deploy_yaml_kamal/deploy.yaml index b5fcdbf..ebb9fd0 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/github_workflows_deploy_yaml_kamal/deploy.yaml +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/github_workflows_deploy_yaml_kamal/deploy.yaml @@ -16,11 +16,11 @@ jobs: timeout-minutes: 20 needs: [ checks ] steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: webfactory/ssh-agent@v0.9.1 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - uses: jdx/mise-action@v2 + - uses: jdx/mise-action@v3.2.0 with: install_args: "babashka" diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/actions/cache-clojure-deps/action.yaml b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/actions/cache-clojure-deps/action.yaml index cc269ae..b89d741 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/actions/cache-clojure-deps/action.yaml +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/actions/cache-clojure-deps/action.yaml @@ -8,7 +8,7 @@ inputs: runs: using: composite steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Cache Clojure deps uses: actions/cache@v4 with: diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/workflows/checks.yaml b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/workflows/checks.yaml index 5895033..c80f91f 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/workflows/checks.yaml +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/.github/workflows/checks.yaml @@ -9,11 +9,11 @@ jobs: lint-fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./.github/actions/cache-clojure-deps with: key-label: 'lint' - - uses: jdx/mise-action@v2 + - uses: jdx/mise-action@v3.2.0 with: install_args: "babashka cljfmt clj-kondo java clojure" - name: Lint and format @@ -22,11 +22,11 @@ jobs: outdated: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./.github/actions/cache-clojure-deps with: key-label: 'outdated' - - uses: jdx/mise-action@v2 + - uses: jdx/mise-action@v3.2.0 with: install_args: "babashka java clojure" - name: Outdated deps @@ -35,11 +35,11 @@ jobs: tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: ./.github/actions/cache-clojure-deps with: key-label: 'tests' - - uses: jdx/mise-action@v2 + - uses: jdx/mise-action@v3.2.0 with: install_args: "babashka java clojure" - name: Run tests diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/deps.edn b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/deps.edn index ba64331..e4e7826 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/deps.edn +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/deps.edn @@ -1,29 +1,29 @@ -{:deps {org.clojure/clojure {:mvn/version "1.12.1"} +{:deps {org.clojure/clojure {:mvn/version "1.12.2"} ; logging org.clojure/tools.logging {:mvn/version "1.3.0"} ch.qos.logback/logback-classic {:mvn/version "1.5.18"} ; system & config - integrant/integrant {:mvn/version "0.13.1"} + integrant/integrant {:mvn/version "1.0.0"} io.github.abogoyavlensky/integrant-extras {:mvn/version "0.1.2"} ; server metosin/reitit-ring {:mvn/version "0.9.1"} metosin/reitit-middleware {:mvn/version "0.9.1"} metosin/reitit-malli {:mvn/version "0.9.1"} - io.github.abogoyavlensky/reitit-extras {:mvn/version "0.2.2"} - ring/ring-jetty-adapter {:mvn/version "1.14.2"} + io.github.abogoyavlensky/reitit-extras {:mvn/version "0.2.3"} + ring/ring-jetty-adapter {:mvn/version "1.15.2"} io.github.abogoyavlensky/manifest-edn {:mvn/version "0.1.1"}{{auth-deps}} ; db hikari-cp/hikari-cp {:mvn/version "3.3.0"} {{db-driver-deps}} - com.github.seancorfield/next.jdbc {:mvn/version "1.3.1048"} - com.github.seancorfield/honeysql {:mvn/version "2.7.1340"} - dev.weavejester/ragtime {:mvn/version "0.11.0"}} + com.github.seancorfield/next.jdbc {:mvn/version "1.3.1070"} + com.github.seancorfield/honeysql {:mvn/version "2.7.1350"} + dev.weavejester/ragtime {:mvn/version "0.12.0"}} :paths ["src" "resources"] :aliases {:dev {:extra-paths ["dev"] - :extra-deps {integrant/repl {:mvn/version "0.4.0"} - ring/ring-devel {:mvn/version "1.14.2"}}} + :extra-deps {integrant/repl {:mvn/version "0.5.0"} + ring/ring-devel {:mvn/version "1.15.2"}}} :test {:extra-paths ["test"] :extra-deps {eftest/eftest {:mvn/version "0.6.0"} diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/resources/config.edn b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/resources/config.edn index 1c6f5de..fb146dd 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/root/resources/config.edn +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/root/resources/config.edn @@ -7,6 +7,8 @@ :test #free-port true} :session-secret-key #profile {:default "test-secret-key" :prod #env SESSION_SECRET_KEY} + :cookie-attrs-secure? #profile {:default false + :prod true} :auto-reload? #profile {:default false :dev true} :cache-assets? #profile {:default false diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/src/server.clj b/resources/io/github/abogoyavlensky/clojure_stack_lite/src/server.clj index 07c1ee5..3b442fa 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/src/server.clj +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/src/server.clj @@ -37,6 +37,7 @@ [:map [:port pos-int?] [:session-secret-key string?] + [:cookie-attrs-secure? boolean?] [:auto-reload? boolean?] [:cache-assets? {:optional true} boolean?] [:cache-control {:optional true} string?]]] @@ -66,7 +67,7 @@ [default-charset/wrap-default-charset "utf-8"] ring-cookies/wrap-cookies [ring-session/wrap-session - {:cookie-attrs {:secure true + {:cookie-attrs {:secure (:cookie-attrs-secure? options) :http-only true} :flash true :store session-store}] diff --git a/resources/io/github/abogoyavlensky/clojure_stack_lite/substitutions/deps_edn_db_driver_deps_postgres.edn b/resources/io/github/abogoyavlensky/clojure_stack_lite/substitutions/deps_edn_db_driver_deps_postgres.edn index 8b5a71d..b318e6c 100644 --- a/resources/io/github/abogoyavlensky/clojure_stack_lite/substitutions/deps_edn_db_driver_deps_postgres.edn +++ b/resources/io/github/abogoyavlensky/clojure_stack_lite/substitutions/deps_edn_db_driver_deps_postgres.edn @@ -1 +1 @@ -org.postgresql/postgresql {:mvn/version "42.7.7"} \ No newline at end of file +org.postgresql/postgresql {:mvn/version "42.7.8"} \ No newline at end of file