Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a few problems that were causing build warnings and errors #1505

Merged
merged 2 commits into from
Jun 30, 2024
Merged

Fix a few problems that were causing build warnings and errors #1505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f44b7eb
Fix a few problems that were causing build warnings and errors
gbrail Jun 30, 2024
25857b8
Ensure that the reports are all uploaded
gbrail Jun 30, 2024
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
3 changes: 1 addition & 2 deletions .github/workflows/gradle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ jobs:
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
with:
name: reports
path: build/reports

path: '*/build/reports'
4 changes: 2 additions & 2 deletions rhino-engine/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module org.mozilla.rhino.engine {
exports org.mozilla.javascript.engine;

requires org.mozilla.rhino;
requires java.scripting;
requires transitive org.mozilla.rhino;
requires transitive java.scripting;
}
5 changes: 3 additions & 2 deletions rhino-tools/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module org.mozilla.rhino.tools {
requires org.mozilla.rhino;
requires java.desktop;
requires transitive org.mozilla.rhino;
requires transitive java.desktop;

exports org.mozilla.javascript.tools;
exports org.mozilla.javascript.tools.debugger;
exports org.mozilla.javascript.tools.jsc;
exports org.mozilla.javascript.tools.shell;
Expand Down
4 changes: 2 additions & 2 deletions rhino-xml/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module org.mozilla.javascript.xml {
exports org.mozilla.javascript.xmlimpl;

requires org.mozilla.rhino;
requires java.xml;
requires transitive org.mozilla.rhino;
requires transitive java.xml;
}
2 changes: 1 addition & 1 deletion rhino/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
exports org.mozilla.javascript.xml;

requires java.compiler;
requires java.desktop;
requires transitive java.desktop;
}
1 change: 1 addition & 0 deletions rhino/src/main/java/org/mozilla/javascript/NativeObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public String toString() {
return ScriptRuntime.defaultObjectToString(this);
}

@SuppressWarnings("resource")
@Override
protected void fillConstructorProperties(IdFunctionObject ctor) {
addIdFunctionProperty(ctor, OBJECT_TAG, ConstructorId_getPrototypeOf, "getPrototypeOf", 1);
Expand Down
1 change: 1 addition & 0 deletions rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ public void put(String name, Scriptable start, Object value) {
* @param start the object whose property is being set
* @param value value to set the property to
*/
@SuppressWarnings("resource")
@Override
public void put(int index, Scriptable start, Object value) {
if (externalData != null) {
Expand Down
0 ...javascript/tests/json/JsonParserTest.java → ...javascript/tests/json/JsonParserTest.java
View file
Open in desktop
File renamed without changes.
Loading