From 338fd9300f9c850b5684afa49ca28f67bd2e297d Mon Sep 17 00:00:00 2001
From: Evgeny Mandrikov <mandrikov@gmail.com>
Date: Tue, 4 May 2021 12:33:04 +0200
Subject: [PATCH] Upgrade Kotlin to 1.5.0

---
 .../pom.xml                                   |  6 +-
 .../kotlin/KotlinDefaultMethodsTest.java      |  6 ++
 .../targets/KotlinControlStructuresTarget.kt  |  2 +-
 .../kotlin/targets/KotlinDataClassTarget.kt   |  4 +-
 .../targets/KotlinWhenExpressionTarget.kt     |  8 +--
 org.jacoco.core.test.validation/pom.xml       | 71 +++++++++++++++----
 org.jacoco.doc/docroot/doc/build.html         | 10 +--
 7 files changed, 75 insertions(+), 32 deletions(-)

diff --git a/org.jacoco.core.test.validation.kotlin/pom.xml b/org.jacoco.core.test.validation.kotlin/pom.xml
index 0f3cae74a1..013a6ac504 100644
--- a/org.jacoco.core.test.validation.kotlin/pom.xml
+++ b/org.jacoco.core.test.validation.kotlin/pom.xml
@@ -25,11 +25,7 @@
   <name>JaCoCo :: Test :: Core :: Validation Kotlin</name>
 
   <properties>
-    <!--
-    re-include this module in profiles for JDK 16 and 17 in org.jacoco.core.test.validation
-    once there is version with resolved https://youtrack.jetbrains.com/issue/KT-43704
-    -->
-    <kotlin.version>1.4.20</kotlin.version>
+    <kotlin.version>1.5.0</kotlin.version>
   </properties>
 
   <dependencies>
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java
index d7e53732c0..1cba4a2c0a 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java
@@ -24,4 +24,10 @@ public KotlinDefaultMethodsTest() {
 		super(KotlinDefaultMethodsTarget.class);
 	}
 
