Merge pull request #69 from pmonks/dev

pmonks · Sep 16, 2023 · 815a899 · 815a899
2 parents 8124c50 + 041e09f
commit 815a899
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: DeLaGuardo/setup-clojure@11.0
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -11,5 +11,5 @@ jobs:
     container:
       image: uochan/antq
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: java -jar /tmp/antq/antq.jar --skip=pom --error-format="::error file={{file}}::{{message}}"
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,14 +10,14 @@ jobs:
     environment: clojars
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0    # Make sure we get the full history, or else the version number gets screwed up
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: DeLaGuardo/setup-clojure@11.0
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -9,12 +9,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: DeLaGuardo/setup-clojure@11.0
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

diff --git a/.github/workflows/vulnerabilities.yml b/.github/workflows/vulnerabilities.yml
@@ -18,14 +18,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0    # Make sure we get the full history, or else the version number gets screwed up
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: DeLaGuardo/setup-clojure@11.0
+      - uses: DeLaGuardo/setup-clojure@12.1
         with:
           cli: latest
       - uses: actions/cache@v3

diff --git a/deps.edn b/deps.edn
@@ -21,23 +21,24 @@
     org.clojure/tools.deps               {:mvn/version "0.18.1354"}
     org.clojure/data.json                {:mvn/version "2.4.0"}
     slipset/deps-deploy                  {:mvn/version "0.2.1" :exclusions [org.slf4j/slf4j-nop]}
-    io.github.clojure/tools.build        {:mvn/version "0.9.4"}
+    io.github.clojure/tools.build        {:mvn/version "0.9.5"}
     com.github.pmonks/tools-convenience  {:mvn/version "1.0.135"}
     com.github.pmonks/tools-pom          {:mvn/version "1.0.116"}
     com.github.pmonks/tools-licenses     {:mvn/version "1.0.136"}
-    clj-kondo/clj-kondo                  {:mvn/version "2023.07.13"}
+    clj-kondo/clj-kondo                  {:mvn/version "2023.09.07"}
 
     ; Dynamic dependencies - any time any of these changes it MUST ALSO BE CHANGED IN pbr.tasks!!
-    ch.qos.logback/logback-classic       {:mvn/version "1.4.8"}
-    org.slf4j/slf4j-api                  {:mvn/version "2.0.7"}
-    org.slf4j/jcl-over-slf4j             {:mvn/version "2.0.7"}
-    org.slf4j/log4j-over-slf4j           {:mvn/version "2.0.7"}
-    org.slf4j/jul-to-slf4j               {:mvn/version "2.0.7"}
+; Commented out to stop antq from barfing
+;    ch.qos.logback/logback-classic       {:mvn/version "1.3.11"}  ; DO NOT UPGRADE THIS PAST 1.3.x OR pbr WON'T WORK ON JDK 1.8!
+    org.slf4j/slf4j-api                  {:mvn/version "2.0.9"}
+    org.slf4j/jcl-over-slf4j             {:mvn/version "2.0.9"}
+    org.slf4j/log4j-over-slf4j           {:mvn/version "2.0.9"}
+    org.slf4j/jul-to-slf4j               {:mvn/version "2.0.9"}
     jonase/eastwood                      {:mvn/version "1.4.0"}
     codox/codox                          {:mvn/version "0.10.8"}
     com.github.athos/clj-check           {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"}
     io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"
-    com.github.liquidz/antq              {:mvn/version "2.4.1070"}}}
+    com.github.liquidz/antq              {:mvn/version "2.6.1121"}}}
  :aliases
    {:build {:deps       {com.github.pmonks/pbr {:local/root "."}}
             :ns-default pbr.build}}}
diff --git a/src/pbr/tasks.clj b/src/pbr/tasks.clj
@@ -32,11 +32,11 @@
 
 (def ^:private ver-clj-check   {:git/sha "518d5a1cbfcd7c952f548e6dbfcb9a4a5faf9062"})
 (def ^:private ver-test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"})
-(def ^:private ver-logback     {:mvn/version "1.4.8"})
-(def ^:private ver-slf4j       {:mvn/version "2.0.7"})
+(def ^:private ver-logback     {:mvn/version "1.3.11"})  ; DO NOT UPGRADE THIS PAST 1.3.x OR pbr WON'T WORK ON JDK 1.8!
+(def ^:private ver-slf4j       {:mvn/version "2.0.9"})
 (def ^:private ver-eastwood    {:mvn/version "1.4.0"})
 (def ^:private ver-codox       {:mvn/version "0.10.8"})
-(def ^:private ver-antq        {:mvn/version "2.4.1070"})
+(def ^:private ver-antq        {:mvn/version "2.6.1121"})
 
 ; Utility functions