Skip to content

Commit b056805

Browse files
committed
Update Kotlin to latest 1.5.10 version and do not run tests on Java 16+
Kotlin kapt currently does not work correctly with Java 16+. See https://youtrack.jetbrains.com/issue/KT-45545 for more info
1 parent 6f21c8f commit b056805

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

mapstruct-kotlin-gradle/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
22

33
plugins {
4-
kotlin("jvm") version "1.3.61"
5-
kotlin("kapt") version "1.3.61"
4+
kotlin("jvm") version "1.5.10"
5+
kotlin("kapt") version "1.5.10"
66
}
77

88
group = "org.mapstruct.examples"
@@ -28,4 +28,4 @@ tasks.withType<KotlinCompile> {
2828

2929
val test by tasks.getting(Test::class) {
3030
useJUnitPlatform { }
31-
}
31+
}

mapstruct-kotlin/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@
99
<version>1.0.0-SNAPSHOT</version>
1010
<packaging>jar</packaging>
1111

12-
<name>Sample application demonstration the use of MapStruct and Kotlin</name>
13-
1412
<properties>
1513
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1614

17-
<kotlin.version>1.2.51</kotlin.version>
15+
<kotlin.version>1.5.10</kotlin.version>
1816
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
1917
<mapstruct.version>1.4.2.Final</mapstruct.version>
2018
</properties>

pom.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<module>mapstruct-spi-accessor-naming</module>
2626
<module>mapstruct-protobuf3</module>
2727
<module>mapstruct-updatemethods-1</module>
28-
<module>mapstruct-kotlin</module>
2928
<module>mapstruct-jpa-child-parent</module>
3029
<module>mapstruct-lookup-entity-with-id</module>
3130
<module>mapstruct-metadata-with-annotations</module>
@@ -53,5 +52,18 @@
5352
<module>mapstruct-quarkus</module>
5453
</modules>
5554
</profile>
55+
<profile>
56+
<id>java16-</id>
57+
<activation>
58+
<jdk>(,16)</jdk>
59+
</activation>
60+
<modules>
61+
<!--
62+
Kotlin kapt currently has problems on Java 16+.
63+
See https://youtrack.jetbrains.com/issue/KT-45545
64+
-->
65+
<module>mapstruct-kotlin</module>
66+
</modules>
67+
</profile>
5668
</profiles>
5769
</project>

0 commit comments

Comments
 (0)