Skip to content

Commit 7998462

Browse files
ilya-glion7
authored andcommitted
Fix Gradle project import in IDEA 2021.2
The problem was in an invalid resources directory path with a trailing space.
1 parent 77fd1a3 commit 7998462

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

core/build.gradle.kts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ base {
1818
}
1919

2020
//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
2322
val serializationVersion: String by project
2423

2524
kotlin {
@@ -54,7 +53,7 @@ kotlin {
5453
compilations.all {
5554
kotlinOptions {
5655
jvmTarget = "1.8"
57-
jdkHome = JDK_11
56+
jdkHome = JDK_8
5857
}
5958
}
6059

@@ -99,7 +98,7 @@ kotlin {
9998
val suffix = name.substring(suffixIndex).toLowerCase(Locale.ROOT).takeIf { it != "main" }
10099
// println("SOURCE_SET: $name")
101100
kotlin.srcDir("$targetName/${suffix ?: "src"}")
102-
resources.srcDir("$targetName/${suffix?.let { it + "Resources " } ?: "resources"}")
101+
resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}")
103102
languageSettings.apply {
104103
// progressiveMode = true
105104
useExperimentalAnnotation("kotlin.Experimental")
@@ -199,7 +198,7 @@ kotlin {
199198
dependencies {
200199
api("org.jetbrains.kotlin:kotlin-stdlib-js")
201200
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"))
203202
}
204203
}
205204

@@ -294,5 +293,3 @@ task("downloadWindowsZonesMapping") {
294293
}
295294
}
296295
}
297-
298-
Java9Modularity.configureJava9ModuleInfo(project)

serialization/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ kotlin {
5959
val targetName = name.substring(0, suffixIndex)
6060
val suffix = name.substring(suffixIndex).toLowerCase(Locale.ROOT).takeIf { it != "main" }
6161
kotlin.srcDir("$targetName/${suffix ?: "src"}")
62-
resources.srcDir("$targetName/${suffix?.let { it + "Resources "} ?: "resources"}")
62+
resources.srcDir("$targetName/${suffix?.let { it + "Resources" } ?: "resources"}")
6363
languageSettings.apply {
6464
useExperimentalAnnotation("kotlin.Experimental")
6565
}

0 commit comments

Comments
 (0)