Skip to content

Commit 3333dba

Browse files
GodinGodin
committed
Upgrade Kotlin to 1.5.0
1 parent 29a2890 commit 3333dba

File tree

7 files changed

+79
-32
lines changed

7 files changed

+79
-32
lines changed

‎org.jacoco.core.test.validation.kotlin/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@
2525
<name>JaCoCo :: Test :: Core :: Validation Kotlin</name>
2626

2727
<properties>
28-
<!--
29-
re-include this module in profiles for JDK 16 and 17 in org.jacoco.core.test.validation
30-
once there is version with resolved https://youtrack.jetbrains.com/issue/KT-43704
31-
-->
32-
<kotlin.version>1.4.20</kotlin.version>
28+
<kotlin.version>1.5.0</kotlin.version>
3329
</properties>
3430

3531
<dependencies>

‎org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/KotlinDefaultMethodsTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@ public KotlinDefaultMethodsTest() {
2424
super(KotlinDefaultMethodsTarget.class);
2525
}
2626

27+
@Override
28+
public void all_missed_instructions_should_have_line_number() {
29+
// instructions without line numbers
30+
// corresponding to non-executed default implementations
31+
}
32+
2733
}

‎org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinControlStructuresTarget.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object KotlinControlStructuresTarget {
4747

4848
private fun missedWhileBlock() {
4949

50-
while (f()) { // assertPartlyCovered(1, 1)
50+
while (f()) { // assertFullyCovered(1, 1)
5151
nop() // assertNotCovered()
5252
}
5353

‎org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinDataClassTarget.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import org.jacoco.core.test.validation.targets.Stubs.nop
2020
object KotlinDataClassTarget {
2121

2222
data class DataClass( // assertFullyCovered()
23-
val valNoRead: Int, // assertNotCovered()
23+
val valNoRead: Int, // assertPartlyCovered()
2424
val valRead: Int, // assertFullyCovered()
25-
var varNoReadNoWrite: Int, // assertNotCovered()
25+
var varNoReadNoWrite: Int, // assertPartlyCovered()
2626
var varNoWrite: Int, // assertPartlyCovered()
2727
var varNoRead: Int, // assertPartlyCovered()
2828
var varReadWrite: Int // assertFullyCovered()

‎org.jacoco.core.test.validation.kotlin/src/org/jacoco/core/test/validation/kotlin/targets/KotlinWhenExpressionTarget.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ object KotlinWhenExpressionTarget {
3030
@Suppress("REDUNDANT_ELSE_IN_WHEN")
3131
private fun whenSealedRedundantElse(p: Sealed): Int = when (p) { // assertFullyCovered()
3232
is Sealed.Sealed1 -> 1 // assertFullyCovered(0, 2)
33-
is Sealed.Sealed2 -> 2 // assertFullyCovered(1, 1)
34-
else -> throw NoWhenBranchMatchedException() // assertNotCovered()
33+
is Sealed.Sealed2 -> 2 // assertFullyCovered(0, 0)
34+
else -> throw NoWhenBranchMatchedException() // assertEmpty()
3535
} // assertFullyCovered()
3636

3737
private enum class Enum {
@@ -44,10 +44,10 @@ object KotlinWhenExpressionTarget {
4444
} // assertFullyCovered()
4545

4646
@Suppress("REDUNDANT_ELSE_IN_WHEN")
47-
private fun whenEnumRedundantElse(p: Enum): Int = when (p) { // assertFullyCovered(1, 2)
47+
private fun whenEnumRedundantElse(p: Enum): Int = when (p) { // assertFullyCovered(0, 2)
4848
Enum.A -> 1 // assertFullyCovered()
4949
Enum.B -> 2 // assertFullyCovered()
50-
else -> throw NoWhenBranchMatchedException() // assertNotCovered()
50+
else -> throw NoWhenBranchMatchedException() // assertEmpty()
5151
} // assertFullyCovered()
5252

5353
private fun whenString(p: String): Int = when (p) { // assertFullyCovered(0, 7)

‎org.jacoco.core.test.validation/pom.xml

Lines changed: 60 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232

3333
<properties>
3434
<jacoco.skip>true</jacoco.skip>
35-
<groovy.targetBytecode>${maven.compiler.target}</groovy.targetBytecode>
35+
36+
<!-- when bytecode.version not specified -->
37+
<kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
38+
<groovy.targetBytecode>1.8</groovy.targetBytecode>
3639
</properties>
3740

3841
<profiles>
@@ -64,6 +67,9 @@
6467
<value>6</value>
6568
</property>
6669
</activation>
70+
<properties>
71+
<kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
72+
</properties>
6773
<modules>
6874
<module>../org.jacoco.core.test.validation.kotlin</module>
6975
</modules>
@@ -90,6 +96,10 @@
9096
<value>7</value>
9197
</property>
9298
</activation>
99+
<properties>
100+
<!-- Kotlin compiler doesn't support 1.7 -->
101+
<kotlin.compiler.jvmTarget>1.6</kotlin.compiler.jvmTarget>
102+
</properties>
93103
<modules>
94104
<module>../org.jacoco.core.test.validation.kotlin</module>
95105
<module>../org.jacoco.core.test.validation.java7</module>
@@ -111,9 +121,22 @@
111121
</profile>
112122

113123
<profile>
114-
<id>java8-bytecode</id>
124+
<id>default</id>
115125
<activation>
116126
<activeByDefault>true</activeByDefault>
127+
</activation>
128+
<modules>
129+
<module>../org.jacoco.core.test.validation.kotlin</module>
130+
<module>../org.jacoco.core.test.validation.java7</module>
131+
<module>../org.jacoco.core.test.validation.java8</module>
132+
<module>../org.jacoco.core.test.validation.groovy</module>
133+
<module>../org.jacoco.core.test.validation.scala</module>
134+
</modules>
135+
</profile>
136+
137+
<profile>
138+
<id>java8-bytecode</id>
139+
<activation>
117140
<property>
118141
<name>bytecode.version</name>
119142
<value>8</value>
@@ -132,6 +155,26 @@
132155
</modules>
133156
</profile>
134157

158+
<profile>
159+
<id>java9-bytecode</id>
160+
<activation>
161+
<property>
162+
<name>bytecode.version</name>
163+
<value>9</value>
164+
</property>
165+
</activation>
166+
<properties>
167+
<kotlin.compiler.jvmTarget>9</kotlin.compiler.jvmTarget>
168+
<groovy.targetBytecode>9</groovy.targetBytecode>
169+
</properties>
170+
<modules>
171+
<module>../org.jacoco.core.test.validation.kotlin</module>
172+
<module>../org.jacoco.core.test.validation.java7</module>
173+
<module>../org.jacoco.core.test.validation.java8</module>
174+
<module>../org.jacoco.core.test.validation.groovy</module>
175+
</modules>
176+
</profile>
177+
135178
<profile>
136179
<id>java10-bytecode</id>
137180
<activation>
@@ -141,7 +184,8 @@
141184
</property>
142185
</activation>
143186
<properties>
144-
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
187+
<kotlin.compiler.jvmTarget>10</kotlin.compiler.jvmTarget>
188+
<groovy.targetBytecode>10</groovy.targetBytecode>
145189
</properties>
146190
<modules>
147191
<module>../org.jacoco.core.test.validation.kotlin</module>
@@ -160,7 +204,8 @@
160204
</property>
161205
</activation>
162206
<properties>
163-
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
207+
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
208+
<groovy.targetBytecode>11</groovy.targetBytecode>
164209
</properties>
165210
<modules>
166211
<module>../org.jacoco.core.test.validation.kotlin</module>
@@ -180,7 +225,8 @@
180225
</property>
181226
</activation>
182227
<properties>
183-
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
228+
<kotlin.compiler.jvmTarget>12</kotlin.compiler.jvmTarget>
229+
<groovy.targetBytecode>12</groovy.targetBytecode>
184230
</properties>
185231
<modules>
186232
<module>../org.jacoco.core.test.validation.kotlin</module>
@@ -200,6 +246,8 @@
200246
</property>
201247
</activation>
202248
<properties>
249+
<kotlin.compiler.jvmTarget>14</kotlin.compiler.jvmTarget>
250+
<groovy.targetBytecode>14</groovy.targetBytecode>
203251
<!-- see respective profile in org.jacoco.build about this override -->
204252
<maven.compiler.source>14</maven.compiler.source>
205253
<maven.compiler.target>14</maven.compiler.target>
@@ -223,6 +271,8 @@
223271
</property>
224272
</activation>
225273
<properties>
274+
<kotlin.compiler.jvmTarget>15</kotlin.compiler.jvmTarget>
275+
<groovy.targetBytecode>15</groovy.targetBytecode>
226276
<!-- see respective profile in org.jacoco.build about this override -->
227277
<maven.compiler.source>15</maven.compiler.source>
228278
<maven.compiler.target>15</maven.compiler.target>
@@ -246,17 +296,14 @@
246296
</property>
247297
</activation>
248298
<properties>
299+
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
300+
<groovy.targetBytecode>16</groovy.targetBytecode>
249301
<!-- see respective profile in org.jacoco.build about this override -->
250302
<maven.compiler.source>16</maven.compiler.source>
251303
<maven.compiler.target>16</maven.compiler.target>
252304
</properties>
253305
<modules>
254-
<!--
255-
kotlin-maven-plugin versions 1.4.20 and 1.4.21 fail
256-
due to https://openjdk.java.net/jeps/396
257-
see https://youtrack.jetbrains.com/issue/KT-43704
258306
<module>../org.jacoco.core.test.validation.kotlin</module>
259-
-->
260307
<module>../org.jacoco.core.test.validation.java7</module>
261308
<module>../org.jacoco.core.test.validation.java8</module>
262309
<module>../org.jacoco.core.test.validation.java14</module>
@@ -274,17 +321,15 @@
274321
</property>
275322
</activation>
276323
<properties>
324+
<!-- Kotlin compiler 1.5.0 doesn't support 17 -->
325+
<kotlin.compiler.jvmTarget>16</kotlin.compiler.jvmTarget>
326+
<groovy.targetBytecode>17</groovy.targetBytecode>
277327
<!-- see respective profile in org.jacoco.build about this override -->
278328
<maven.compiler.source>17</maven.compiler.source>
279329
<maven.compiler.target>17</maven.compiler.target>
280330
</properties>
281331
<modules>
282-
<!--
283-
kotlin-maven-plugin versions 1.4.20 and 1.4.21 fail
284-
due to https://openjdk.java.net/jeps/396
285-
see https://youtrack.jetbrains.com/issue/KT-43704
286332
<module>../org.jacoco.core.test.validation.kotlin</module>
287-
-->
288333
<module>../org.jacoco.core.test.validation.java7</module>
289334
<module>../org.jacoco.core.test.validation.java8</module>
290335
<module>../org.jacoco.core.test.validation.java14</module>

‎org.jacoco.doc/docroot/doc/build.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ <h2>Compilation and testing with different JDKs</h2>
165165
<td>6</td>
166166
<td>6</td>
167167
<td>6</td>
168-
<td>7</td>
169-
<td>7</td>
170-
<td>7</td>
171-
<td>7</td>
172-
<td>7</td>
168+
<td>6</td>
169+
<td>6</td>
170+
<td>6</td>
171+
<td>6</td>
172+
<td>6</td>
173173
</tr>
174174
<tr>
175175
<td>all other modules</td>

0 commit comments

Comments
 (0)