Skip to content

Commit ea16e3d

Browse files
authored
Merge pull request #128 from Adito5393/r2.1.0
Added Java Module System support
2 parents 5238f3f + 352d34b commit ea16e3d

File tree

8 files changed

+52
-52
lines changed

8 files changed

+52
-52
lines changed

.gitignore

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,18 @@ classes
3838

3939
*/srv/var/dbdata
4040
*/srv/var/lib-pgadmin
41+
42+
# NetBeans.gitignore https://github.com/github/gitignore/blob/master/Global/NetBeans.gitignore
43+
**/nbproject/private/
44+
**/nbproject/Makefile-*.mk
45+
**/nbproject/Package-*.bash
46+
jpx/build/
47+
jpx/bin/
48+
jpx/nbbuild/
49+
jpx/dist/
50+
jpx/nbdist/
51+
.nb-gradle/
52+
.project
53+
.settings/
54+
.classpath
55+
*.iml

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ allprojects { Project prj ->
7474
}
7575

7676
task upgradeGradle(type: Wrapper) {
77-
gradleVersion = '6.3'
77+
gradleVersion = '6.4.1'
7878
}
7979

gradle/wrapper/gradle-wrapper.jar

-3.43 KB
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 20 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jpx/build.gradle

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,15 @@ jar {
9191
'Implementation-Vendor': 'jenetics',
9292
'ProjectName': project.name,
9393
'Version': project.version,
94-
'Maintainer': 'Franz Wilhelmstötter',
95-
'Automatic-Module-Name': 'io.jenetics.jpx'
94+
'Maintainer': 'Franz Wilhelmstötter'
9695
)
9796
}
9897
}
9998

99+
//https://docs.gradle.org/current/userguide/java_library_plugin.html#sec:java_library_modular
100+
java {
101+
modularity.inferModulePath = true
102+
}
100103

101104
/ ******************************************************************************
102105
* Artifact publishing code.

jpx/src/main/java/module-info.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module io.jenetics.jpx {
2+
requires transitive java.xml;
3+
4+
exports io.jenetics.jpx;
5+
exports io.jenetics.jpx.format;
6+
exports io.jenetics.jpx.geom;
7+
8+
uses io.jenetics.jpx.XMLProvider;
9+
}

0 commit comments

Comments
 (0)