Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add static to platform requires #436

Merged
merged 2 commits into from
Nov 16, 2020
Merged

Add static to platform requires #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c207c37
Add static to platform requires
HGuillemet Nov 15, 2020
6be314f
Update CHANGELOG.md
saudet Nov 16, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
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
View file
Open in desktop
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