Skip to content

Commit

Permalink
* Replace requires with requires static in JPMS .platform modu…
Browse files Browse the repository at this point in the history
…le (pull #436)
  • Loading branch information
HGuillemet authored and saudet committed Nov 16, 2020
1 parent e473740 commit 77a839e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Replace `requires` with `requires static` in JPMS `.platform` module ([pull #436](https://github.com/bytedeco/javacpp/pull/436))
* Let `Parser` output `Info.javaText` even for template declarations with no instances
* Prevent `Tokenizer` from using `long` literals for unsigned integers of 16 bits or less
* Ensure `Parser` considers `>=` and `<=` as single tokens to prevent failures
Expand Down
28 changes: 14 additions & 14 deletions platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -285,20 +285,20 @@
<moduleInfoSource>
module org.bytedeco.javacpp.platform {
requires transitive org.bytedeco.javacpp;
// requires org.bytedeco.javacpp.android.arm;
// requires org.bytedeco.javacpp.android.arm64;
// requires org.bytedeco.javacpp.android.x86;
// requires org.bytedeco.javacpp.android.x86_64;
requires org.bytedeco.javacpp.ios.arm64;
requires org.bytedeco.javacpp.ios.x86_64;
requires org.bytedeco.javacpp.linux.armhf;
requires org.bytedeco.javacpp.linux.arm64;
requires org.bytedeco.javacpp.linux.ppc64le;
requires org.bytedeco.javacpp.linux.x86;
requires org.bytedeco.javacpp.linux.x86_64;
requires org.bytedeco.javacpp.macosx.x86_64;
requires org.bytedeco.javacpp.windows.x86;
requires org.bytedeco.javacpp.windows.x86_64;
// requires static org.bytedeco.javacpp.android.arm;
// requires static org.bytedeco.javacpp.android.arm64;
// requires static org.bytedeco.javacpp.android.x86;
// requires static org.bytedeco.javacpp.android.x86_64;
requires static org.bytedeco.javacpp.ios.arm64;
requires static org.bytedeco.javacpp.ios.x86_64;
requires static org.bytedeco.javacpp.linux.armhf;
requires static org.bytedeco.javacpp.linux.arm64;
requires static org.bytedeco.javacpp.linux.ppc64le;
requires static org.bytedeco.javacpp.linux.x86;
requires static org.bytedeco.javacpp.linux.x86_64;
requires static org.bytedeco.javacpp.macosx.x86_64;
requires static org.bytedeco.javacpp.windows.x86;
requires static org.bytedeco.javacpp.windows.x86_64;
}
</moduleInfoSource>
</module>
Expand Down

0 comments on commit 77a839e

Please sign in to comment.