Commit 64049fc
authored
Remove subprojects logic in favour of convention plugins. (#1386)
* Remove subprojects logic in favour of convention plugins.
Should be a no-op for Gradle builds and definitely a no-op
everywhere else. I didn't manage to test signing still works
but will do at some point.
No changes in the logic of what is applied to each project and
I've kept the convention plugins in Groovy for now for ease
of review.
This is unfortunately a slightly large change but should be
straightforward to review and unlocks the path to other,
smaller, incremental gradle improvements.
Planned next steps (in no particular order):
* Move the NativeBuildInfo logic to a plugin and support ARM Linux.
* Simplify boringssl and property file logic
* Migrate to a recent Gradle
* Use recent Gradle toolchain logic to simplify native builds
* Simplify JVM task logic
* Typos.
* Add missing evaluationDependsOn.
This was a latent bug all along. When Android SDK is present,
android/build.gradle already contains this so openjdk was
getting it that way. No idea why it was working on non-SDK
builds though...
Note, this is fugly, but it's what we have right now. Once
this PR lands, I will do a smaller follow-up change which
untangles the constants dependency a bit, and when we get
to Gradle 9 we can migrate to "proper" C++ toolchains.
* Fix local uberjar publishing.
Missing boringssl convention plugin.
Also needs explicit mavenLocal() repository, which we should
refactor later to prevent any release accidents.
Tidied up the boringssl convention plugin a bit while I was here.1 parent 9ccfd92 commit 64049fc
23 files changed
Lines changed: 276 additions & 205 deletions
File tree
- android-stub
- android
- benchmark-android
- benchmark-base
- benchmark-graphs
- benchmark-jmh
- build-logic
- src/main/groovy
- constants
- gradle
- libcore-stub
- openjdk-uber
- openjdk
- platform
- testing
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
1 | 6 | | |
2 | 7 | | |
3 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
3 | 6 | | |
4 | 7 | | |
5 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
| 3 | + | |
3 | 4 | | |
4 | 5 | | |
5 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
1 | 6 | | |
2 | 7 | | |
3 | 8 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
| 2 | + | |
| 3 | + | |
2 | 4 | | |
3 | 5 | | |
4 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
0 commit comments