* Fix -platform artifacts on JPMS by commenting out requires to An…

…droid modules (issue #814 and pull #831)
bytedeco · Dec 24, 2019 · d267926 · d267926
1 parent f748f1d
commit d267926
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `-platform` artifacts on JPMS by commenting out requires to Android modules ([issue #814](https://github.com/bytedeco/javacpp-presets/issues/814) and ([pull #831](https://github.com/bytedeco/javacpp-presets/pull/831)))
  * Include `timecode.h`, among other missing header files, in the `avutil` module of FFmpeg ([issue #822](https://github.com/bytedeco/javacpp-presets/issues/822))
  * Map a few more inherited constructors missing from the presets for MKL-DNN and DNNL
  * Make sure `clone()` actually returns new `PIX`, `FPIX`, or `DPIX` objects with presets for Leptonica

diff --git a/artoolkitplus/platform/pom.xml b/artoolkitplus/platform/pom.xml
@@ -154,10 +154,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/chilitags/platform/pom.xml b/chilitags/platform/pom.xml
@@ -159,10 +159,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/cpu_features/platform/pom.xml b/cpu_features/platform/pom.xml
@@ -154,10 +154,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/ffmpeg/platform/pom.xml b/ffmpeg/platform/pom.xml
@@ -154,10 +154,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/fftw/platform/pom.xml b/fftw/platform/pom.xml
@@ -154,10 +154,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/flandmark/platform/pom.xml b/flandmark/platform/pom.xml
@@ -159,10 +159,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml
@@ -159,10 +159,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/leptonica/platform/pom.xml b/leptonica/platform/pom.xml
@@ -154,10 +154,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;

diff --git a/openblas/platform/pom.xml b/openblas/platform/pom.xml
@@ -166,10 +166,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.ios.arm64;
                       requires org.bytedeco.${javacpp.moduleId}.ios.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;

diff --git a/opencv/platform/pom.xml b/opencv/platform/pom.xml
@@ -172,10 +172,10 @@
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
                       requires transitive org.bytedeco.${javacpp.moduleId};
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.ios.arm64;
                       requires org.bytedeco.${javacpp.moduleId}.ios.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;

diff --git a/tensorflow/platform/pom.xml b/tensorflow/platform/pom.xml
@@ -141,10 +141,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.macosx.x86_64;

diff --git a/tesseract/platform/pom.xml b/tesseract/platform/pom.xml
@@ -159,10 +159,10 @@
                   <file>${project.build.directory}/${project.artifactId}.jar</file>
                   <moduleInfoSource>
                     module org.bytedeco.${javacpp.moduleId}.platform {
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
-                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
-                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.arm64;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86;
+//                      requires org.bytedeco.${javacpp.moduleId}.android.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires org.bytedeco.${javacpp.moduleId}.linux.x86_64;
                       requires org.bytedeco.${javacpp.moduleId}.linux.armhf;