Commit 12f610f
committed
bazel: Fix Bazel 8 WORKSPACE support
There's some rearranging happening here, like moving jar_jar later. But
the main thing is downgrading rules_java to 8.15.2. rules_java 8.16 and
later somehow break protobuf:
```
File ".../external/com_google_protobuf/bazel/private/proto_library_rule.bzl", line 43, column 17, in _get_import_prefix
if not paths.is_normalized(import_prefix):
Error: 'struct' value has no field or method 'is_normalized'
Available attributes: basename, dirname, is_absolute, join, normalize, relativize, replace_extension, split_extension
```
protocolbuffers/protobuf#17687 claims that
this is due to not using bazel_skylib 1.7.0, but protobuf_deps is
defining bazel_skylib to be 1.7.0 and nothing earlier seems to be
defining bazel_skylib. So we'll leave this as a bit of a mystery for
later. rules_java 8.15.2 is still newer than protobuf_deps's 8.6.1.1 parent 7c87bf4 commit 12f610f
2 files changed
+49
-41
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
| 4 | + | |
4 | 5 | | |
5 | | - | |
6 | | - | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
13 | | - | |
14 | | - | |
| 6 | + | |
15 | 7 | | |
16 | 8 | | |
17 | 9 | | |
18 | | - | |
| 10 | + | |
19 | 11 | | |
20 | | - | |
| 12 | + | |
21 | 13 | | |
22 | 14 | | |
23 | 15 | | |
24 | | - | |
| 16 | + | |
25 | 17 | | |
26 | | - | |
| 18 | + | |
27 | 19 | | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | | - | |
| 20 | + | |
34 | 21 | | |
35 | | - | |
36 | | - | |
| 22 | + | |
37 | 23 | | |
38 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
39 | 27 | | |
40 | 28 | | |
41 | 29 | | |
42 | 30 | | |
43 | 31 | | |
44 | | - | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | 32 | | |
49 | 33 | | |
50 | 34 | | |
| |||
55 | 39 | | |
56 | 40 | | |
57 | 41 | | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
58 | 51 | | |
59 | 52 | | |
60 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | 17 | | |
25 | | - | |
26 | 18 | | |
27 | 19 | | |
28 | 20 | | |
29 | | - | |
30 | | - | |
31 | | - | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
32 | 28 | | |
33 | 29 | | |
34 | 30 | | |
35 | 31 | | |
36 | 32 | | |
37 | 33 | | |
38 | 34 | | |
39 | | - | |
| 35 | + | |
40 | 36 | | |
41 | | - | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
42 | 40 | | |
43 | | - | |
| 41 | + | |
44 | 42 | | |
45 | 43 | | |
46 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
47 | 53 | | |
48 | 54 | | |
49 | 55 | | |
50 | 56 | | |
51 | 57 | | |
52 | 58 | | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
53 | 68 | | |
54 | 69 | | |
55 | 70 | | |
| |||
0 commit comments