Skip to content

Commit

Permalink
Upgrade Kotlin to 1.9.23 (#1567)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Godin
Godin committed May 1, 2024
1 parent 230937d commit 1ad4a15
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 42 deletions.
4 changes: 2 additions & 2 deletions org.jacoco.core.test.validation.kotlin/pom.xml
View file
Expand Up @@ -25,7 +25,7 @@
<name>JaCoCo :: Test :: Core :: Validation Kotlin</name>

<properties>
<kotlin.version>1.5.0</kotlin.version>
<kotlin.version>1.9.23</kotlin.version>
</properties>

<dependencies>
Expand All @@ -41,7 +41,7 @@
<dependency>
<groupId>org.jetbrains.kotlinx</groupId>
<artifactId>kotlinx-coroutines-core</artifactId>
<version>1.0.1</version>
<version>1.8.0</version>
</dependency>
</dependencies>

Expand Down
3 changes: 2 additions & 1 deletion ...n.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt
View file
Expand Up @@ -63,8 +63,9 @@ object KotlinWhenExpressionTarget {
/**
* Unlike [whenString]
* in this example first case is the only case with biggest hashCode value.
* FIXME https://github.com/jacoco/jacoco/issues/1295
*/
private fun whenStringBiggestHashCodeFirst(p: String): Int = when (p) { // assertFullyCovered(0, 6)
private fun whenStringBiggestHashCodeFirst(p: String): Int = when (p) { // assertPartlyCovered(3, 11)
"c" -> 1 // assertFullyCovered()
"b" -> 2 // assertFullyCovered()
"\u0000b" -> 3 // assertFullyCovered()
Expand Down
34 changes: 12 additions & 22 deletions org.jacoco.core.test.validation/pom.xml
View file
Expand Up @@ -34,7 +34,6 @@
<jacoco.skip>true</jacoco.skip>

<!-- when bytecode.version not specified -->
<kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
<groovy.targetBytecode>1.8</groovy.targetBytecode>
</properties>

Expand Down Expand Up @@ -68,10 +67,8 @@
</property>
</activation>
<properties>
<kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
</properties>
<modules>
<module>../org.jacoco.core.test.validation.kotlin</module>
</modules>
</profile>

Expand All @@ -84,7 +81,6 @@
</property>
</activation>
<modules>
<module>../org.jacoco.core.test.validation.kotlin</module>
</modules>
</profile>

Expand All @@ -97,11 +93,8 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 1.7 -->
<kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
</properties>
<modules>
<module>../org.jacoco.core.test.validation.kotlin</module>
<module>../org.jacoco.core.test.validation.java7</module>
</modules>
</profile>
Expand All @@ -115,7 +108,6 @@
</property>
</activation>
<modules>
<module>../org.jacoco.core.test.validation.kotlin</module>
<module>../org.jacoco.core.test.validation.java7</module>
</modules>
</profile>
Expand All @@ -125,6 +117,9 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
</properties>
<modules>
<module>../org.jacoco.core.test.validation.kotlin</module>
<module>../org.jacoco.core.test.validation.java7</module>
Expand Down Expand Up @@ -346,8 +341,7 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 17 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<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>
Expand All @@ -373,8 +367,7 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 18 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<kotlin.compiler.jvmTarget>18</kotlin.compiler.jvmTarget>
<!-- Groovy 3.0.20 does not support compilation into 18 -->
<groovy.targetBytecode>16</groovy.targetBytecode>
<!-- see respective profile in org.jacoco.build about this override -->
Expand All @@ -401,8 +394,7 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 19 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<kotlin.compiler.jvmTarget>19</kotlin.compiler.jvmTarget>
<!-- Groovy 3.0.20 does not support compilation into 19 -->
<groovy.targetBytecode>16</groovy.targetBytecode>
<!-- see respective profile in org.jacoco.build about this override -->
Expand All @@ -429,8 +421,7 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 20 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<kotlin.compiler.jvmTarget>20</kotlin.compiler.jvmTarget>
<!-- Groovy 3.0.20 does not support compilation into 20 -->
<groovy.targetBytecode>16</groovy.targetBytecode>
<!-- see respective profile in org.jacoco.build about this override -->
Expand All @@ -457,8 +448,7 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 21 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
<!-- Groovy 3.0.20 does not support compilation into 21 -->
<groovy.targetBytecode>16</groovy.targetBytecode>
<!-- see respective profile in org.jacoco.build about this override -->
Expand Down Expand Up @@ -486,8 +476,8 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 22 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<!-- Kotlin 1.9.23 doesn't support compilation into 22 -->
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
<!-- Groovy 3.0.20 does not support compilation into 22 -->
<groovy.targetBytecode>16</groovy.targetBytecode>
<!-- see respective profile in org.jacoco.build about this override -->
Expand Down Expand Up @@ -517,8 +507,8 @@
</property>
</activation>
<properties>
<!-- Kotlin 1.5.0 doesn't support compilation into 23 -->
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
<!-- Kotlin 1.9.23 doesn't support compilation into 23 -->
<kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
<!-- Groovy 3.0.20 does not support compilation into 23 -->
<groovy.targetBytecode>16</groovy.targetBytecode>
<!-- see respective profile in org.jacoco.build about this override -->
Expand Down
34 changes: 17 additions & 17 deletions org.jacoco.doc/docroot/doc/build.html
View file
Expand Up @@ -231,23 +231,23 @@ <h2>Compilation and testing with different JDKs</h2>
<tr>
<td>org.jacoco.core.test.validation.kotlin</td>
<td></td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td>6</td>
<td></td>
<td></td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
<td>8</td>
</tr>
<tr>
<td>org.jacoco.core.test.validation.scala</td>
Expand Down

0 comments on commit 1ad4a15

Please sign in to comment.