Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update rules_jvm_external to 6.3 #1217

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update rules_jvm_external to 6.3 #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d295d69
Update rules_jvm_external to 6.2
Bencodes Sep 12, 2024
a5bcc1b
Use actual latest version
Bencodes Sep 12, 2024
5b0c3ef
Repin
Bencodes Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
# TODO(bencodes) A bunch of these dependencies need to be marked as dev_dependencies but before we can do that
# we need to sort out a few cases around how these rules are consumed in various ways.

bazel_dep(name = "rules_jvm_external", version = "5.3")
bazel_dep(name = "rules_jvm_external", version = "6.3")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
Expand Down
2 changes: 1 addition & 1 deletion examples/android/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ bazel_dep(name = "rules_robolectric", version = "4.10.3", repo_name = "robolectr
bazel_dep(name = "rules_java", version = "6.4.0")
bazel_dep(name = "platforms", version = "0.0.7")
bazel_dep(name = "rules_kotlin", version = "1.9.5")
bazel_dep(name = "rules_jvm_external", version = "5.3")
bazel_dep(name = "rules_jvm_external", version = "6.3")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
Expand Down
2 changes: 1 addition & 1 deletion examples/multiplex/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")

bazel_dep(name = "rules_java", version = "6.4.0")
bazel_dep(name = "rules_kotlin", version = "1.9.5")
bazel_dep(name = "rules_jvm_external", version = "5.3")
bazel_dep(name = "rules_jvm_external", version = "6.3")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
Expand Down
108 changes: 98 additions & 10 deletions kotlin_rules_maven_install.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -194774941,
"__RESOLVED_ARTIFACTS_HASH": 860729270,
"__INPUT_ARTIFACTS_HASH": -194776319,
"__RESOLVED_ARTIFACTS_HASH": 970994687,
"conflict_resolution": {
"com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.0.0-jre"
},
Expand Down Expand Up @@ -428,11 +428,16 @@
},
"org.jetbrains.kotlinx:atomicfu-js": {
"shasums": {
"jar": "59bc5238cfbd4eae1201141778c3252659bc1a2834ff13e66f6041f8daa1b30f",
"sources": "5a774131164213c93046aa6ccd0900f8b6f4f321a231df8e7091916cef9c8155"
},
"version": "0.15.2"
},
"org.jetbrains.kotlinx:atomicfu-js:pom": {
"shasums": {
"jar": "62f1f21a451cfed9e5f153bb807764c0aadcff36bd076573cae2f27ce13a55f7"
},
"version": "0.15.2"
},
"org.jetbrains.kotlinx:kotlinx-serialization-runtime": {
"shasums": {
"jar": "b8431c786c81cb84713c038bb674c851aba533c89ba9f04f22fd78f2baacd6c4",
Expand Down Expand Up @@ -642,7 +647,7 @@
"org.jetbrains.kotlin:kotlin-stdlib-js": [
"org.jetbrains.kotlin:kotlin-stdlib-common"
],
"org.jetbrains.kotlinx:atomicfu-js": [
"org.jetbrains.kotlinx:atomicfu-js:pom": [
"org.jetbrains.kotlin:kotlin-stdlib-common",
"org.jetbrains.kotlin:kotlin-stdlib-js"
],
Expand All @@ -668,9 +673,6 @@
"org.ow2.asm:asm-commons"
]
},
"skipped": [
"com.google.guava:listenablefuture:jar:sources"
],
"packages": {
"com.google.auto.service:auto-service": [
"com.google.auto.service.processor"
Expand Down Expand Up @@ -1578,8 +1580,8 @@
"org.jetbrains.kotlin:kotlin-stdlib-js",
"org.jetbrains.kotlin:kotlin-stdlib-js:jar:sources",
"org.jetbrains.kotlin:kotlin-stdlib:jar:sources",
"org.jetbrains.kotlinx:atomicfu-js",
"org.jetbrains.kotlinx:atomicfu-js:jar:sources",
"org.jetbrains.kotlinx:atomicfu-js:pom",
"org.jetbrains.kotlinx:kotlinx-serialization-runtime",
"org.jetbrains.kotlinx:kotlinx-serialization-runtime:jar:sources",
"org.jetbrains:annotations",
Expand Down Expand Up @@ -1715,8 +1717,8 @@
"org.jetbrains.kotlin:kotlin-stdlib-js",
"org.jetbrains.kotlin:kotlin-stdlib-js:jar:sources",
"org.jetbrains.kotlin:kotlin-stdlib:jar:sources",
"org.jetbrains.kotlinx:atomicfu-js",
"org.jetbrains.kotlinx:atomicfu-js:jar:sources",
"org.jetbrains.kotlinx:atomicfu-js:pom",
"org.jetbrains.kotlinx:kotlinx-serialization-runtime",
"org.jetbrains.kotlinx:kotlinx-serialization-runtime:jar:sources",
"org.jetbrains:annotations",
Expand Down Expand Up @@ -1852,8 +1854,8 @@
"org.jetbrains.kotlin:kotlin-stdlib-js",
"org.jetbrains.kotlin:kotlin-stdlib-js:jar:sources",
"org.jetbrains.kotlin:kotlin-stdlib:jar:sources",
"org.jetbrains.kotlinx:atomicfu-js",
"org.jetbrains.kotlinx:atomicfu-js:jar:sources",
"org.jetbrains.kotlinx:atomicfu-js:pom",
"org.jetbrains.kotlinx:kotlinx-serialization-runtime",
"org.jetbrains.kotlinx:kotlinx-serialization-runtime:jar:sources",
"org.jetbrains:annotations",
Expand All @@ -1870,5 +1872,91 @@
"org.pantsbuild:jarjar:jar:sources"
]
},
"services": {
"com.google.auto.service:auto-service": {
"javax.annotation.processing.Processor": [
"com.google.auto.service.processor.AutoServiceProcessor"
]
},
"com.google.auto.service:auto-service:jar:sources": {
"javax.annotation.processing.Processor": [
"com.google.auto.service.processor.AutoServiceProcessor"
]
},
"com.google.auto.value:auto-value": {
"autovalue.shaded.kotlinx.metadata.impl.extensions.MetadataExtensions": [
"autovalue.shaded.kotlinx.metadata.jvm.impl.JvmMetadataExtensions"
],
"com.google.auto.value.extension.AutoValueExtension": [
"com.google.auto.value.extension.memoized.processor.MemoizeExtension",
"com.google.auto.value.extension.serializable.processor.SerializableAutoValueExtension",
"com.google.auto.value.extension.toprettystring.processor.ToPrettyStringExtension"
],
"com.google.auto.value.extension.serializable.serializer.interfaces.SerializerExtension": [
"com.google.auto.value.extension.serializable.serializer.impl.ImmutableListSerializerExtension",
"com.google.auto.value.extension.serializable.serializer.impl.ImmutableMapSerializerExtension",
"com.google.auto.value.extension.serializable.serializer.impl.OptionalSerializerExtension"
],
"javax.annotation.processing.Processor": [
"com.google.auto.value.extension.memoized.processor.MemoizedValidator",
"com.google.auto.value.extension.toprettystring.processor.ToPrettyStringValidator",
"com.google.auto.value.processor.AutoAnnotationProcessor",
"com.google.auto.value.processor.AutoBuilderProcessor",
"com.google.auto.value.processor.AutoOneOfProcessor",
"com.google.auto.value.processor.AutoValueBuilderProcessor",
"com.google.auto.value.processor.AutoValueProcessor"
]
},
"com.google.dagger:dagger-compiler": {
"com.google.devtools.ksp.processing.SymbolProcessorProvider": [
"dagger.internal.codegen.KspComponentProcessor$Provider"
],
"javax.annotation.processing.Processor": [
"dagger.internal.codegen.ComponentProcessor"
]
},
"com.google.dagger:dagger-spi": {
"dagger.spi.internal.shaded.androidx.room.jarjarred.kotlinx.metadata.internal.extensions.MetadataExtensions": [
"dagger.spi.internal.shaded.androidx.room.jarjarred.kotlinx.metadata.jvm.internal.JvmMetadataExtensions"
],
"dagger.spi.internal.shaded.kotlinx.metadata.internal.extensions.MetadataExtensions": [
"dagger.spi.internal.shaded.kotlinx.metadata.jvm.internal.JvmMetadataExtensions"
]
},
"com.squareup.moshi:moshi-kotlin-codegen": {
"com.google.devtools.ksp.processing.SymbolProcessorProvider": [
"com.squareup.moshi.kotlin.codegen.ksp.JsonClassSymbolProcessorProvider"
],
"com.squareup.moshi.kotlinx.metadata.internal.extensions.MetadataExtensions": [
"com.squareup.moshi.kotlinx.metadata.jvm.internal.JvmMetadataExtensions"
],
"javax.annotation.processing.Processor": [
"com.squareup.moshi.kotlin.codegen.apt.JsonClassCodegenProcessor"
]
},
"dev.zacsweers.autoservice:auto-service-ksp": {
"com.google.devtools.ksp.processing.SymbolProcessorProvider": [
"dev.zacsweers.autoservice.ksp.AutoServiceSymbolProcessor$Provider"
]
},
"org.eclipse.sisu:org.eclipse.sisu.inject": {
"javax.annotation.processing.Processor": [
"org.eclipse.sisu.space.SisuIndexAPT6"
]
},
"org.jetbrains.kotlin:kotlin-reflect": {
"kotlin.reflect.jvm.internal.impl.builtins.BuiltInsLoader": [
"kotlin.reflect.jvm.internal.impl.serialization.deserialization.builtins.BuiltInsLoaderImpl"
],
"kotlin.reflect.jvm.internal.impl.resolve.ExternalOverridabilityCondition": [
"kotlin.reflect.jvm.internal.impl.load.java.ErasedOverridabilityCondition",
"kotlin.reflect.jvm.internal.impl.load.java.FieldOverridabilityCondition",
"kotlin.reflect.jvm.internal.impl.load.java.JavaIncompatibilityRulesOverridabilityCondition"
]
}
},
"skipped": [
"com.google.guava:listenablefuture:jar:sources"
],
"version": "2"
}
4 changes: 2 additions & 2 deletions src/main/starlark/core/repositories/versions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ versions = struct(
SKYLIB_SHA = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
PROTOBUF_VERSION = "3.11.3",
PROTOBUF_SHA = "cf754718b0aa945b00550ed7962ddc167167bd922b842199eeb6505e6f344852",
RULES_JVM_EXTERNAL_TAG = "5.3",
RULES_JVM_EXTERNAL_SHA = "d31e369b854322ca5098ea12c69d7175ded971435e55c18dd9dd5f29cc5249ac",
RULES_JVM_EXTERNAL_TAG = "6.3",
RULES_JVM_EXTERNAL_SHA = "c18a69d784bcd851be95897ca0eca0b57dc86bb02e62402f15736df44160eb02",
RULES_PROTO = version(
version = "5.3.0-21.7",
sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
Expand Down