Merge branch 'master' into kotlin_1_6_suspending_lambda_without_suspe…

…nsion_points
jacoco · May 31, 2024 · 14493cb · 14493cb
2 parents e9a23ca + c98f7bd
commit 14493cb
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 1 deletion.
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
@@ -762,6 +762,27 @@
  </properties>
  </profile>
 
+ <profile>
+ <id>maven-jdk23</id>
+ <activation>
+ <jdk>[23,)</jdk>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalOptions>
+ <!-- https://bugs.openjdk.org/browse/JDK-8324774 -->
+ <option>--no-fonts</option>
+ </additionalOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
  <!--
  Following profile is automatically activated in IntelliJ IDEA
  and used to set the correct Java language level in it
@@ -1035,6 +1056,30 @@
  </properties>
  </profile>
 
+ <profile>
+ <id>jdk23</id>
+ <activation>
+ <property>
+ <name>jdk.version</name>
+ <value>23</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalOptions>
+ <!-- https://bugs.openjdk.org/browse/JDK-8324774 -->
+ <option>--no-fonts</option>
+ </additionalOptions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
  <!-- This profile enables generation of JARs with sources and javadocs -->
  <profile>
  <id>sources</id>

diff --git a/org.jacoco.core.test.validation.kotlin/pom.xml b/org.jacoco.core.test.validation.kotlin/pom.xml
@@ -25,7 +25,7 @@
  <name>JaCoCo :: Test :: Core :: Validation Kotlin</name>
 
  <properties>
- <kotlin.version>1.9.24</kotlin.version>
+ <kotlin.version>2.0.0</kotlin.version>
  </properties>
 
  <dependencies>

diff --git a/...alidation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinWhenExpressionTest.java b/...alidation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinWhenExpressionTest.java
@@ -24,4 +24,9 @@ public KotlinWhenExpressionTest() {
  super(KotlinWhenExpressionTarget.class);
  }
 
+ @Override
+ public void all_missed_instructions_should_have_line_number() {
+ // https://github.com/jacoco/jacoco/issues/1557
+ }
+
 }