Skip to content

Commit

Permalink
7.3.0 (#429)
Browse files Browse the repository at this point in the history
* deps bumped
* pom.xml, updated to satisfy dependabot
* adds support for Cataclysm classic (#427)
* adds specs_test.clj to test logic in specs.clj
* addon, catalogue, moved the game track 'priority map' into constants.clj
* priority map now has a proper strategy
* README, added explanation of new priority order when cata added to mix
* updated README, TODO, CHANGELOG
  • Loading branch information
torkus committed Apr 23, 2024
1 parent 8250e34 commit 3201ad1
Show file tree
Hide file tree
Showing 20 changed files with 177 additions and 97 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file. This change
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 7.3.0 - 2024-04-23

### Added

* added support for Cataclysm Classic.

### Changed

* dependencies bumped to latest versions.
* game track priority when 'strict' is off now has a proper and consistent strategy.

### Fixed

* bumps Clojure from 1.10 to 1.11.2 to fix CVE-2024-22871
- https://github.com/advisories/GHSA-vr64-r9qj-h27f
* an Arch Linux AUR bug introduced with pacman 6.1 that stripped the binary down to nothing.
- thanks to @nickromanooo for reporting the bug and tracking down the pacman issue.

## 7.2.0 - 2023-12-24

### Added
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ I also maintain a list of [other addon managers](https://ogri-la.github.io/wow-a

Strongbox is available as a standalone [AppImage](https://appimage.org) binary from the [releases](https://github.com/ogri-la/strongbox/releases/) page.

chmod +x strongbox
./strongbox
chmod +x strongbox-x.x.x-x86_64.AppImage
./strongbox-x.x.x-x86_64.AppImage

### Arch Linux and the AUR

Expand Down Expand Up @@ -187,10 +187,11 @@ This will restrict the types of addons that can be installed in the current addo
The `Strict` checkbox allows you to enforce or relax restrictions and mix together addons meant for different systems in
the same addon directory. If an addon is available for multiple addon systems it will prefer one over another:

* `retail` will prefer `retail` addons, then `classic`, then `classic (TBC)` then `classic (WotLK)`
* `classic` will prefer `classic` addons, then `classic (TBC)` then `classic (WotLK)` then `retail`
* `classic (TBC)` will prefer `classic (TBC)` addons, then `classic (WotLK)` then `classic` then `retail`
* `classic (WotLK)` will prefer `classic (WotLK)` addons, then `classic (TBC)` then `classic` then `retail`
* `retail` will prefer `retail` addons, then `classic`, then `classic (TBC)` then `classic (WotLK)` then `classic (Cata)`
* `classic` will prefer `classic` addons, then `classic (TBC)`, then `classic (WotLK)`, then `classic (Cata)` then `retail`
* `classic (TBC)` will prefer `classic (TBC)` addons, then `classic (WotLK)`, then `classic (Cata)`, then `classic` then `retail`
* `classic (WotLK)` will prefer `classic (WotLK)` addons, then `classic (Cata)`, then `classic (TBC)`, then `classic` then `retail`
* `classic (Cata)` will prefer `classic (Cata)` addons, then `classic (WotLK)`, then `classic (TBC)`, then `classic` then `retail`

If uncertain which addon system an installed addon supports, look at the `WoW` column value on the `installed` tab and
compare it to the `Version` value in the list of WoW [public client builds](https://wowpedia.fandom.com/wiki/Public_client_builds).
Expand Down
25 changes: 8 additions & 17 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,24 @@ see CHANGELOG.md for a more formal list of changes by release

## done

* move Dockerfile* files into a CircleCI folder
* rename `strongbox` release to `strongbox.AppImage`
- re-submit
- update release scripts
- done
- https://appimage.github.io/strongbox/

* toc, what is the usage of 'x-github'. we're expecting a url but a foo/bar seems fine as well
- check the github catalogue
- I'm seeing more usage of 'x-website'
* update release script
- update references from 'strongbox' to 'strongbox.AppImage'
- done

* *.sh, consolidate these root-level bash scripts into a manage.sh
* cataclysm classic support
- done

## todo

## todo bucket (no particular order)

* cataclysm classic support
* gui, 'set-icon' is taking a long time to do it's thing.

* nfo, replace the URL as the group-id with something random

Expand All @@ -33,13 +35,6 @@ see CHANGELOG.md for a more formal list of changes by release

* no errors displayed when installing from addon detail page

* rename `strongbox` release to `strongbox.AppImage`
- re-submit
- update release scripts

* update release script
- update references from 'strongbox' to 'strongbox.AppImage'

* generate a `.flatpakref` file as an asset for release.
- https://docs.flatpak.org/en/latest/repositories.html#flatpakref-files

Expand Down Expand Up @@ -80,9 +75,6 @@ see CHANGELOG.md for a more formal list of changes by release
- user can opt to install alpha/beta releases per-addon
- make it a simple preference

* gui, 'set-icon' is taking a long time to do it's thing.


* manually select the primary addon in a group of addons to prevent synthetic titles

* http, add with-backoff support to download-file
Expand Down Expand Up @@ -208,7 +200,6 @@ see CHANGELOG.md for a more formal list of changes by release
* preference for 'fat rows'
- increase the padding for each row a bit


* "developer warnings"
- a preference that bumps certain debug messages to warnings and errors for developers
- like if a release.json is missing assets
Expand Down
46 changes: 23 additions & 23 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>ogri-la</groupId>
<artifactId>strongbox</artifactId>
<packaging>jar</packaging>
<version>7.2.0</version>
<version>7.3.0</version>
<name>strongbox</name>
<description>World Of Warcraft Addon Manager</description>
<url>https://github.com/ogri-la/strongbox</url>
Expand All @@ -18,7 +18,7 @@
<url>https://github.com/ogri-la/strongbox</url>
<connection>scm:git:git://github.com/ogri-la/strongbox.git</connection>
<developerConnection>scm:git:ssh://[email protected]/ogri-la/strongbox.git</developerConnection>
<tag>b576cac556bd51217f1d0f1e5499c1a18a6c25e3</tag>
<tag>86204296a94b4e5b4621bd143daa693f1f4934de</tag>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
Expand Down Expand Up @@ -78,22 +78,22 @@
<dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
<version>1.10.3</version>
<version>1.11.2</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.cli</artifactId>
<version>1.0.219</version>
<version>1.1.230</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>tools.namespace</artifactId>
<version>1.4.4</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
<artifactId>data.json</artifactId>
<version>2.4.0</version>
<version>2.5.0</version>
</dependency>
<dependency>
<groupId>orchestra</groupId>
Expand All @@ -103,7 +103,7 @@
<dependency>
<groupId>com.taoensso</groupId>
<artifactId>timbre</artifactId>
<version>5.1.2</version>
<version>6.5.0</version>
</dependency>
<dependency>
<groupId>clj-http</groupId>
Expand All @@ -113,7 +113,7 @@
<dependency>
<groupId>clj-commons</groupId>
<artifactId>fs</artifactId>
<version>1.6.310</version>
<version>1.6.311</version>
</dependency>
<dependency>
<groupId>slugify</groupId>
Expand All @@ -133,7 +133,7 @@
<dependency>
<groupId>clojure.java-time</groupId>
<artifactId>clojure.java-time</artifactId>
<version>1.2.0</version>
<version>1.4.2</version>
</dependency>
<dependency>
<groupId>envvar</groupId>
Expand All @@ -143,12 +143,12 @@
<dependency>
<groupId>tolitius</groupId>
<artifactId>lasync</artifactId>
<version>0.1.24</version>
<version>0.1.25</version>
</dependency>
<dependency>
<groupId>cljfx</groupId>
<artifactId>cljfx</artifactId>
<version>1.7.23</version>
<version>1.8.0</version>
<exclusions>
<exclusion>
<artifactId>javafx-web</artifactId>
Expand All @@ -168,68 +168,68 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
<classifier>mac</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
<classifier>mac</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
<classifier>linux</classifier>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
<version>19.0.2.1</version>
<version>20-ea+1</version>
<classifier>mac</classifier>
</dependency>
<dependency>
<groupId>org.ocpsoft.prettytime</groupId>
<artifactId>prettytime</artifactId>
<version>5.0.6.Final</version>
<version>5.0.7.Final</version>
</dependency>
<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>11.1.2</version>
<version>11.2.1</version>
</dependency>
<dependency>
<groupId>clj-http-fake</groupId>
<artifactId>clj-http-fake</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
46 changes: 23 additions & 23 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject ogri-la/strongbox "7.2.0"
(defproject ogri-la/strongbox "7.3.0"
:description "World Of Warcraft Addon Manager"
:url "https://github.com/ogri-la/strongbox"
:license {:name "GNU Affero General Public License (AGPL)"
Expand All @@ -11,42 +11,42 @@
;; https://github.com/technomancy/leiningen/issues/2769
:pedantic? false

:dependencies [[org.clojure/clojure "1.10.3"]
[org.clojure/tools.cli "1.0.219"] ;; cli arg parsing
[org.clojure/tools.namespace "1.4.4"] ;; reload code
[org.clojure/data.json "2.4.0"] ;; json handling
:dependencies [[org.clojure/clojure "1.11.2"]
[org.clojure/tools.cli "1.1.230"] ;; cli arg parsing
[org.clojure/tools.namespace "1.5.0"] ;; reload code
[org.clojure/data.json "2.5.0"] ;; json handling
[orchestra "2021.01.01-1"] ;; improved clojure.spec instrumentation
;; see lein deps :tree
[com.taoensso/timbre "5.1.2"] ;; logging
[com.taoensso/timbre "6.5.0"] ;; logging
[clj-http "3.12.3"] ;; better http slurping
[clj-commons/fs "1.6.310"] ;; file system wrangling
[clj-commons/fs "1.6.311"] ;; file system wrangling
[slugify "0.0.1"]
[trptcolin/versioneer "0.2.0"] ;; version number wrangling. it's more involved than you might suspect
[org.flatland/ordered "1.15.11"] ;; better ordered map
[clojure.java-time "1.2.0"] ;; date/time handling library, https://github.com/dm3/clojure.java-time
[clojure.java-time "1.4.2"] ;; date/time handling library, https://github.com/dm3/clojure.java-time
[envvar "1.1.2"] ;; environment variable wrangling
[tolitius/lasync "0.1.24"] ;; better parallel processing
[tolitius/lasync "0.1.25"] ;; better parallel processing

[cljfx "1.7.23" :exclusions [org.openjfx/javafx-web
org.openjfx/javafx-media]]
[cljfx "1.8.0" :exclusions [org.openjfx/javafx-web
org.openjfx/javafx-media]]
[cljfx/css "1.1.0"]

[org.openjfx/javafx-base "19.0.2.1"]
[org.openjfx/javafx-base "19.0.2.1" :classifier "linux"]
[org.openjfx/javafx-base "19.0.2.1" :classifier "mac"]
[org.openjfx/javafx-base "20-ea+1"]
[org.openjfx/javafx-base "20-ea+1" :classifier "linux"]
[org.openjfx/javafx-base "20-ea+1" :classifier "mac"]

[org.openjfx/javafx-controls "19.0.2.1"]
[org.openjfx/javafx-controls "19.0.2.1" :classifier "linux"]
[org.openjfx/javafx-controls "19.0.2.1" :classifier "mac"]
[org.openjfx/javafx-controls "20-ea+1"]
[org.openjfx/javafx-controls "20-ea+1" :classifier "linux"]
[org.openjfx/javafx-controls "20-ea+1" :classifier "mac"]

[org.openjfx/javafx-graphics "19.0.2.1"]
[org.openjfx/javafx-graphics "19.0.2.1" :classifier "linux"]
[org.openjfx/javafx-graphics "19.0.2.1" :classifier "mac"]
[org.openjfx/javafx-graphics "20-ea+1"]
[org.openjfx/javafx-graphics "20-ea+1" :classifier "linux"]
[org.openjfx/javafx-graphics "20-ea+1" :classifier "mac"]

;; GPLv3 compatible dependencies.
;; these don't need an exception in LICENCE.txt
[org.ocpsoft.prettytime/prettytime "5.0.6.Final"] ;; Apache 2.0 licenced, pretty date formatting
[org.controlsfx/controlsfx "11.1.2"] ;; BSD-3
[org.ocpsoft.prettytime/prettytime "5.0.7.Final"] ;; Apache 2.0 licenced, pretty date formatting
[org.controlsfx/controlsfx "11.2.1"] ;; BSD-3

;; remember to update the LICENCE.txt
;; remember to update pom file (`lein pom`)
Expand All @@ -65,7 +65,7 @@

:profiles {:repl {:source-paths ["repl"]}
:dev {:resource-paths ["dev-resources" "resources"] ;; dev-resources take priority
:dependencies [[clj-http-fake "1.0.3"] ;; fake http responses for testing
:dependencies [[clj-http-fake "1.0.4"] ;; fake http responses for testing
[gui-diff "0.6.7" :exclusions [net.cgrant/parsley]] ;; pops up a graphical diff for test results
]}

Expand Down
3 changes: 2 additions & 1 deletion repl/strongbox/user.clj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
[catalogue :as catalogue]
[http :as http]
[core :as core]
[specs :as sp]
[utils :as utils :refer [in?]]]
[gui.diff :refer [with-gui-diff]]))

Expand Down Expand Up @@ -89,7 +90,7 @@
(core/reset-logging!)

(if ns-kw
(if (some #{ns-kw} [:main :utils :http
(if (some #{ns-kw} [:main :utils :http :specs
:core :toc :nfo :zip :config :catalogue :addon :logging :joblib
:cli :gui :jfx
:curseforge-api :wowinterface-api :gitlab-api :github-api :tukui-api
Expand Down
Loading

0 comments on commit 3201ad1

Please sign in to comment.