Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions .circleci/config.yml

This file was deleted.

49 changes: 49 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Tests

on:
push:
branches: [main]
pull_request:
branches: [main]

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
java-version: [8, 11, 17, 21, 25]
clojure-version: ["1.12"]
include:
- java-version: 8
clojure-version: "1.8"
- java-version: 8
clojure-version: "1.9"
- java-version: 8
clojure-version: "1.10"
- java-version: 8
clojure-version: "1.11"
- java-version: 25
clojure-version: "1.10"
- java-version: 25
clojure-version: "1.11"
name: JDK ${{ matrix.java-version }}, Clojure ${{ matrix.clojure-version }}
steps:
- uses: actions/checkout@v4

- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: ${{ matrix.java-version }}

- uses: DeLaGuardo/setup-clojure@13.4
with:
lein: 2.11.2

- uses: actions/cache@v4
with:
path: ~/.m2/repository
key: m2-${{ matrix.java-version }}-${{ matrix.clojure-version }}-${{ hashFiles('project.clj') }}
restore-keys: m2-${{ matrix.java-version }}-${{ matrix.clojure-version }}-

- run: lein with-profile +${{ matrix.clojure-version }} test
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![CircleCI](https://circleci.com/gh/trptcolin/reply/tree/main.svg?style=svg)](https://circleci.com/gh/trptcolin/reply/tree/main)
[![Tests](https://github.com/trptcolin/reply/actions/workflows/test.yml/badge.svg)](https://github.com/trptcolin/reply/actions/workflows/test.yml)
[![Clojars Project](https://img.shields.io/clojars/v/reply/reply.svg)](https://clojars.org/reply/reply)
[![cljdoc badge](https://cljdoc.org/badge/reply/reply)](https://cljdoc.org/d/reply/reply/CURRENT)
[![downloads badge](https://versions.deps.co/reply/reply/downloads.svg)](https://clojars.org/reply/reply)
Expand Down Expand Up @@ -102,7 +102,7 @@ this during our open-source Friday afternoons.

## License

Copyright (C) 2011-2021 Colin Jones
Copyright (C) 2011-2026 Colin Jones

Distributed under the Eclipse Public License, the same as Clojure. See the
LICENSE file for details.
Expand Down
25 changes: 15 additions & 10 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,25 +1,30 @@
(defproject reply "0.6.0-SNAPSHOT"
:description "REPL-y: A fitter, happier, more productive REPL for Clojure."
:dependencies [[org.clojure/clojure "1.7.0"]
:dependencies [[org.clojure/clojure "1.8.0"]
[jline "2.14.6"]
[clj-stacktrace "0.2.8"]
[nrepl "0.8.3"]
;; tools.cli 1.0 requires Clojure 1.8
[org.clojure/tools.cli "0.3.1"]
[nrepl/drawbridge "0.2.1"]
[trptcolin/versioneer "0.1.1"]
[nrepl "1.5.2"]
[org.clojure/tools.cli "1.3.250"]
[nrepl/drawbridge "0.3.0"]
[trptcolin/versioneer "0.2.0"]
[org.nrepl/incomplete "0.1.0"]
[org.clojars.trptcolin/sjacket "0.1.1.1"
[org.clojars.trptcolin/sjacket "0.1.4"
:exclusions [org.clojure/clojure]]
;; bump transitive dep to avoid compatibility warning
[net.cgrand/parsley "0.9.3" :exclusions [org.clojure/clojure]]]
:min-lein-version "2.0.0"
:min-lein-version "2.9.1"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:url "https://github.com/trptcolin/reply"
:profiles {:dev {:dependencies [[classlojure "0.6.6"]]}
:base {:dependencies []}}
:javac-options ["-target" "8" "-source" "8" "-Xlint:-options"]
:base {:dependencies []}
;; Clojure versions matrix
:provided {:dependencies [[org.clojure/clojure "1.12.4"]]}
:1.8 {:dependencies [[org.clojure/clojure "1.8.0"]]}
:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
:1.10 {:dependencies [[org.clojure/clojure "1.10.3"]]}
:1.11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
:1.12 {:dependencies [[org.clojure/clojure "1.12.4"]]}}
;; :jvm-opts ["-Djline.internal.Log.trace=true"]
:aot [reply.reader.jline.JlineInputReader]
:main ^{:skip-aot true} reply.main
Expand Down
5 changes: 1 addition & 4 deletions src/reply/initialization.clj
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,7 @@
`(do
~@prelude

(use '[clojure.repl :only ~'[source apropos dir]])
; doc and find-doc live in clojure.core in 1.2
(when (ns-resolve '~'clojure.repl '~'pst)
(refer 'clojure.repl :only '~'[pst doc find-doc]))
(use '[clojure.repl :only ~'[source apropos dir pst doc find-doc]])

(use '[clojure.java.javadoc :only ~'[javadoc]])
(use '[clojure.pprint :only ~'[pp pprint]])
Expand Down
10 changes: 5 additions & 5 deletions test/reply/integration_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
;; TODO: this is easy but seems like wasted effort
;; probably better to use pomegranate
(def nrepl
{:local-path "spec/nrepl-0.8.3.jar"
:remote-url "https://clojars.org/repo/nrepl/nrepl/0.8.3/nrepl-0.8.3.jar"})
{:local-path "spec/nrepl-1.5.2.jar"
:remote-url "https://clojars.org/repo/nrepl/nrepl/1.5.2/nrepl-1.5.2.jar"})

(def clojure
{:local-path "spec/clojure-1.7.0.jar"
:remote-url "https://repo1.maven.org/maven2/org/clojure/clojure/1.7.0/clojure-1.7.0.jar"})
{:local-path "spec/clojure-1.8.0.jar"
:remote-url "https://repo1.maven.org/maven2/org/clojure/clojure/1.8.0/clojure-1.8.0.jar"})

(defn ensure-test-jar [{:keys [local-path remote-url]}]
(let [file (java.io.File. local-path)]
Expand Down Expand Up @@ -77,7 +77,7 @@
:output-stream out})
(t/is (= "" (str err)))
(t/is (re-find #"Unmatched delimiter" (str out)))
(t/is (re-find #"user=> #error" (str out)))))
(t/is (re-find #"(?s)user=>.*#error" (str out)))))

(with-out-err [out err]
(t/testing "does not print an error when given empty input lines"
Expand Down