|
15 | 15 | */
|
16 | 16 |
|
17 | 17 | import gradle.kotlin.dsl.accessors._9d6accdeac6876c73060866945fb6d8c.java
|
18 |
| -import org.jetbrains.kotlin.gradle.dsl.JvmTarget |
19 | 18 | import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
20 | 19 | import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
21 |
| -import org.jetbrains.kotlin.gradle.dsl.KotlinVersion |
22 | 20 | import org.jetbrains.kotlin.gradle.plugin.KotlinMultiplatformPluginWrapper
|
23 | 21 | import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
|
24 | 22 | import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
25 | 23 | import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
|
| 24 | +import org.modelix.MODELIX_JDK_VERSION |
| 25 | +import org.modelix.MODELIX_JVM_TARGET |
| 26 | +import org.modelix.MODELIX_KOTLIN_API_VERSION |
26 | 27 |
|
27 | 28 | java {
|
28 | 29 | toolchain {
|
29 |
| - languageVersion.set(JavaLanguageVersion.of(11)) |
| 30 | + languageVersion.set(JavaLanguageVersion.of(MODELIX_JDK_VERSION)) |
30 | 31 | }
|
31 | 32 | }
|
32 | 33 |
|
33 |
| -val kotlinApiVersion = KotlinVersion.KOTLIN_1_6 |
34 | 34 | tasks.withType<KotlinCompile>().configureEach {
|
35 | 35 | if (!name.lowercase().contains("test")) {
|
36 | 36 | this.compilerOptions {
|
37 |
| - jvmTarget.set(JvmTarget.JVM_11) |
| 37 | + jvmTarget.set(MODELIX_JVM_TARGET) |
38 | 38 | freeCompilerArgs.addAll(listOf("-Xjvm-default=all-compatibility", "-Xexpect-actual-classes"))
|
39 |
| - apiVersion.set(kotlinApiVersion) |
| 39 | + apiVersion.set(MODELIX_KOTLIN_API_VERSION) |
40 | 40 | }
|
41 | 41 | }
|
42 | 42 | }
|
43 | 43 |
|
44 | 44 | tasks.withType<KotlinJvmCompile>().configureEach {
|
45 | 45 | if (!name.lowercase().contains("test")) {
|
46 | 46 | this.compilerOptions {
|
47 |
| - jvmTarget.set(JvmTarget.JVM_11) |
| 47 | + jvmTarget.set(MODELIX_JVM_TARGET) |
48 | 48 | freeCompilerArgs.addAll(listOf("-Xjvm-default=all-compatibility"))
|
49 |
| - apiVersion.set(kotlinApiVersion) |
| 49 | + apiVersion.set(MODELIX_KOTLIN_API_VERSION) |
50 | 50 | }
|
51 | 51 | }
|
52 | 52 | }
|
53 | 53 |
|
54 | 54 | plugins.withType<KotlinPlatformJvmPlugin> {
|
55 | 55 | extensions.configure<KotlinJvmProjectExtension> {
|
56 |
| - jvmToolchain(11) |
| 56 | + jvmToolchain(MODELIX_JDK_VERSION) |
57 | 57 | compilerOptions {
|
58 |
| - jvmTarget.set(JvmTarget.JVM_11) |
| 58 | + jvmTarget.set(MODELIX_JVM_TARGET) |
59 | 59 | }
|
60 | 60 | }
|
61 | 61 | }
|
62 | 62 |
|
63 | 63 | plugins.withType<KotlinMultiplatformPluginWrapper> {
|
64 | 64 | extensions.configure<KotlinMultiplatformExtension> {
|
65 |
| - jvmToolchain(11) |
| 65 | + jvmToolchain(MODELIX_JDK_VERSION) |
66 | 66 | sourceSets.all {
|
67 | 67 | if (!name.lowercase().contains("test")) {
|
68 | 68 | languageSettings {
|
69 |
| - apiVersion = kotlinApiVersion.version |
| 69 | + apiVersion = MODELIX_KOTLIN_API_VERSION.version |
70 | 70 | }
|
71 | 71 | }
|
72 | 72 | }
|
|
0 commit comments