Skip to content

Commit 192a8d5

Browse files
restingbullrestingbull
committed
Switch to non-deprecated proto rules and update necessary dependencies.
1 parent 1698f4f commit 192a8d5

File tree

10 files changed

+123
-90
lines changed

10 files changed

+123
-90
lines changed

‎.bazelci/presubmit.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
matrix:
33
unittest_platform:
44
- ubuntu2004
5+
- ubuntu1804
56
integration_platform:
67
- ubuntu2004
8+
- ubuntu1804
79
# - macos
810
# - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
911
test_flags:

‎MODULE.bazel

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ maven.install(
5252
artifacts = [
5353
"com.google.code.findbugs:jsr305:3.0.2",
5454
"junit:junit:4.13-beta-3",
55-
"com.google.protobuf:protobuf-java:3.6.0",
56-
"com.google.protobuf:protobuf-java-util:3.6.0",
5755
"com.google.guava:guava:27.1-jre",
5856
"com.google.truth:truth:0.45",
5957
"com.google.auto.service:auto-service:1.1.1",
@@ -99,7 +97,7 @@ maven.override(
9997
use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
10098

10199
bazel_dep(name = "rules_pkg", version = "1.0.1")
102-
bazel_dep(name = "rules_proto", version = "7.0.2")
100+
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
103101
bazel_dep(name = "stardoc", version = "0.7.2", repo_name = "io_bazel_stardoc")
104102

105103
bazel_dep(name = "rules_testing", version = "0.5.0", dev_dependency = True)

‎kotlin/compiler/BUILD.release.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ bzl_library(
2828
name = "compiler",
2929
srcs = glob(["*.bzl"]),
3030
deps = [
31-
"@rules_proto//proto:repositories",
3231
],
3332
)

‎kotlin_rules_maven_install.json

Lines changed: 88 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -788868969,
4-
"__RESOLVED_ARTIFACTS_HASH": 1873973417,
3+
"__INPUT_ARTIFACTS_HASH": -2064659652,
4+
"__RESOLVED_ARTIFACTS_HASH": 30072322,
55
"conflict_resolution": {
66
"com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.2.1-jre"
77
},
@@ -48,13 +48,6 @@
4848
},
4949
"version": "3.0.2"
5050
},
51-
"com.google.code.gson:gson": {
52-
"shasums": {
53-
"jar": "2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32",
54-
"sources": "2d3220d5d936f0a26258aa3b358160741a4557e046a001251e5799c2db0f0d74"
55-
},
56-
"version": "2.7"
57-
},
5851
"com.google.dagger:dagger": {
5952
"shasums": {
6053
"jar": "19680b0f42baa7f9414dacae8663244d323d084a6ee5594ad115a17f3be37c05",
@@ -139,20 +132,6 @@
139132
},
140133
"version": "3.0.0"
141134
},
142-
"com.google.protobuf:protobuf-java": {
143-
"shasums": {
144-
"jar": "8c8a65be83e75ccdcaa21417e303025f1708ea01e8c0a05d6c770e64b6c09ea1",
145-
"sources": "88411bb0333725b27bf53ed4d95785f6f4b541e22e1e27c60c2be8b3115fc5c4"
146-
},
147-
"version": "3.6.0"
148-
},
149-
"com.google.protobuf:protobuf-java-util": {
150-
"shasums": {
151-
"jar": "ad7f8d67674906ce88077fbb233b427b7068991a61af42ce9301990bdf8f3605",
152-
"sources": "a2959842caed6f0b1dbecfaf0e73ef03117416f967c0532c32d092b6e2b98d60"
153-
},
154-
"version": "3.6.0"
155-
},
156135
"com.google.truth:truth": {
157136
"shasums": {
158137
"jar": "0f7dced2a16e55a77e44fc3ff9c5be98d4bf4bb30abc18d78ffd735df950a69f",
@@ -536,11 +515,6 @@
536515
"com.google.j2objc:j2objc-annotations",
537516
"org.checkerframework:checker-qual"
538517
],
539-
"com.google.protobuf:protobuf-java-util": [
540-
"com.google.code.gson:gson",
541-
"com.google.guava:guava",
542-
"com.google.protobuf:protobuf-java"
543-
],
544518
"com.google.truth:truth": [
545519
"com.google.auto.value:auto-value-annotations",
546520
"com.google.errorprone:error_prone_annotations",
@@ -655,9 +629,6 @@
655629
"org.ow2.asm:asm-commons"
656630
]
657631
},
658-
"skipped": [
659-
"com.google.guava:listenablefuture:jar:sources"
660-
],
661632
"packages": {
662633
"com.google.auto.service:auto-service": [
663634
"com.google.auto.service.processor"
@@ -750,15 +721,6 @@
750721
"javax.annotation.concurrent",
751722
"javax.annotation.meta"
752723
],
753-
"com.google.code.gson:gson": [
754-
"com.google.gson",
755-
"com.google.gson.annotations",
756-
"com.google.gson.internal",
757-
"com.google.gson.internal.bind",
758-
"com.google.gson.internal.bind.util",
759-
"com.google.gson.reflect",
760-
"com.google.gson.stream"
761-
],
762724
"com.google.dagger:dagger": [
763725
"dagger",
764726
"dagger.assisted",
@@ -913,13 +875,6 @@
913875
"com.google.j2objc:j2objc-annotations": [
914876
"com.google.j2objc.annotations"
915877
],
916-
"com.google.protobuf:protobuf-java": [
917-
"com.google.protobuf",
918-
"com.google.protobuf.compiler"
919-
],
920-
"com.google.protobuf:protobuf-java-util": [
921-
"com.google.protobuf.util"
922-
],
923878
"com.google.truth:truth": [
924879
"com.google.common.truth"
925880
],
@@ -1463,8 +1418,6 @@
14631418
"com.google.auto:auto-common:jar:sources",
14641419
"com.google.code.findbugs:jsr305",
14651420
"com.google.code.findbugs:jsr305:jar:sources",
1466-
"com.google.code.gson:gson",
1467-
"com.google.code.gson:gson:jar:sources",
14681421
"com.google.dagger:dagger",
14691422
"com.google.dagger:dagger-compiler",
14701423
"com.google.dagger:dagger-compiler:jar:sources",
@@ -1488,10 +1441,6 @@
14881441
"com.google.guava:listenablefuture",
14891442
"com.google.j2objc:j2objc-annotations",
14901443
"com.google.j2objc:j2objc-annotations:jar:sources",
1491-
"com.google.protobuf:protobuf-java",
1492-
"com.google.protobuf:protobuf-java-util",
1493-
"com.google.protobuf:protobuf-java-util:jar:sources",
1494-
"com.google.protobuf:protobuf-java:jar:sources",
14951444
"com.google.truth:truth",
14961445
"com.google.truth:truth:jar:sources",
14971446
"com.googlecode.java-diff-utils:diffutils",
@@ -1598,8 +1547,6 @@
15981547
"com.google.auto:auto-common:jar:sources",
15991548
"com.google.code.findbugs:jsr305",
16001549
"com.google.code.findbugs:jsr305:jar:sources",
1601-
"com.google.code.gson:gson",
1602-
"com.google.code.gson:gson:jar:sources",
16031550
"com.google.dagger:dagger",
16041551
"com.google.dagger:dagger-compiler",
16051552
"com.google.dagger:dagger-compiler:jar:sources",
@@ -1623,10 +1570,6 @@
16231570
"com.google.guava:listenablefuture",
16241571
"com.google.j2objc:j2objc-annotations",
16251572
"com.google.j2objc:j2objc-annotations:jar:sources",
1626-
"com.google.protobuf:protobuf-java",
1627-
"com.google.protobuf:protobuf-java-util",
1628-
"com.google.protobuf:protobuf-java-util:jar:sources",
1629-
"com.google.protobuf:protobuf-java:jar:sources",
16301573
"com.google.truth:truth",
16311574
"com.google.truth:truth:jar:sources",
16321575
"com.googlecode.java-diff-utils:diffutils",
@@ -1733,8 +1676,6 @@
17331676
"com.google.auto:auto-common:jar:sources",
17341677
"com.google.code.findbugs:jsr305",
17351678
"com.google.code.findbugs:jsr305:jar:sources",
1736-
"com.google.code.gson:gson",
1737-
"com.google.code.gson:gson:jar:sources",
17381679
"com.google.dagger:dagger",
17391680
"com.google.dagger:dagger-compiler",
17401681
"com.google.dagger:dagger-compiler:jar:sources",
@@ -1758,10 +1699,6 @@
17581699
"com.google.guava:listenablefuture",
17591700
"com.google.j2objc:j2objc-annotations",
17601701
"com.google.j2objc:j2objc-annotations:jar:sources",
1761-
"com.google.protobuf:protobuf-java",
1762-
"com.google.protobuf:protobuf-java-util",
1763-
"com.google.protobuf:protobuf-java-util:jar:sources",
1764-
"com.google.protobuf:protobuf-java:jar:sources",
17651702
"com.google.truth:truth",
17661703
"com.google.truth:truth:jar:sources",
17671704
"com.googlecode.java-diff-utils:diffutils",
@@ -1856,5 +1793,91 @@
18561793
"org.pantsbuild:jarjar:jar:sources"
18571794
]
18581795
},
1796+
"services": {
1797+
"com.google.auto.service:auto-service": {
1798+
"javax.annotation.processing.Processor": [
1799+
"com.google.auto.service.processor.AutoServiceProcessor"
1800+
]
1801+
},
1802+
"com.google.auto.service:auto-service:jar:sources": {
1803+
"javax.annotation.processing.Processor": [
1804+
"com.google.auto.service.processor.AutoServiceProcessor"
1805+
]
1806+
},
1807+
"com.google.auto.value:auto-value": {
1808+
"autovalue.shaded.kotlinx.metadata.impl.extensions.MetadataExtensions": [
1809+
"autovalue.shaded.kotlinx.metadata.jvm.impl.JvmMetadataExtensions"
1810+
],
1811+
"com.google.auto.value.extension.AutoValueExtension": [
1812+
"com.google.auto.value.extension.memoized.processor.MemoizeExtension",
1813+
"com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension",
1814+
"com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension"
1815+
],
1816+
"com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [
1817+
"com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension",
1818+
"com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension",
1819+
"com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension"
1820+
],
1821+
"javax.annotation.processing.Processor": [
1822+
"com.google.auto.value.extension.memoized.processor.MemoizedValidator",
1823+
"com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator",
1824+
"com.google.auto.value.processor.AutoAnnotationProcessor",
1825+
"com.google.auto.value.processor.AutoBuilderProcessor",
1826+
"com.google.auto.value.processor.AutoOneOfProcessor",
1827+
"com.google.auto.value.processor.AutoValueBuilderProcessor",
1828+
"com.google.auto.value.processor.AutoValueProcessor"
1829+
]
1830+
},
1831+
"com.google.dagger:dagger-compiler": {
1832+
"com.google.devtools.ksp.processing.SymbolProcessorProvider": [
1833+
"dagger.internal.codegen.KspComponentProcessor$Provider"
1834+
],
1835+
"javax.annotation.processing.Processor": [
1836+
"dagger.internal.codegen.ComponentProcessor"
1837+
]
1838+
},
1839+
"com.google.dagger:dagger-spi": {
1840+
"dagger.spi.internal.shaded.androidx.room.jarjarred.kotlin.metadata.internal.extensions.MetadataExtensions": [
1841+
"dagger.spi.internal.shaded.androidx.room.jarjarred.kotlin.metadata.jvm.internal.JvmMetadataExtensions"
1842+
],
1843+
"dagger.spi.internal.shaded.kotlin.metadata.internal.extensions.MetadataExtensions": [
1844+
"dagger.spi.internal.shaded.kotlin.metadata.jvm.internal.JvmMetadataExtensions"
1845+
]
1846+
},
1847+
"com.squareup.moshi:moshi-kotlin-codegen": {
1848+
"com.google.devtools.ksp.processing.SymbolProcessorProvider": [
1849+
"com.squareup.moshi.kotlin.codegen.ksp.JsonClassSymbolProcessorProvider"
1850+
],
1851+
"com.squareup.moshi.kotlinx.metadata.internal.extensions.MetadataExtensions": [
1852+
"com.squareup.moshi.kotlinx.metadata.jvm.internal.JvmMetadataExtensions"
1853+
],
1854+
"javax.annotation.processing.Processor": [
1855+
"com.squareup.moshi.kotlin.codegen.apt.JsonClassCodegenProcessor"
1856+
]
1857+
},
1858+
"dev.zacsweers.autoservice:auto-service-ksp": {
1859+
"com.google.devtools.ksp.processing.SymbolProcessorProvider": [
1860+
"dev.zacsweers.autoservice.ksp.AutoServiceSymbolProcessor$Provider"
1861+
]
1862+
},
1863+
"org.eclipse.sisu:org.eclipse.sisu.inject": {
1864+
"javax.annotation.processing.Processor": [
1865+
"org.eclipse.sisu.space.SisuIndexAPT6"
1866+
]
1867+
},
1868+
"org.jetbrains.kotlin:kotlin-reflect": {
1869+
"kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader": [
1870+
"kotlin.reflect.jvm.internal.impl.serialization.deserialization.builtins.BuiltInsLoaderImpl"
1871+
],
1872+
"kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition": [
1873+
"kotlin.reflect.jvm.internal.impl.load.java.ErasedOverridabilityCondition",
1874+
"kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition",
1875+
"kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition"
1876+
]
1877+
}
1878+
},
1879+
"skipped": [
1880+
"com.google.guava:listenablefuture:jar:sources"
1881+
],
18591882
"version": "2"
18601883
}

