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.

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

Support minimum JDK of 11+ and minimum of Android API 33+ #709 #714

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
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
18 changes: 2 additions & 16 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -323,27 +323,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<release>9</release>
<release>11</release>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

define maven.compiler.release and maven.compiler.testRelease properties and remove this line (and the one for javadoc) instead

<createMissingPackageInfoClass>false</createMissingPackageInfoClass>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
<showWarnings>true</showWarnings>
</configuration>
<executions>
<execution>
<id>base-compile</id>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<release>8</release>
<excludes>
<exclude>module-info.java</exclude>
</excludes>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
Expand Down Expand Up @@ -379,7 +365,7 @@
osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.mail.util.StreamProvider)";
osgi.serviceloader="jakarta.mail.util.StreamProvider";
cardinality:=multiple;resolution:=optional,
osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=11))"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line can be removed (used to be a workaround)

]]>
</Require-Capability>
</instructions>
Expand Down