Commit f54199b
committed
[compiler] Instruct the JavaBuilder to not run without outright disabling it
#SCL-22172 fixed
- By providing a unique Java compiler id that does not match any Java compiler implementation in the platform, we are able to tell the JPS JavaBuilder to not run in Zinc Scala projects, without disabling it.
- This also prevents the disabling of the KotlinBuilder in Zinc Scala projects, although, we need to do a bit more work to make this fully supported, as Zinc does not guarantee incremental compilation support for Scala and Kotlin.
- This change prevents the disabling of the GradleResourcesBuilder in gradle Scala projects that use the Zinc incremental compiler.1 parent e5d2170 commit f54199b
File tree
2 files changed
+22
-7
lines changed- scala/compiler-jps/src/org/jetbrains/jps/incremental/scala
2 files changed
+22
-7
lines changedLines changed: 22 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| 10 | + | |
10 | 11 | | |
11 | 12 | | |
12 | 13 | | |
| |||
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
34 | 50 | | |
35 | 51 | | |
36 | 52 | | |
| |||
156 | 172 | | |
157 | 173 | | |
158 | 174 | | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
159 | 181 | | |
Lines changed: 0 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
| |||
24 | 23 | | |
25 | 24 | | |
26 | 25 | | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | 26 | | |
34 | 27 | | |
35 | 28 | | |
| |||
0 commit comments