+	@Override
+	public void all_missed_instructions_should_have_line_number() {
+		// instructions without line numbers
+		// corresponding to non-executed default implementations
+	}
+
 }
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt
index 16e1f98e49..cc8825df3c 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt
@@ -47,7 +47,7 @@ object KotlinControlStructuresTarget {
 
     private fun missedWhileBlock() {
 
-        while (f()) { // assertPartlyCovered(1, 1)
+        while (f()) { // assertFullyCovered(1, 1)
             nop() // assertNotCovered()
         }
 
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt
index 13c55090bb..67abe0f9aa 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt
@@ -20,9 +20,9 @@ import org.jacoco.core.test.validation.targets.Stubs.nop
 object KotlinDataClassTarget {
 
     data class DataClass( // assertFullyCovered()
-            val valNoRead: Int, // assertNotCovered()
+            val valNoRead: Int, // assertPartlyCovered()
             val valRead: Int,  // assertFullyCovered()
-            var varNoReadNoWrite: Int, // assertNotCovered()
+            var varNoReadNoWrite: Int, // assertPartlyCovered()
             var varNoWrite: Int, // assertPartlyCovered()
             var varNoRead: Int, // assertPartlyCovered()
             var varReadWrite: Int  // assertFullyCovered()
diff --git a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
index 13f7e20d1e..09572d257c 100644
--- a/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
+++ b/org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
@@ -30,8 +30,8 @@ object KotlinWhenExpressionTarget {
     @Suppress("REDUNDANT_ELSE_IN_WHEN")
     private fun whenSealedRedundantElse(p: Sealed): Int = when (p) { // assertFullyCovered()
         is Sealed.Sealed1 -> 1 // assertFullyCovered(0, 2)
-        is Sealed.Sealed2 -> 2 // assertFullyCovered(1, 1)
-        else -> throw NoWhenBranchMatchedException() // assertNotCovered()
+        is Sealed.Sealed2 -> 2 // assertFullyCovered(0, 0)
+        else -> throw NoWhenBranchMatchedException() // assertEmpty()
     } // assertFullyCovered()
 
     private enum class Enum {
@@ -44,10 +44,10 @@ object KotlinWhenExpressionTarget {
     } // assertFullyCovered()
 
     @Suppress("REDUNDANT_ELSE_IN_WHEN")
-    private fun whenEnumRedundantElse(p: Enum): Int = when (p) { // assertFullyCovered(1, 2)
+    private fun whenEnumRedundantElse(p: Enum): Int = when (p) { // assertFullyCovered(0, 2)
         Enum.A -> 1 // assertFullyCovered()
         Enum.B -> 2 // assertFullyCovered()
-        else -> throw NoWhenBranchMatchedException() // assertNotCovered()
+        else -> throw NoWhenBranchMatchedException() // assertEmpty()
     } // assertFullyCovered()
 
     private fun whenString(p: String): Int = when (p) { // assertFullyCovered(0, 7)
diff --git a/org.jacoco.core.test.validation/pom.xml b/org.jacoco.core.test.validation/pom.xml
index f8f081f3ca..44dc4c8602 100644
--- a/org.jacoco.core.test.validation/pom.xml
+++ b/org.jacoco.core.test.validation/pom.xml
@@ -32,7 +32,8 @@
 
   <properties>
     <jacoco.skip>true</jacoco.skip>
-    <groovy.targetBytecode>${maven.compiler.target}</groovy.targetBytecode>
+    <kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
+    <groovy.targetBytecode>1.8</groovy.targetBytecode>
   </properties>
 
   <profiles>
@@ -64,6 +65,9 @@
           <value>6</value>
         </property>
       </activation>
+      <properties>
+        <kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
+      </properties>
       <modules>
         <module>../org.jacoco.core.test.validation.kotlin</module>
       </modules>
@@ -90,6 +94,9 @@
           <value>7</value>
         </property>
       </activation>
+      <properties>
+        <kotlin.compiler.jvmTarget>1.7</kotlin.compiler.jvmTarget>
+      </properties>
       <modules>
         <module>../org.jacoco.core.test.validation.kotlin</module>
         <module>../org.jacoco.core.test.validation.java7</module>
@@ -111,9 +118,22 @@
     </profile>
 
     <profile>
-      <id>java8-bytecode</id>
+      <id>default</id>
       <activation>
         <activeByDefault>true</activeByDefault>
+      </activation>
+      <modules>
+        <module>../org.jacoco.core.test.validation.kotlin</module>
+        <module>../org.jacoco.core.test.validation.java7</module>
+        <module>../org.jacoco.core.test.validation.java8</module>
+        <module>../org.jacoco.core.test.validation.groovy</module>
+        <module>../org.jacoco.core.test.validation.scala</module>
+      </modules>
+    </profile>
+
+    <profile>
+      <id>java8-bytecode</id>
+      <activation>
         <property>
           <name>bytecode.version</name>
           <value>8</value>
@@ -132,6 +152,26 @@
       </modules>
     </profile>
 
+    <profile>
+      <id>java9-bytecode</id>
+      <activation>
+        <property>
+          <name>bytecode.version</name>
+          <value>9</value>
+        </property>
+      </activation>
+      <properties>
+        <kotlin.compiler.jvmTarget>9</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>9</groovy.targetBytecode>
+      </properties>
+      <modules>
+        <module>../org.jacoco.core.test.validation.kotlin</module>
+        <module>../org.jacoco.core.test.validation.java7</module>
+        <module>../org.jacoco.core.test.validation.java8</module>
+        <module>../org.jacoco.core.test.validation.groovy</module>
+      </modules>
+    </profile>
+
     <profile>
       <id>java10-bytecode</id>
       <activation>
@@ -141,7 +181,8 @@
         </property>
       </activation>
       <properties>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>10</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>10</groovy.targetBytecode>
       </properties>
       <modules>
         <module>../org.jacoco.core.test.validation.kotlin</module>
@@ -160,7 +201,8 @@
         </property>
       </activation>
       <properties>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>11</groovy.targetBytecode>
       </properties>
       <modules>
         <module>../org.jacoco.core.test.validation.kotlin</module>
@@ -180,7 +222,8 @@
         </property>
       </activation>
       <properties>
-        <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
+        <kotlin.compiler.jvmTarget>12</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>12</groovy.targetBytecode>
       </properties>
       <modules>
         <module>../org.jacoco.core.test.validation.kotlin</module>
@@ -200,6 +243,8 @@
         </property>
       </activation>
       <properties>
+        <kotlin.compiler.jvmTarget>14</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>14</groovy.targetBytecode>
         <!-- see respective profile in org.jacoco.build about this override -->
         <maven.compiler.source>14</maven.compiler.source>
         <maven.compiler.target>14</maven.compiler.target>
@@ -223,6 +268,8 @@
         </property>
       </activation>
       <properties>
+        <kotlin.compiler.jvmTarget>15</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>15</groovy.targetBytecode>
         <!-- see respective profile in org.jacoco.build about this override -->
         <maven.compiler.source>15</maven.compiler.source>
         <maven.compiler.target>15</maven.compiler.target>
@@ -246,17 +293,14 @@
         </property>
       </activation>
       <properties>
+        <kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>16</groovy.targetBytecode>
         <!-- see respective profile in org.jacoco.build about this override -->
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
       </properties>
       <modules>
-        <!--
-        kotlin-maven-plugin versions 1.4.20 and 1.4.21 fail
-        due to https://openjdk.java.net/jeps/396
-        see https://youtrack.jetbrains.com/issue/KT-43704
         <module>../org.jacoco.core.test.validation.kotlin</module>
-        -->
         <module>../org.jacoco.core.test.validation.java7</module>
         <module>../org.jacoco.core.test.validation.java8</module>
         <module>../org.jacoco.core.test.validation.java14</module>
@@ -274,17 +318,14 @@
         </property>
       </activation>
       <properties>
+        <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
+        <groovy.targetBytecode>17</groovy.targetBytecode>
         <!-- see respective profile in org.jacoco.build about this override -->
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
       </properties>
       <modules>
-        <!--
-        kotlin-maven-plugin versions 1.4.20 and 1.4.21 fail
-        due to https://openjdk.java.net/jeps/396
-        see https://youtrack.jetbrains.com/issue/KT-43704
         <module>../org.jacoco.core.test.validation.kotlin</module>
-        -->
         <module>../org.jacoco.core.test.validation.java7</module>
         <module>../org.jacoco.core.test.validation.java8</module>
         <module>../org.jacoco.core.test.validation.java14</module>
diff --git a/org.jacoco.doc/docroot/doc/build.html b/org.jacoco.doc/docroot/doc/build.html
index 938a047b9c..5cd0aef3f8 100644
--- a/org.jacoco.doc/docroot/doc/build.html
+++ b/org.jacoco.doc/docroot/doc/build.html
@@ -165,11 +165,11 @@ <h2>Compilation and testing with different JDKs</h2>
     <td>6</td>
     <td>6</td>
     <td>6</td>
-    <td>7</td>
-    <td>7</td>
-    <td>7</td>
-    <td>7</td>
-    <td>7</td>
+    <td>6</td>
+    <td>6</td>
+    <td>6</td>
+    <td>6</td>
+    <td>6</td>
   </tr>
   <tr>
     <td>all other modules</td>