Skip to content
This repository was archived by the owner on Jun 19, 2024. It is now read-only.

Add basic Java 9 JPMS support #37

Merged
Janrupf merged 3 commits into from
Feb 5, 2021
Merged

Add basic Java 9 JPMS support #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1dc53
Refactor base package name of databind project
hdecarne Feb 4, 2021
f9e7fd7
Add Automatic-Module-Name for base and databind project
hdecarne Feb 4, 2021
ed39d7d
Fix indentation (use spaces instead of tabs)
hdecarne Feb 5, 2021
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
8 changes: 4 additions & 4 deletions ...gl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/listener/ExampleLoadListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

package com.labymedia.ultralight.lwjgl3.opengl.listener;

import com.labymedia.ultralight.Databind;
import com.labymedia.ultralight.DatabindConfiguration;
import com.labymedia.ultralight.DatabindJavascriptClass;
import com.labymedia.ultralight.UltralightView;
import com.labymedia.ultralight.api.JavaAPI;
import com.labymedia.ultralight.databind.Databind;
import com.labymedia.ultralight.databind.DatabindConfiguration;
import com.labymedia.ultralight.databind.DatabindJavascriptClass;
import com.labymedia.ultralight.databind.api.JavaAPI;
import com.labymedia.ultralight.javascript.*;
import com.labymedia.ultralight.lwjgl3.opengl.support.ViewContextProvider;
import com.labymedia.ultralight.plugin.loading.UltralightLoadListener;
Expand Down
4 changes: 2 additions & 2 deletions ...ngl/src/main/java/com/labymedia/ultralight/lwjgl3/opengl/support/ViewContextProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
package com.labymedia.ultralight.lwjgl3.opengl.support;

import com.labymedia.ultralight.UltralightView;
import com.labymedia.ultralight.context.ContextProviderFactory;
import com.labymedia.ultralight.context.ContextProvider;
import com.labymedia.ultralight.databind.context.ContextProvider;
import com.labymedia.ultralight.databind.context.ContextProviderFactory;
import com.labymedia.ultralight.javascript.JavascriptContextLock;
import com.labymedia.ultralight.javascript.JavascriptValue;

