Skip to content

Commit e3d6b16

Browse files
committed
Big reorganization into module-compatible structure
Follow Gradle conventions for a multi-module build. Top level modules: * rhino-runtime: Basic Rhino runtime, enough to run scripts * rhino-tools: Adds Shell, compiler, "Global" object * rhino-xml: Add E4X * rhino: Uber-JAR containing all of the above * rhino-engine: Java ScriptEngine plug-in * tests: Tests, which depend on all above Add proper Java module-info files for each module, and sure that everything works correctly in the new module system.
1 parent c6a873f commit e3d6b16

File tree

4,653 files changed

+281
-597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,653 files changed

+281
-597
lines changed

.github/workflows/gradle.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
# Some tests require more CPU, and all can use multiple CPUs
1616
max-parallel: 1
1717
matrix:
18-
java: [ '8', '11', '17' ]
18+
java: [ '11', '17' ]
1919
name: Rhino Java ${{ matrix.java }}
2020
steps:
2121
- name: Checkout
@@ -31,21 +31,12 @@ jobs:
3131
with:
3232
java-version: ${{ matrix.java }}
3333
distribution: 'adopt'
34-
- if: matrix.java == '8'
35-
name: Check everything with Gradle on Java 8
36-
run: ./gradlew check jacocoTestReport
37-
- if: matrix.java != '8'
38-
name: Check everything with Gradle, modular Java
34+
- name: Check everything with Gradle
3935
run: >-
40-
./gradlew check jacocoTestReport
41-
-Dorg.gradle.jvmargs="--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
42-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
43-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
44-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
45-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"
36+
./gradlew check
4637
- name: Upload results
4738
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
4839
with:
4940
name: reports
50-
path: buildGradle/reports
41+
path: build/reports
5142

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,25 @@
44
# build directories
55
build/
66
lib/
7-
buildGradle
87

98
# artifacts
109
*.zip
11-
1210
*.iml
1311
.idea/
1412
out/
1513
target/
1614
.gradle
17-
18-
1915
*~
2016

2117
# eclipse
2218
.classpath
2319
.project
24-
test262
2520
bin/
2621
.settings/
2722

2823
# idea
2924
rhino.ipr
3025
rhino.iws
26+
27+
# VSCode
28+
.vscode

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "test262"]
2-
path = test262
2+
path = tests/test262
33
url = https://github.com/tc39/test262.git

0 commit comments

Comments
 (0)