‎src/main/kotlin/io/bazel/kotlin/builder/toolchain/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ kt_bootstrap_library(
3131
"//src/main/kotlin/io/bazel/kotlin/plugin:skip-code-gen-lib",
3232
"//src/main/kotlin/io/bazel/kotlin/plugin/jdeps:jdeps-gen-lib",
3333
"//src/main/protobuf:kotlin_model_java_proto",
34-
"@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
35-
"@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
34+
"@com_google_protobuf//:protobuf_java",
35+
"@com_google_protobuf//:protobuf_java_util",
3636
"@kotlin_rules_maven//:javax_inject_javax_inject",
3737
],
3838
)

‎src/main/protobuf/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
2-
load("@rules_proto//proto:defs.bzl", "proto_library")
1+
load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
2+
load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
33

44
package(default_visibility = ["//visibility:public"])
55

‎src/main/starlark/core/repositories/BUILD.release.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ bzl_library(
1919
srcs = glob(["*.bzl"]),
2020
visibility = ["//visibility:public"],
2121
deps = [
22-
"@rules_proto//proto:repositories",
22+
"@com_google_protobuf//proto:repositories",
2323
],
2424
)

‎src/main/starlark/core/repositories/download.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def kt_download_local_dev_dependencies():
2323
Must be called before setup_dependencies in the WORKSPACE.
2424
"""
2525
versions.use_repository(
26-
name = "rules_proto",
26+
name = "com_google_protobuf",
2727
version = versions.RULES_PROTO,
2828
rule = rules_stardoc_repository,
2929
starlark_packages = [

‎src/main/starlark/core/repositories/setup.bzl

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,32 @@
1414

1515
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
1616
load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
17+
load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")
18+
19+
#load("@com_google_protobuf//:protobuf_extra_deps.bzl", "protobuf_extra_deps")
1720
load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
1821
load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
1922
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
2023
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
2124
load("@rules_jvm_external//:defs.bzl", "maven_install")
2225
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
23-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
2426

2527
def kt_configure():
2628
"""Setup dependencies. Must be called AFTER kt_download_local_dev_dependencies() """
2729
rules_cc_dependencies()
2830
rules_cc_toolchains()
2931

30-
rules_proto_dependencies()
31-
rules_proto_toolchains()
32+
protobuf_deps()
33+
maven_install(
34+
name = "protobuf_maven",
35+
fetch_sources = True,
36+
artifacts = PROTOBUF_MAVEN_ARTIFACTS,
37+
repositories = [
38+
"https://maven-central.storage.googleapis.com/repos/central/data/",
39+
"https://maven.google.com",
40+
"https://repo1.maven.org/maven2",
41+
],
42+
)
3243

3344
rules_java_dependencies()
3445
rules_java_toolchains()

0 commit comments

Comments
 (0)