Expand Down
8 changes: 8 additions & 0 deletions ultralight-java-base/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ plugins {

group 'com.labymedia'

jar {
manifest {
attributes(
'Automatic-Module-Name': 'com.labymedia.ultralight'
)
}
}

processResources {
from(nativeBinaries) {
into "native-binaries"
Expand Down
8 changes: 8 additions & 0 deletions ultralight-java-databind/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ plugins {

group 'com.labymedia'

jar {
manifest {
attributes(
'Automatic-Module-Name': 'com.labymedia.ultralight.databind'
)
}
}

dependencies {
implementation project(':ultralight-java-base')
}
Expand Down
8 changes: 4 additions & 4 deletions ...va/com/labymedia/ultralight/Databind.java → ...bymedia/ultralight/databind/Databind.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight;
package com.labymedia.ultralight.databind;

import com.labymedia.ultralight.context.ContextProviderFactory;
import com.labymedia.ultralight.databind.cache.JavascriptClassCache;
import com.labymedia.ultralight.databind.context.ContextProviderFactory;
import com.labymedia.ultralight.databind.utils.JavascriptConversionUtils;
import com.labymedia.ultralight.javascript.JavascriptClass;
import com.labymedia.ultralight.cache.JavascriptClassCache;
import com.labymedia.ultralight.utils.JavascriptConversionUtils;

/**
* Representation of Databind instances.
Expand Down
12 changes: 6 additions & 6 deletions ...dia/ultralight/DatabindConfiguration.java → ...light/databind/DatabindConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight;
package com.labymedia.ultralight.databind;

import com.labymedia.ultralight.context.ContextProviderFactory;
import com.labymedia.ultralight.cache.JavascriptClassCache;
import com.labymedia.ultralight.cache.NaiveJavascriptClassCache;
import com.labymedia.ultralight.call.HeuristicMethodChooser;
import com.labymedia.ultralight.call.MethodChooser;
import com.labymedia.ultralight.databind.cache.JavascriptClassCache;
import com.labymedia.ultralight.databind.cache.NaiveJavascriptClassCache;
import com.labymedia.ultralight.databind.call.HeuristicMethodChooser;
import com.labymedia.ultralight.databind.call.MethodChooser;
import com.labymedia.ultralight.databind.context.ContextProviderFactory;

/**
* Databind configuration.
Expand Down
10 changes: 5 additions & 5 deletions ...a/ultralight/DatabindJavascriptClass.java → ...ght/databind/DatabindJavascriptClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight;
package com.labymedia.ultralight.databind;

import com.labymedia.ultralight.cache.JavascriptClassCache;
import com.labymedia.ultralight.call.CallData;
import com.labymedia.ultralight.javascript.*;
import com.labymedia.ultralight.javascript.interop.JavascriptInteropException;
import com.labymedia.ultralight.call.MethodChooser;
import com.labymedia.ultralight.utils.JavascriptConversionUtils;
import com.labymedia.ultralight.databind.cache.JavascriptClassCache;
import com.labymedia.ultralight.databind.call.CallData;
import com.labymedia.ultralight.databind.call.MethodChooser;
import com.labymedia.ultralight.databind.utils.JavascriptConversionUtils;

import java.lang.reflect.*;
import java.util.*;
Expand Down
4 changes: 2 additions & 2 deletions ...alight/DatabindJavascriptExplicitAPI.java → ...tabind/DatabindJavascriptExplicitAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight;
package com.labymedia.ultralight.databind;

import com.labymedia.ultralight.databind.utils.JavascriptConversionUtils;
import com.labymedia.ultralight.javascript.*;
import com.labymedia.ultralight.javascript.*;
import com.labymedia.ultralight.utils.JavascriptConversionUtils;

import java.util.ArrayList;
import java.util.List;
Expand Down
8 changes: 4 additions & 4 deletions ...ight/DatabindJavascriptMethodHandler.java → ...bind/DatabindJavascriptMethodHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight;
package com.labymedia.ultralight.databind;

import com.labymedia.ultralight.call.CallData;
import com.labymedia.ultralight.databind.call.CallData;
import com.labymedia.ultralight.databind.call.MethodChooser;
import com.labymedia.ultralight.databind.utils.JavascriptConversionUtils;
import com.labymedia.ultralight.javascript.*;
import com.labymedia.ultralight.javascript.interop.JavascriptInteropException;
import com.labymedia.ultralight.call.MethodChooser;
import com.labymedia.ultralight.javascript.*;
import com.labymedia.ultralight.utils.JavascriptConversionUtils;

import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Expand Down
4 changes: 2 additions & 2 deletions ...tralight/api/InjectJavascriptContext.java → ...databind/api/InjectJavascriptContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.api;
package com.labymedia.ultralight.databind.api;

import com.labymedia.ultralight.Databind;
import com.labymedia.ultralight.databind.Databind;
import com.labymedia.ultralight.javascript.JavascriptContext;

import java.lang.annotation.ElementType;
Expand Down
6 changes: 3 additions & 3 deletions ...com/labymedia/ultralight/api/JavaAPI.java → ...edia/ultralight/databind/api/JavaAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.api;
package com.labymedia.ultralight.databind.api;

import com.labymedia.ultralight.Databind;
import com.labymedia.ultralight.DatabindJavascriptClass;
import com.labymedia.ultralight.databind.Databind;
import com.labymedia.ultralight.databind.DatabindJavascriptClass;
import com.labymedia.ultralight.javascript.JavascriptContext;
import com.labymedia.ultralight.javascript.JavascriptObject;

Expand Down
2 changes: 1 addition & 1 deletion ...ltralight/cache/JavascriptClassCache.java → .../databind/cache/JavascriptClassCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.cache;
package com.labymedia.ultralight.databind.cache;

import com.labymedia.ultralight.javascript.JavascriptClass;

Expand Down
2 changes: 1 addition & 1 deletion ...ight/cache/NaiveJavascriptClassCache.java → ...bind/cache/NaiveJavascriptClassCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.cache;
package com.labymedia.ultralight.databind.cache;

import com.labymedia.ultralight.javascript.JavascriptClass;

Expand Down
6 changes: 3 additions & 3 deletions ...m/labymedia/ultralight/call/CallData.java → ...ia/ultralight/databind/call/CallData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.call;
package com.labymedia.ultralight.databind.call;

import com.labymedia.ultralight.databind.api.InjectJavascriptContext;
import com.labymedia.ultralight.databind.utils.JavascriptConversionUtils;
import com.labymedia.ultralight.javascript.JavascriptContext;
import com.labymedia.ultralight.javascript.JavascriptValue;
import com.labymedia.ultralight.api.InjectJavascriptContext;
import com.labymedia.ultralight.utils.JavascriptConversionUtils;

import java.lang.reflect.Array;
import java.lang.reflect.Executable;
Expand Down
6 changes: 3 additions & 3 deletions ...tralight/call/HeuristicMethodChooser.java → ...databind/call/HeuristicMethodChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.call;
package com.labymedia.ultralight.databind.call;

import com.labymedia.ultralight.api.InjectJavascriptContext;
import com.labymedia.ultralight.databind.api.InjectJavascriptContext;
import com.labymedia.ultralight.databind.utils.JavascriptConversionUtils;
import com.labymedia.ultralight.javascript.JavascriptObject;
import com.labymedia.ultralight.javascript.JavascriptValue;
import com.labymedia.ultralight.utils.JavascriptConversionUtils;

import java.lang.reflect.Executable;
import java.lang.reflect.Modifier;
Expand Down
2 changes: 1 addition & 1 deletion ...ymedia/ultralight/call/MethodChooser.java → ...tralight/databind/call/MethodChooser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.call;
package com.labymedia.ultralight.databind.call;

import com.labymedia.ultralight.javascript.JavascriptValue;

Expand Down
2 changes: 1 addition & 1 deletion ...a/ultralight/context/ContextProvider.java → ...ght/databind/context/ContextProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.context;
package com.labymedia.ultralight.databind.context;

import com.labymedia.ultralight.javascript.JavascriptContextLock;

Expand Down
4 changes: 2 additions & 2 deletions ...light/context/ContextProviderFactory.java → ...abind/context/ContextProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.context;
package com.labymedia.ultralight.databind.context;

import com.labymedia.ultralight.DatabindConfiguration;
import com.labymedia.ultralight.databind.DatabindConfiguration;
import com.labymedia.ultralight.javascript.JavascriptValue;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...ight/utils/FunctionalInterfaceBinder.java → ...bind/utils/FunctionalInterfaceBinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.utils;
package com.labymedia.ultralight.databind.utils;

import com.labymedia.ultralight.Databind;
import com.labymedia.ultralight.context.ContextProvider;
import com.labymedia.ultralight.databind.Databind;
import com.labymedia.ultralight.databind.context.ContextProvider;
import com.labymedia.ultralight.javascript.JavascriptObject;

import java.lang.reflect.Method;
Expand Down
6 changes: 3 additions & 3 deletions ...ht/utils/FunctionalInvocationHandler.java → ...nd/utils/FunctionalInvocationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.utils;
package com.labymedia.ultralight.databind.utils;

import com.labymedia.ultralight.Databind;
import com.labymedia.ultralight.context.ContextProvider;
import com.labymedia.ultralight.databind.Databind;
import com.labymedia.ultralight.databind.context.ContextProvider;
import com.labymedia.ultralight.ffi.gc.DeletableObject;
import com.labymedia.ultralight.javascript.JavascriptContext;
import com.labymedia.ultralight.javascript.JavascriptObject;
Expand Down
6 changes: 3 additions & 3 deletions ...ight/utils/JavascriptConversionUtils.java → ...bind/utils/JavascriptConversionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/

package com.labymedia.ultralight.utils;
package com.labymedia.ultralight.databind.utils;

import com.labymedia.ultralight.Databind;
import com.labymedia.ultralight.DatabindJavascriptClass;
import com.labymedia.ultralight.databind.Databind;
import com.labymedia.ultralight.databind.DatabindJavascriptClass;
import com.labymedia.ultralight.javascript.JavascriptClass;
import com.labymedia.ultralight.javascript.JavascriptContext;
import com.labymedia.ultralight.javascript.JavascriptObject;
Expand Down