From c93d6ae990a1d063f0a4e6fbef7447af2799f661 Mon Sep 17 00:00:00 2001 From: Ben Lee Date: Tue, 22 Oct 2024 07:32:09 -0700 Subject: [PATCH] Add rules_jvm_external overrides for stdlib (#1219) --- MODULE.bazel | 25 +++- kotlin_rules_maven_install.json | 199 ++++++++++++-------------------- 2 files changed, 93 insertions(+), 131 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index 7d8b83b45..8bd847ce3 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -73,12 +73,10 @@ maven.install( "javax.inject:javax.inject:1", "org.apache.commons:commons-compress:1.26.2", "org.pantsbuild:jarjar:1.7.2", - "org.jetbrains.kotlinx:atomicfu-js:0.15.2", - "org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc", - "dev.zacsweers.autoservice:auto-service-ksp:jar:1.1.0", - "com.squareup.moshi:moshi:1.15.0", - "com.squareup.moshi:moshi-kotlin:1.15.0", - "com.squareup.moshi:moshi-kotlin-codegen:1.15.0", + "dev.zacsweers.autoservice:auto-service-ksp:jar:1.2.0", + "com.squareup.moshi:moshi:1.15.1", + "com.squareup.moshi:moshi-kotlin:1.15.1", + "com.squareup.moshi:moshi-kotlin-codegen:1.15.1", ], fail_if_repin_required = True, fetch_sources = True, @@ -89,6 +87,21 @@ maven.install( "https://repo1.maven.org/maven2", ], ) +maven.override( + name = "override_target_in_deps_kotlin_stdlib", + coordinates = "org.jetbrains.kotlin.kotlin:kotlin-stdlib", + target = "@rules_kotlin//kotlin/compiler:kotlin-stdlib", +) +maven.override( + name = "override_target_in_deps_kotlin_stdlib_jdk7", + coordinates = "org.jetbrains.kotlin.kotlin:kotlin-stdlib-jdk7", + target = "@rules_kotlin//kotlin/compiler:kotlin-stdlib-jdk7", +) +maven.override( + name = "override_target_in_deps_kotlin_stdlib_jdk8", + coordinates = "org.jetbrains.kotlin.kotlin:kotlin-stdlib-jdk8", + target = "@rules_kotlin//kotlin/compiler:kotlin-stdlib-jdk8", +) use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven") bazel_dep(name = "rules_pkg", version = "0.7.0") diff --git a/kotlin_rules_maven_install.json b/kotlin_rules_maven_install.json index 7742ee2e5..7e46ee815 100755 --- a/kotlin_rules_maven_install.json +++ b/kotlin_rules_maven_install.json @@ -1,9 +1,9 @@ { "__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": -760691580, + "__RESOLVED_ARTIFACTS_HASH": 186754690, "conflict_resolution": { - "com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.0.0-jre" + "com.google.guava:guava:27.1-jre": "com.google.guava:guava:33.2.1-jre" }, "artifacts": { "com.google.auto.service:auto-service": { @@ -92,10 +92,10 @@ }, "com.google.errorprone:error_prone_annotations": { "shasums": { - "jar": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054", - "sources": "5b4504609bb93d3c24b87cd839cf0bb7d878135d0a917a05081d0dc9b2a9973f" + "jar": "de25f2d9a2156529bd765f51d8efdfc0dfa7301e04efb9cc75b7f10cf5d0e0fb", + "sources": "32b1720fa97a3d7f24fc017014e285d812ff66a5b6c5c1819e165bfe6fdc2110" }, - "version": "2.23.0" + "version": "2.26.1" }, "com.google.errorprone:javac-shaded": { "shasums": { @@ -120,10 +120,10 @@ }, "com.google.guava:guava": { "shasums": { - "jar": "f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537", - "sources": "0c17d911785e8a606d091aa6740d6d520f307749c2bddf6e35066d52fe0036e5" + "jar": "452b2d9787b7d366fa8cf5ed9a1c40404542d05effa7a598da03bbbbb76d9f31", + "sources": "cce2aba265b7e1260c21f37af6d074bc2c322743dcedc27c573bc342b2d99c79" }, - "version": "33.0.0-jre" + "version": "33.2.1-jre" }, "com.google.guava:listenablefuture": { "shasums": { @@ -134,10 +134,10 @@ }, "com.google.j2objc:j2objc-annotations": { "shasums": { - "jar": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed", - "sources": "7413eed41f111453a08837f5ac680edded7faed466cbd35745e402e13f4cc3f5" + "jar": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", + "sources": "bd60019a0423c3a025ef6ab24fe0761f5f45ffb48a8cca74a01b678de1105d38" }, - "version": "2.8" + "version": "3.0.0" }, "com.google.protobuf:protobuf-java": { "shasums": { @@ -169,31 +169,31 @@ }, "com.squareup.moshi:moshi": { "shasums": { - "jar": "350d48c34df4a8ef4f1475aa65ef0e54c4d8302a71efc9f6c09d0e98fd4c63c6", + "jar": "46a1118fe1fc12723a575c94133fc8936dcc78d3f8873c0e70a055de9e5861a6", "sources": "d658332c2b2b57f94d6c26bb747e5dbb65a2d5b47cc3e0a15036977fe832996e" }, - "version": "1.15.0" + "version": "1.15.1" }, "com.squareup.moshi:moshi-kotlin": { "shasums": { - "jar": "874029dcba5a558a57c86cbe91a6f9ea59dfbc2a17ee4bc41e2e5b9a106f0a5f", + "jar": "3c5a577200fc49a696647a52b1a97598a56d8d6f00e343ffed09d88b4007cdd0", "sources": "5b40a79012daa9b3bb0c8f9c61483aa4b01dbec8d7841db66e90e7fead9eb6af" }, - "version": "1.15.0" + "version": "1.15.1" }, "com.squareup.moshi:moshi-kotlin-codegen": { "shasums": { - "jar": "f84eb5e0988820b95b15088a166918be4d965b7e397b6c32da3c6b55425dc345", + "jar": "14ab79736dc806a245ad76354eb7d53e83bead1d87b092a6b07da6a3287a39ed", "sources": "1a07a0751b0949c52a7a4333587421699537489e05a2e5820876c18855ebf337" }, - "version": "1.15.0" + "version": "1.15.1" }, - "com.squareup.okio:okio": { + "com.squareup.okio:okio-jvm": { "shasums": { - "jar": "a27f091d34aa452e37227e2cfa85809f29012a8ef2501a9b5a125a978e4fcbc1", - "sources": "4f255d11829d7e1949be042efa70f933650a7d929e68d594c1608f97884a0535" + "jar": "d8b35adc28768f43ae5afe6a7d1aa2a878ba51e0b96a4f308811f3b1f5b13e55", + "sources": "b0e2c219a2bd23342731a5da0f27b529933750b4a9fcbc0f0094ea1d8fbf8507" }, - "version": "2.10.0" + "version": "3.7.0" }, "com.squareup:javapoet": { "shasums": { @@ -204,10 +204,17 @@ }, "com.squareup:kotlinpoet": { "shasums": { - "jar": "102d5d8a289d961cd7f39204c264d272e4aad775e388d909f6050e14558aae9b", - "sources": "a7f0932158d05a0ed442af2fed9a6cc5963b42b96289dece834ee7b0560e1398" + "jar": "7cbf7f4330170f9459d15c105fae6e13784cb37855fd68cf2826dfa0b5deb676", + "sources": "57313a605d93021318e6dd3aad20758183783644311732de4afa19b94a269664" }, - "version": "1.14.2" + "version": "1.13.2" + }, + "com.squareup:kotlinpoet-jvm": { + "shasums": { + "jar": "3133d4f48ce77766a6a8cc2e555d89164dfcefbd372f4ff43f89a7fed3586910", + "sources": "224681796609279c91775be86a1a96404404e90a8860e29aa2c0be885dc112ba" + }, + "version": "1.17.0" }, "com.squareup:kotlinpoet-ksp": { "shasums": { @@ -232,10 +239,10 @@ }, "dev.zacsweers.autoservice:auto-service-ksp": { "shasums": { - "jar": "290457e26274b41f625f96b24e033dd18639c6353a6f81304f0a15e2b22eec35", - "sources": "2a448c6fe02dd1ec1bce810ad1bb428b2a834be689a0c81201bfa7095654e61e" + "jar": "a04288925f424eb3b9542bb0b5c81c2f49dc8859894aef83749a7e75968c2b8e", + "sources": "c9f8d86a50e37f13d5e9d844f37e5d2ac16914e5be20cf890b425b0cd336f786" }, - "version": "1.1.0" + "version": "1.2.0" }, "javax.annotation:javax.annotation-api": { "shasums": { @@ -337,10 +344,10 @@ }, "org.checkerframework:checker-qual": { "shasums": { - "jar": "2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172", - "sources": "8308220bbdd4e12b49fa06a91de685faf9cc1a376464478c80845be3e87b7d4f" + "jar": "ccaedd33af0b7894d9f2f3b644f4d19e43928e32902e61ac4d10777830f5aac7", + "sources": "efb65eb479f61f53c6dcafbd42ed59dad09b0a0d5a7f44b7bc68df25c2dcf8fd" }, - "version": "3.41.0" + "version": "3.42.0" }, "org.codehaus.plexus:plexus-classworlds": { "shasums": { @@ -386,24 +393,17 @@ }, "org.jetbrains.kotlin:kotlin-reflect": { "shasums": { - "jar": "8a6cd5a3cf092acee274ce2c444dc36eefdb631579859dd4d857b3309a529c91", - "sources": "3b1b29047a65940f2da4e2e71f969e2e2de343e69dce00c6fe9e333b99565d44" + "jar": "a65166445bb85ef816cde127279fe0017d2b7cc439b3b972390e1b736d64e94c", + "sources": "ca0683bab01b6ce2ad97d9fa7575ad6204b32d3814dc722b9519bcdfc7315abf" }, - "version": "1.8.21" + "version": "1.9.24" }, "org.jetbrains.kotlin:kotlin-stdlib": { "shasums": { - "jar": "28a35bcdff46d864f80f346a617e486284b208d17378c41900dfb1de95a90e6c", - "sources": "e159eaf9f42fe4792ead7572ed44752753a9f4b006f5a10f5eefd04b13b6a363" + "jar": "240938c4aab8e73e888703e3e7d3f87383ffe5bd536d6d5e3c100d4cd0379fcf", + "sources": "256f2c1caf3df558d6c41b79fb83add98edcc08436b821a80b5f17d806c664a1" }, - "version": "1.9.20" - }, - "org.jetbrains.kotlin:kotlin-stdlib-common": { - "shasums": { - "jar": "32010683330a6f31b8d309f10433acaa109b61f2df3d252dae7dade9730074c2", - "sources": "1b6fb61c316787715aa64dd4adc8ed3cd42e0e430525142155f871de982e44b0" - }, - "version": "1.4.30" + "version": "2.0.0" }, "org.jetbrains.kotlin:kotlin-stdlib-jdk7": { "shasums": { @@ -419,27 +419,6 @@ }, "version": "1.9.0" }, - "org.jetbrains.kotlin:kotlin-stdlib-js": { - "shasums": { - "jar": "f032a20598953d634f7add8f4cbb5330926e8ec5aae02e892b8e643e4aa9ee0e", - "sources": "e4394f3d9932a9416674888a283a23cbe598c770fd3ff9733a88fdc89227aa3a" - }, - "version": "1.4.30" - }, - "org.jetbrains.kotlinx:atomicfu-js": { - "shasums": { - "jar": "59bc5238cfbd4eae1201141778c3252659bc1a2834ff13e66f6041f8daa1b30f", - "sources": "5a774131164213c93046aa6ccd0900f8b6f4f321a231df8e7091916cef9c8155" - }, - "version": "0.15.2" - }, - "org.jetbrains.kotlinx:kotlinx-serialization-runtime": { - "shasums": { - "jar": "b8431c786c81cb84713c038bb674c851aba533c89ba9f04f22fd78f2baacd6c4", - "sources": "88a8d68a74331b0db8abcf1102c33ce5573ac312b0e99aaac2cf71117e2ac28f" - }, - "version": "1.0-M1-1.4.0-rc" - }, "org.jetbrains:annotations": { "shasums": { "jar": "ace2a10dc8e2d5fd34925ecac03e4988b2c0f851650c94b8cef49ba1bd111478", @@ -555,7 +534,7 @@ "org.checkerframework:checker-compat-qual" ], "com.squareup.moshi:moshi": [ - "com.squareup.okio:okio", + "com.squareup.okio:okio-jvm", "org.jetbrains.kotlin:kotlin-stdlib-jdk8" ], "com.squareup.moshi:moshi-kotlin": [ @@ -573,14 +552,17 @@ "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.ow2.asm:asm" ], - "com.squareup.okio:okio": [ - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common" + "com.squareup.okio:okio-jvm": [ + "org.jetbrains.kotlin:kotlin-stdlib" ], "com.squareup:kotlinpoet": [ "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-stdlib-jdk8" ], + "com.squareup:kotlinpoet-jvm": [ + "org.jetbrains.kotlin:kotlin-reflect", + "org.jetbrains.kotlin:kotlin-stdlib" + ], "com.squareup:kotlinpoet-ksp": [ "com.squareup:kotlinpoet", "org.jetbrains.kotlin:kotlin-stdlib-jdk8" @@ -588,8 +570,8 @@ "dev.zacsweers.autoservice:auto-service-ksp": [ "com.google.auto.service:auto-service-annotations", "com.google.guava:guava", - "com.squareup:kotlinpoet", - "org.jetbrains.kotlin:kotlin-stdlib-jdk8" + "com.squareup:kotlinpoet-jvm", + "org.jetbrains.kotlin:kotlin-stdlib" ], "javax.enterprise:cdi-api": [ "javax.annotation:jsr250-api", @@ -639,17 +621,6 @@ "org.jetbrains.kotlin:kotlin-stdlib", "org.jetbrains.kotlin:kotlin-stdlib-jdk7" ], - "org.jetbrains.kotlin:kotlin-stdlib-js": [ - "org.jetbrains.kotlin:kotlin-stdlib-common" - ], - "org.jetbrains.kotlinx:atomicfu-js": [ - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-stdlib-js" - ], - "org.jetbrains.kotlinx:kotlinx-serialization-runtime": [ - "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common" - ], "org.ow2.asm:asm-analysis": [ "org.ow2.asm:asm-tree" ], @@ -969,7 +940,7 @@ "com.squareup.moshi.kotlinx.metadata.jvm.internal", "shadow.com.google.auto.common" ], - "com.squareup.okio:okio": [ + "com.squareup.okio:okio-jvm": [ "okio", "okio.internal" ], @@ -981,6 +952,11 @@ "com.squareup.kotlinpoet.jvm", "com.squareup.kotlinpoet.tags" ], + "com.squareup:kotlinpoet-jvm": [ + "com.squareup.kotlinpoet", + "com.squareup.kotlinpoet.jvm", + "com.squareup.kotlinpoet.tags" + ], "com.squareup:kotlinpoet-ksp": [ "com.squareup.kotlinpoet.ksp" ], @@ -1251,7 +1227,7 @@ "org.checkerframework.common.reflection.qual", "org.checkerframework.common.returnsreceiver.qual", "org.checkerframework.common.subtyping.qual", - "org.checkerframework.common.util.report.qual", + "org.checkerframework.common.util.count.report.qual", "org.checkerframework.common.value.qual", "org.checkerframework.dataflow.qual", "org.checkerframework.framework.qual" @@ -1377,7 +1353,8 @@ "kotlin.reflect.jvm.internal.impl.util", "kotlin.reflect.jvm.internal.impl.util.capitalizeDecapitalize", "kotlin.reflect.jvm.internal.impl.util.collectionUtils", - "kotlin.reflect.jvm.internal.impl.utils" + "kotlin.reflect.jvm.internal.impl.utils", + "kotlin.reflect.jvm.internal.impl.utils.addToStdlib" ], "org.jetbrains.kotlin:kotlin-stdlib": [ "kotlin", @@ -1424,16 +1401,6 @@ "kotlin.time", "kotlin.time.jdk8" ], - "org.jetbrains.kotlinx:kotlinx-serialization-runtime": [ - "kotlinx.serialization", - "kotlinx.serialization.builtins", - "kotlinx.serialization.descriptors", - "kotlinx.serialization.encoding", - "kotlinx.serialization.internal", - "kotlinx.serialization.json", - "kotlinx.serialization.json.internal", - "kotlinx.serialization.modules" - ], "org.jetbrains:annotations": [ "org.intellij.lang.annotations", "org.jetbrains.annotations" @@ -1510,11 +1477,13 @@ "com.squareup.moshi:moshi-kotlin-codegen:jar:sources", "com.squareup.moshi:moshi-kotlin:jar:sources", "com.squareup.moshi:moshi:jar:sources", - "com.squareup.okio:okio", - "com.squareup.okio:okio:jar:sources", + "com.squareup.okio:okio-jvm", + "com.squareup.okio:okio-jvm:jar:sources", "com.squareup:javapoet", "com.squareup:javapoet:jar:sources", "com.squareup:kotlinpoet", + "com.squareup:kotlinpoet-jvm", + "com.squareup:kotlinpoet-jvm:jar:sources", "com.squareup:kotlinpoet-ksp", "com.squareup:kotlinpoet-ksp:jar:sources", "com.squareup:kotlinpoet:jar:sources", @@ -1569,19 +1538,11 @@ "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-reflect:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-stdlib-common:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:sources", - "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:kotlinx-serialization-runtime", - "org.jetbrains.kotlinx:kotlinx-serialization-runtime:jar:sources", "org.jetbrains:annotations", "org.jetbrains:annotations:jar:sources", "org.ow2.asm:asm", @@ -1647,11 +1608,13 @@ "com.squareup.moshi:moshi-kotlin-codegen:jar:sources", "com.squareup.moshi:moshi-kotlin:jar:sources", "com.squareup.moshi:moshi:jar:sources", - "com.squareup.okio:okio", - "com.squareup.okio:okio:jar:sources", + "com.squareup.okio:okio-jvm", + "com.squareup.okio:okio-jvm:jar:sources", "com.squareup:javapoet", "com.squareup:javapoet:jar:sources", "com.squareup:kotlinpoet", + "com.squareup:kotlinpoet-jvm", + "com.squareup:kotlinpoet-jvm:jar:sources", "com.squareup:kotlinpoet-ksp", "com.squareup:kotlinpoet-ksp:jar:sources", "com.squareup:kotlinpoet:jar:sources", @@ -1706,19 +1669,11 @@ "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-reflect:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-stdlib-common:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:sources", - "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:kotlinx-serialization-runtime", - "org.jetbrains.kotlinx:kotlinx-serialization-runtime:jar:sources", "org.jetbrains:annotations", "org.jetbrains:annotations:jar:sources", "org.ow2.asm:asm", @@ -1784,11 +1739,13 @@ "com.squareup.moshi:moshi-kotlin-codegen:jar:sources", "com.squareup.moshi:moshi-kotlin:jar:sources", "com.squareup.moshi:moshi:jar:sources", - "com.squareup.okio:okio", - "com.squareup.okio:okio:jar:sources", + "com.squareup.okio:okio-jvm", + "com.squareup.okio:okio-jvm:jar:sources", "com.squareup:javapoet", "com.squareup:javapoet:jar:sources", "com.squareup:kotlinpoet", + "com.squareup:kotlinpoet-jvm", + "com.squareup:kotlinpoet-jvm:jar:sources", "com.squareup:kotlinpoet-ksp", "com.squareup:kotlinpoet-ksp:jar:sources", "com.squareup:kotlinpoet:jar:sources", @@ -1843,19 +1800,11 @@ "org.jetbrains.kotlin:kotlin-reflect", "org.jetbrains.kotlin:kotlin-reflect:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib", - "org.jetbrains.kotlin:kotlin-stdlib-common", - "org.jetbrains.kotlin:kotlin-stdlib-common:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib-jdk7", "org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:sources", "org.jetbrains.kotlin:kotlin-stdlib-jdk8", "org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:sources", - "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:kotlinx-serialization-runtime", - "org.jetbrains.kotlinx:kotlinx-serialization-runtime:jar:sources", "org.jetbrains:annotations", "org.jetbrains:annotations:jar:sources", "org.ow2.asm:asm",