Commit 08491dc
committed
Perform a major cleanup of Gradle scripts after the translation
* Remove the workarounds for IDEA import from gradle.kts
Without the workarounds, everything still seems to be working
fine, even after invalidating the caches.
* Clarify the opt-ins.
Unify the handling of all opt-ins in the project, and also
add opt-ins for Native that would be widespread otherwise.
Unfortunately, even after that, the IDE still complains about
not having the right opt-in in
kotlinx-coroutines-test/common/test/Helpers.kt.
* Extract the logic of grouping several source sets into a
single shared one.
* Update the kotlinx-coroutines-core build script:
- Utilize the multiplatform hierarchy to avoid defining
extra source sets.
- Reorder the code for readability.
* Fix the IDE failing to find `actual` implementations for jvmCore
by making sure `jvmCoreMain` is only defined when the IDE is not
active. Without a dependency from jvmCoreMain to jvmMain,
`expect` declarations in the IDE complained that they couldn't
find `actual` in the `jvmCore` source-set. For example, this
could be seen in
kotlinx-coroutines-core/common/src/internal/Concurrent.common.kt.
* Fix passing the stressTest system property to tests
Broken in #3966
* kotlinOptions -> compilerOptions1 parent 2bf1519 commit 08491dc
File tree
14 files changed
+109
-198
lines changed- buildSrc/src/main/kotlin
- kotlinx-coroutines-core
- common
- src
- flow/operators
- internal
- test/channels
- jvm/test/flow
- nativeDarwin/src
- native/src
- internal
14 files changed
+109
-198
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | 4 | | |
6 | 5 | | |
7 | 6 | | |
| |||
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
43 | | - | |
44 | | - | |
45 | 42 | | |
46 | 43 | | |
47 | 44 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
1 | 2 | | |
| 3 | + | |
2 | 4 | | |
3 | 5 | | |
4 | 6 | | |
| |||
25 | 27 | | |
26 | 28 | | |
27 | 29 | | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
Lines changed: 24 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
33 | 30 | | |
34 | 31 | | |
35 | 32 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
42 | 53 | | |
43 | 54 | | |
44 | 55 | | |
| |||
Lines changed: 3 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
88 | 88 | | |
89 | 89 | | |
90 | 90 | | |
91 | | - | |
92 | | - | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
| 91 | + | |
100 | 92 | | |
101 | | - | |
102 | 93 | | |
103 | 94 | | |
104 | 95 | | |
105 | 96 | | |
106 | 97 | | |
107 | | - | |
108 | 98 | | |
109 | 99 | | |
110 | | - | |
111 | 100 | | |
112 | 101 | | |
113 | 102 | | |
114 | 103 | | |
| 104 | + | |
115 | 105 | | |
116 | 106 | | |
117 | 107 | | |
| |||
127 | 117 | | |
128 | 118 | | |
129 | 119 | | |
130 | | - | |
131 | | - | |
132 | | - | |
133 | | - | |
134 | | - | |
| 120 | + | |
135 | 121 | | |
0 commit comments