[nongnu] elpa/cider 30d425b398 1/6: Remove cider-package-version

[ELPA Syncer]

branch: elpa/cider
commit 30d425b398cd0790934a74f04eb0c2c2e383911f
Author: Bozhidar Batsov <bozhidar@batsov.dev>
Commit: Bozhidar Batsov <bozhidar@batsov.dev>

    Remove cider-package-version
---
 cider-util.el            | 11 +++++++----
 cider.el                 |  6 ++----
 test/cider-util-tests.el |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/cider-util.el b/cider-util.el
index 2347139d2d..4837c8f592 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -396,10 +396,13 @@ propertized (defaults to current buffer)."
   "Retrieve CIDER's version.
 A codename is added to stable versions."
   (if (string-match-p "-snapshot" cider-version)
-      (if cider-package-version
-          ;; snapshot versions include the MELPA package version
-          (format "%s (package: %s)" cider-version cider-package-version)
-        cider-version)
+      (let ((pkg-version (if (fboundp 'package-get-version)
+                             (package-get-version)
+                           nil)))
+        (if pkg-version
+            ;; snapshot versions include the MELPA package version
+            (format "%s (package: %s)" cider-version pkg-version)
+          cider-version))
     ;; stable versions include the codename of the release
     (format "%s (%s)" cider-version cider-codename)))
 
diff --git a/cider.el b/cider.el
index c1f9030ff4..00da956443 100644
--- a/cider.el
+++ b/cider.el
@@ -96,11 +96,9 @@
 (defconst cider-version "1.2.0"
   "The current version of CIDER.")
 
-(defconst cider-package-version
+(defvar cider-package-version
   ;; package-get-version was added in Emacs 27
-  (if (fboundp 'package-get-version)
-      (package-get-version)
-    nil)
+
   "The version of the currently installed CIDER package.")
 
 (defconst cider-codename "Nice"
diff --git a/test/cider-util-tests.el b/test/cider-util-tests.el
index 786d46c6c4..6ffe4bddc0 100644
--- a/test/cider-util-tests.el
+++ b/test/cider-util-tests.el
@@ -57,9 +57,9 @@ buffer."
 
   (it "handles snapshot versions"
     (setq cider-version "0.11.0-snapshot"
-          cider-package-version "20160301.2217"
           cider-codename "Victory")
-    (expect (cider--version) :to-equal "0.11.0-snapshot (package: 
20160301.2217)")))
+    (spy-on 'package-get-version :and-return-value "20160301.2217")
+    (expect (cider--version) :to-equal "0.11.0-snapshot (package: 
20160301.2217/)")))
 
 (defvar some-cider-hook)