Skip to content

Commit

Permalink
Upgrade ASM to 7.0 for official support of Java 11
Browse files Browse the repository at this point in the history
  • Loading branch information
Godin authored and marchof committed Oct 29, 2018
1 parent edbcb26 commit 40b9c34
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 14 deletions.
12 changes: 4 additions & 8 deletions .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ case "$JDK" in
10)
install_jdk $JDK10_URL
;;
11-ea)
install_jdk $JDK11_EA_URL
11)
install_jdk $JDK11_URL
;;
12-ea)
install_jdk $JDK12_EA_URL
Expand Down Expand Up @@ -93,12 +93,8 @@ case "$JDK" in
mvn -V -B -e verify -Djdk.version=${JDK} -Dbytecode.version=${JDK} -Decj=${ECJ:-} --toolchains=./.travis/travis-toolchains.xml \
--settings=./.travis/settings.xml
;;
10)
mvn -V -B -e verify -Dbytecode.version=10 \
--settings=./.travis/settings.xml
;;
11-ea)
mvn -V -B -e verify -Dbytecode.version=11 \
10 | 11)
mvn -V -B -e verify -Dbytecode.version=${JDK} \
--settings=./.travis/settings.xml
;;
12-ea)
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ env:
ECJ=true
- JDK=9
- JDK=10
- JDK=11-ea
- JDK=11
- JDK=12-ea

script: ./.travis.sh
2 changes: 1 addition & 1 deletion org.jacoco.build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
<argLine>${jvm.args}</argLine>

<!-- Dependencies versions -->
<asm.version>6.2.1</asm.version>
<asm.version>7.0</asm.version>
<ant.version>1.7.1</ant.version>
<args4j.version>2.0.28</args4j.version>
<junit.version>4.8.2</junit.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ private static int determineType(final InputStream in) throws IOException {
case Opcodes.V9:
case Opcodes.V10:
case Opcodes.V11:
case Opcodes.V11 | Opcodes.V_PREVIEW_EXPERIMENTAL:
case Opcodes.V11 | Opcodes.V_PREVIEW:
case Opcodes.V12:
case Opcodes.V12 | Opcodes.V_PREVIEW_EXPERIMENTAL:
case Opcodes.V12 | Opcodes.V_PREVIEW:
return CLASSFILE;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private InstrSupport() {
}

/** ASM API version */
public static final int ASM_API_VERSION = Opcodes.ASM7_EXPERIMENTAL;
public static final int ASM_API_VERSION = Opcodes.ASM7;

// === Data Field ===

Expand Down
8 changes: 8 additions & 0 deletions org.jacoco.doc/docroot/doc/changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,19 @@ <h2>Snapshot Build @qualified.bundle.version@ (@build.date@)</h2>

<h3>New Features</h3>
<ul>
<li>JaCoCo now officially supports Java 11
(GitHub <a href="https://github.com/jacoco/jacoco/issues/760">#760</a>).</li>
<li>Branch added by the Kotlin compiler for "unsafe" cast operator is filtered
out during generation of report
(GitHub <a href="https://github.com/jacoco/jacoco/issues/761">#761</a>).</li>
</ul>

<h3>Non-functional Changes</h3>
<ul>
<li>JaCoCo now depends on ASM 7.0
(GitHub <a href="https://github.com/jacoco/jacoco/issues/760">#760</a>).</li>
</ul>

<h2>Release 0.8.2 (2018/08/21)</h2>

<h3>New Features</h3>
Expand Down
2 changes: 1 addition & 1 deletion org.jacoco.doc/docroot/doc/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ <h3>Does JaCoCo have a plug-in for [Eclipse|Netbeans|Whatever...]?</h3>

<h3>What Java versions are supported by JaCoCo?</h3>
<p>
JaCoCo supports Java class files from version 1.0 to 10. However the minimum
JaCoCo supports Java class files from version 1.0 to 11. However the minimum
JRE version required by the JaCoCo runtime (e.g. the agent) and the JaCoCo
tools is 1.5. Also note that class files under test from version 1.6 and above
have to contain valid stackmap frames.
Expand Down

1 comment on commit 40b9c34

@cakeface
Copy link

Choose a reason for hiding this comment

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

πŸ‘ πŸ‘ πŸ‘ πŸ‘ πŸ‘ πŸ‘ πŸ‘

Thanks for adding Java 11 support!

Please sign in to comment.