@@ -51,13 +51,9 @@ object Common {
5151 val projectDirectoriesSettings : Seq [Setting [? ]] = Seq (
5252 // production sources
5353 Compile / sourceDirectory := baseDirectory.value / " src" , // we put all source files in <subproject_dir>/src
54- Compile / scalaSource := (Compile / sourceDirectory).value, // all Scala sources are in the same directory
55- Compile / javaSource := (Compile / sourceDirectory).value, // all Java sources are in the same directory
5654 Compile / unmanagedSourceDirectories := Seq ((Compile / sourceDirectory).value),
5755 // test sources
5856 Test / sourceDirectory := baseDirectory.value / " test" , // we put all test source files in <subproject_dir>/test
59- Test / scalaSource := (Test / sourceDirectory).value, // all Scala test sources are in the same directory
60- Test / javaSource := (Test / sourceDirectory).value, // all Java test sources are in the same directory
6157 Test / unmanagedSourceDirectories := Seq ((Test / sourceDirectory).value),
6258 // NOTE: this almost duplicates the logic from sbt-idea-plugin (see org.jetbrains.sbtidea.Init)
6359 // but it uses `:=` instead of `+=` to remove standard resource directories, which intersect with source directories
@@ -128,9 +124,7 @@ object Common {
128124 // NOTE: keep versions in sync with ultimate/.idea/kotlinc.xml and community/.idea/kotlinc.xml
129125 kotlinVersion := " 1.9.22" ,
130126 kotlincJvmTarget := " 17" ,
131- kotlinRuntimeProvided := true ,
132- Compile / kotlinSource := (Compile / sourceDirectory).value, // all Kotlin source files are in the same directory as all other sources
133- Test / kotlinSource := (Test / sourceDirectory).value // all Kotlin test source files are in the same directory as all other sources
127+ kotlinRuntimeProvided := true
134128 )
135129 }
136130
0 commit comments