From 0d84067476cb8b555935dcfde2ed1c8e83bca7e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jostein=20Kj=C3=B8nigsen?= Date: Thu, 15 Oct 2020 11:23:02 +0200 Subject: [PATCH] Migrate development-dependencies to be managed by Cask. This removes the final build-time warning and enables us to setup error-as-warning for the build, as discussed in: https://github.com/josteink/csharp-mode/issues/81 --- .travis.yml | 2 +- Cask | 8 ++++++-- csharp-mode-tests.el | 14 -------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37c3d08..f2e1c24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,4 +29,4 @@ matrix: script: - emacs --version - - make test + - cask exec make test diff --git a/Cask b/Cask index f69b06f..1bcdea9 100644 --- a/Cask +++ b/Cask @@ -1,5 +1,9 @@ (source gnu) -(source melpa) +(source melpa-stable) -(files "*.el") (package-file "csharp-mode.el") +(files "csharp-mode.el") + +(development + (depends-on "dash") + (depends-on "assess")) diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el index 1bf7b47..3d04f8a 100644 --- a/csharp-mode-tests.el +++ b/csharp-mode-tests.el @@ -21,20 +21,6 @@ (require 'csharp-mode) (require 'package) -;; development only packages, not declared as a package-dependency -(package-initialize) -(add-to-list 'package-archives '("melpa" . "https://stable.melpa.org/packages/")) - -;; required to resolve SEQ (or anything on elpa) on Emacs25. -(setq package-check-signature nil) - -;; assess depends on dash 2.12.1, which is no longer available -;; installing dash, resolves 2.13.0, and fixes this broken dependency. -(dolist (p '(dash assess)) - (when (not (package-installed-p p)) - (package-refresh-contents) - (package-install p))) - ;;; test-helper functions (defmacro assess-face-in-text= (testee &rest assessments)