1.4.0 Update workflows, bump dependencies

Author: tonsky

.github/workflows/build-deploy.yml

@@ -7,6 +7,7 @@ on:
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
     paths:
+      - '.github/workflows/**'
       - 'src/**'
       - 'test/**'
       - 'test_projects/**'
@@ -15,23 +16,22 @@ on:
 
 jobs:  
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     env:
       CLOJARS_TOKEN: ${{ secrets.CLOJARS_DEPLOY_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - run: |
-          echo "JAVA_HOME=$JAVA_HOME_11_X64" >> $GITHUB_ENV
-          echo "JAVA8_HOME=$JAVA_HOME_8_X64" >> $GITHUB_ENV
-          echo "$JAVA_HOME_11_X64/bin" >> $GITHUB_PATH
+          echo "JAVA_HOME=$JAVA_HOME_21_X64" >> $GITHUB_ENV
+          echo "$JAVA_HOME_21_X64/bin" >> $GITHUB_PATH
 
       - name: Setup Clojure
-        uses: DeLaGuardo/setup-clojure@10.0
+        uses: DeLaGuardo/setup-clojure@12.5
         with:
-          cli: 1.11.1.1200
+          cli: latest
 
       - run: ./script/test.sh
 
@@ -47,7 +47,7 @@ jobs:
         run: |
           lein deploy clojars
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: jar
-          path: 'target/*.jar'
+          path: 'target/*.jar'

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.4.0 - Aug 6, 2024
+
+- Merge :override-deps from :aliases #49 #53 via @dkick
+
 ### 1.3.0 - Apr 12, 2022
 
 - Fix merging data_readers.cljc with reader conditionals #51

README.md

@@ -38,7 +38,7 @@ with following content:
 uberdeps/deps.edn:
 
 ```clojure
-{:deps {uberdeps/uberdeps {:mvn/version "1.3.0"}}}
+{:deps {uberdeps/uberdeps {:mvn/version "1.4.0"}}}
 ```
 
 uberdeps/package.sh:
@@ -102,7 +102,7 @@ deps.edn:
   ...
   :aliases {
     :uberdeps {
-      :replace-deps {uberdeps/uberdeps {:mvn/version "1.3.0"}}
+      :replace-deps {uberdeps/uberdeps {:mvn/version "1.4.0"}}
       :replace-paths []
       :main-opts ["-m" "uberdeps.uberjar"]
     }
@@ -130,14 +130,14 @@ You can invoke Uberdeps from command line at any time without any prior setup.
 Add to your bash aliases:
 
 ```sh
-clj -Sdeps '{:aliases {:uberjar {:replace-deps {uberdeps/uberdeps {:mvn/version "1.3.0"}} :replace-paths []}}}' -M:uberjar -m uberdeps.uberjar
+clj -Sdeps '{:aliases {:uberjar {:replace-deps {uberdeps/uberdeps {:mvn/version "1.4.0"}} :replace-paths []}}}' -M:uberjar -m uberdeps.uberjar
 ```
 
 Or add to your `~/.clojure/deps.edn`:
 
 ```clojure
 :aliases {
-  :uberjar {:replace-deps {uberdeps/uberdeps {:mvn/version "1.3.0"}}
+  :uberjar {:replace-deps {uberdeps/uberdeps {:mvn/version "1.4.0"}}
             :replace-paths []
             :main-opts ["-m" "uberdeps.uberjar"]}
 }

deps.edn

@@ -1,6 +1,6 @@
 {:deps
- {org.clojure/clojure {:mvn/version "1.11.1"}
-  org.clojure/tools.deps {:mvn/version "0.18.1335"}}
+ {org.clojure/clojure {:mvn/version "1.11.4"}
+  org.clojure/tools.deps {:mvn/version "0.19.1432"}}
 
  :aliases
  {:test {:extra-paths ["test"]}}}