|
18 | 18 | }
|
19 | 19 |
|
20 | 20 | //val JDK_6: String by project
|
21 |
| -//val JDK_8: String by project |
22 |
| -val JDK_11: String by project |
| 21 | +val JDK_8: String by project |
23 | 22 | val serializationVersion: String by project
|
24 | 23 |
|
25 | 24 | kotlin {
|
@@ -54,7 +53,7 @@ kotlin {
|
54 | 53 | compilations.all {
|
55 | 54 | kotlinOptions {
|
56 | 55 | jvmTarget = "1.8"
|
57 |
| - jdkHome = JDK_11 |
| 56 | + jdkHome = JDK_8 |
58 | 57 | }
|
59 | 58 | }
|
60 | 59 |
|
@@ -99,7 +98,7 @@ kotlin {
|
99 | 98 | val suffix = name.substring(suffixIndex).toLowerCase(Locale.ROOT).takeIf { it != "main" }
|
100 | 99 | // println("SOURCE_SET: $name")
|
101 | 100 | kotlin.srcDir("$targetName/${suffix ?: "src"}")
|
102 |
| - resources.srcDir("$targetName/${suffix?.let { it + "Resources " } ?: "resources"}") |
| 101 | + resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}") |
103 | 102 | languageSettings.apply {
|
104 | 103 | // progressiveMode = true
|
105 | 104 | useExperimentalAnnotation("kotlin.Experimental")
|
@@ -199,7 +198,7 @@ kotlin {
|
199 | 198 | dependencies {
|
200 | 199 | api("org.jetbrains.kotlin:kotlin-stdlib-js")
|
201 | 200 | api("org.jetbrains.kotlinx:kotlinx-serialization-core:$serializationVersion")
|
202 |
| - implementation(npm("@js-joda/core", "3.2.0")) |
| 201 | + implementation(npm("@js-joda/core", "3.2.0")) |
203 | 202 | }
|
204 | 203 | }
|
205 | 204 |
|
@@ -294,5 +293,3 @@ task("downloadWindowsZonesMapping") {
|
294 | 293 | }
|
295 | 294 | }
|
296 | 295 | }
|
297 |
| - |
298 |
| -Java9Modularity.configureJava9ModuleInfo(project) |
0 commit comments