Skip to content

Commit e4e1ac2

Browse files
committed
remove Rhino dep, remove non-supported REPL scripts, stacktrace support, build support,
fix CI script, update CLI tests, cleanup bootstrap scripts
1 parent 370e587 commit e4e1ac2

20 files changed

Lines changed: 14 additions & 260 deletions

File tree

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ script:
6161
- grep '0 failures, 0 errors.' test-out.txt
6262
- script/test-cli node | tee test-out.txt
6363
- grep '0 failures, 0 errors.' test-out.txt
64-
- script/test-cli rhino | tee test-out.txt
6564
- grep '0 failures, 0 errors.' test-out.txt
6665
- PATH=`pwd`/graalvm-ce-1.0.0-rc12/bin:$PATH script/test-cli graaljs | tee test-out.txt
6766
- grep '0 failures, 0 errors.' test-out.txt

deps.edn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
org.clojure/data.json {:mvn/version "0.2.6"}
99
com.cognitect/transit-clj {:mvn/version "0.8.309"}
1010
com.google.javascript/closure-compiler-unshaded {:mvn/version "v20200112"}
11-
org.clojure/google-closure-library {:mvn/version "0.0-20191016-6ae1f72f"}
12-
org.mozilla/rhino {:mvn/version "1.7R5"}}
11+
org.clojure/google-closure-library {:mvn/version "0.0-20191016-6ae1f72f"}}
1312
:aliases
1413
{:test {:extra-paths ["src/test/cljs" "src/test/cljs_build" "src/test/cljs_cp"
1514
"src/test/clojure" "src/test/self"]

pom.template.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@
4242
<artifactId>data.json</artifactId>
4343
<version>0.2.6</version>
4444
</dependency>
45-
<dependency>
46-
<groupId>org.mozilla</groupId>
47-
<artifactId>rhino</artifactId>
48-
<version>1.7R5</version>
49-
</dependency>
5045
<dependency>
5146
<groupId>org.clojure</groupId>
5247
<artifactId>tools.reader</artifactId>
@@ -311,7 +306,6 @@
311306
<namespace>cljs.repl.browser</namespace>
312307
<namespace>cljs.repl.node</namespace>
313308
<namespace>cljs.repl.reflect</namespace>
314-
<namespace>cljs.repl.rhino</namespace>
315309
<namespace>cljs.repl.server</namespace>
316310
<namespace>cljs.main</namespace>
317311
<namespace>cljs.cli</namespace>

project.clj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
[org.clojure/test.check "0.10.0-alpha3" :scope "test"]
1717
[com.cognitect/transit-clj "0.8.309"]
1818
[org.clojure/google-closure-library "0.0-20191016-6ae1f72f"]
19-
[com.google.javascript/closure-compiler-unshaded "v20200112"]
20-
[org.mozilla/rhino "1.7R5"]]
19+
[com.google.javascript/closure-compiler-unshaded "v20200112"]]
2120
:profiles {:1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}
2221
:uberjar {:aot :all :main cljs.main}
2322
:closure-snapshot {:dependencies [[com.google.javascript/closure-compiler-unshaded "1.0-SNAPSHOT"]]}}

samples/repl/README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,6 @@ There are currently four steps in starting a ClojureScript REPL.
1717
3. create a new evaluation environment
1818
4. start the REPL with the created environment
1919

20-
## Evaluating with Rhino
21-
22-
```clj
23-
(require '[cljs.repl :as repl])
24-
(require '[cljs.repl.rhino :as rhino])
25-
(def env (rhino/repl-env))
26-
(repl/repl env)
27-
```
28-
2920
## Evaluating in the Browser
3021

3122
A browser-connected REPL works in much the same way as a normal REPL:

script/bootstrap

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ CLOSURE_RELEASE="20200112"
99
DJSON_RELEASE="0.2.6"
1010
TRANSIT_RELEASE="0.8.309"
1111
GCLOSURE_LIB_RELEASE="0.0-20191016-6ae1f72f"
12-
RHINO_RELEASE="1_7R5"
1312
TREADER_RELEASE="1.3.0"
1413
TEST_CHECK_RELEASE="0.10.0-alpha3"
1514

@@ -118,16 +117,6 @@ if [ "$1" = "--closure-library-head" ] ; then
118117
mv orig-deps.js closure/library/closure-library/third_party/closure/goog/deps.js
119118
fi
120119

121-
echo "Fetching Rhino..."
122-
curl --retry 3 -LOk -s https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_RELEASE}_RELEASE/rhino$RHINO_RELEASE.zip || { echo "Download failed."; exit 1; }
123-
unzip -qu rhino$RHINO_RELEASE.zip
124-
echo "Copying rhino$RHINO_RELEASE/js.jar to lib/js.jar..."
125-
cp rhino$RHINO_RELEASE/js.jar lib/js.jar
126-
echo "Cleaning up Rhino directory..."
127-
rm -rf rhino$RHINO_RELEASE/
128-
echo "Cleaning up Rhino archive..."
129-
rm rhino$RHINO_RELEASE.zip
130-
131120
echo "Fetching tools.reader $TREADER_RELEASE ..."
132121
curl --retry 3 -O -s https://repo1.maven.org/maven2/org/clojure/tools.reader/$TREADER_RELEASE/tools.reader-$TREADER_RELEASE.jar || { echo "Download failed."; exit 1; }
133122

script/bootstrap.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,6 @@ Get-WebResource `
129129
Copy-File $root\closure-compiler-v$CLOSURE_RELEASE.jar $root\lib\compiler.jar
130130
Delete-File $root\closure-compiler-v$CLOSURE_RELEASE.jar
131131

132-
Write-Host "Fetching Rhino..."
133-
Get-WebResource `
134-
https://github.com/mozilla/rhino/releases/download/Rhino${RHINO_RELEASE}_RELEASE/rhino$RHINO_RELEASE.zip `
135-
$root\rhino$RHINO_RELEASE.zip
136-
Delete-File $root\lib\js.jar
137-
Expand-ZipFile $root\rhino$RHINO_RELEASE.zip $root\lib rhino$RHINO_RELEASE\js.jar
138-
Delete-File $root\rhino$RHINO_RELEASE.zip
139-
140132
Write-Host "Fetching tools.reader $TREADER_RELEASE ..."
141133
Get-WebResource `
142134
https://repo1.maven.org/maven2/org/clojure/tools.reader/$TREADER_RELEASE/tools.reader-$TREADER_RELEASE.jar `

script/nashorn_repl.clj

Lines changed: 0 additions & 3 deletions
This file was deleted.

script/nashornrepljs

Lines changed: 0 additions & 15 deletions
This file was deleted.

script/repljs

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)