Skip to content

Commit ee072c6

Browse files
committed
testing java 17 compatibility
1 parent 3288750 commit ee072c6

File tree

6 files changed

+284
-2076
lines changed

6 files changed

+284
-2076
lines changed

build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ dependencies {
2525
// https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api
2626
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.1'
2727
implementation 'net.codesup.util:jaxb2-rich-contract-plugin:2.1.0'
28+
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
29+
implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.2'
2830

2931
}
3032

3133

32-
if(JavaVersion.current() != JavaVersion.VERSION_1_8){
33-
throw new GradleException("This build must be run with java 8")
34-
}
34+
//if(JavaVersion.current() != JavaVersion.VERSION_1_8){
35+
// throw new GradleException("This build must be run with java 8")
36+
//}
3537

3638

3739
group='com.neuronrobotics'

mujocoRelease.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.0
1+
3.1.3

src/main/java/com/kscs/util/jaxb/PartialCopyable.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public interface PartialCopyable<T extends PartialCopyable<T>> {
3232

3333
/**
3434
* Clones this instances partially, the parts
35-
* will be defined by <tt>propertyTree</tt>
35+
* will be defined by propertyTree
3636
*
3737
* @param propertyTree Defines which parts of the object tree will be cloned or excluded
3838
* @param propertyTreeUse Defines how the clone graph will be used: To include or to exclude properties.
@@ -42,7 +42,7 @@ public interface PartialCopyable<T extends PartialCopyable<T>> {
4242

4343
/**
4444
* Clones this instances partially, the parts
45-
* to be EXCLUDED will be defined by <tt>propertyTree</tt>
45+
* to be EXCLUDED will be defined by propertyTree
4646
*
4747
* @param propertyTree Defines which parts of the object tree will be excluded
4848
* @return A copy of the original object.
@@ -51,7 +51,7 @@ public interface PartialCopyable<T extends PartialCopyable<T>> {
5151

5252
/**
5353
* Clones this instances partially, the parts
54-
* to be INCLUDED will be defined by <tt>propertyTree</tt>,
54+
* to be INCLUDED will be defined by propertyTree,
5555
* all other parts will be excluded.
5656
*
5757
* @param propertyTree Defines which parts of the object tree will be included in the clone

src/main/java/org/mujoco/MuJoCoConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
"mujoco/mjexport.h", "mujoco/mujoco.h", "mujoco/mjmacro.h", "mujoco/mjthread.h", "mujoco/mjdata.h",
1717
"mujoco/mjmodel.h", "mujoco/mjrender.h", "mujoco/mjui.h", "mujoco/mjvisualize.h",
1818

19-
"mujoco/mjplugin.h", "mujoco/mjspec.h",
19+
"mujoco/mjplugin.h",
20+
//"mujoco/mjspec.h",
2021
// "mujoco/mjxmacro.h" // This will not work with JavaCPP
2122
},
2223
link = {

0 commit comments

Comments
 (0)