Skip to content

Commit 08bf3de

Browse files
trexemDagger Team
authored andcommitted
Update Bazel module dependencies and remove unnecessary :aar suffixes.
RELNOTES=Updated Bazel module dependencies PiperOrigin-RevId: 857261215
1 parent 6afd7ea commit 08bf3de

6 files changed

Lines changed: 95 additions & 116 deletions

File tree

MODULE.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module(name = "dagger")
22

3-
bazel_dep(name = "bazel_skylib", version = "1.7.1")
4-
bazel_dep(name = "rules_java", version = "8.6.0")
5-
bazel_dep(name = "rules_jvm_external", version = "6.7")
6-
bazel_dep(name = "rules_android", version = "0.6.0")
7-
bazel_dep(name = "rules_kotlin", version = "2.1.9", repo_name = "io_bazel_rules_kotlin")
8-
bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
9-
bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
3+
bazel_dep(name = "bazel_skylib", version = "1.9.0")
4+
bazel_dep(name = "rules_java", version = "9.3.0")
5+
bazel_dep(name = "rules_jvm_external", version = "6.9")
6+
bazel_dep(name = "rules_android", version = "0.7.1")
7+
bazel_dep(name = "rules_kotlin", version = "2.2.2", repo_name = "io_bazel_rules_kotlin")
8+
bazel_dep(name = "rules_robolectric", version = "4.16", repo_name = "robolectric")
9+
bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
1010

1111
# Pin the version of rules_robolectric so that it matches the robolectric version we get from maven.
1212
single_version_override(
1313
module_name = "rules_robolectric",
14-
version = "4.14.1.2",
14+
version = "4.16",
1515
)
1616

1717
# Setup the Android SDK repository
@@ -54,7 +54,7 @@ KSP_VERSION = KOTLIN_VERSION + "-2.0.3"
5454

5555
MAVEN_VERSION = "3.3.3"
5656

57-
ROBOLECTRIC_VERSION = "4.14.1"
57+
ROBOLECTRIC_VERSION = "4.16"
5858

5959
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
6060

@@ -76,6 +76,7 @@ maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
7676
"com.google.testing.compile:compile-testing:0.18",
7777
"com.google.truth.extensions:truth-java8-extension:1.4.0",
7878
"com.google.truth:truth:1.4.0",
79+
"junit:junit:4.13.2",
7980
"javax.inject:javax.inject-tck:1",
8081
"org.hamcrest:hamcrest-core:1.3",
8182
"org.mockito:mockito-core:5.4.0",
@@ -151,7 +152,6 @@ maven.install(
151152
"javax.annotation:javax.annotation-api:1.3.2",
152153
"javax.enterprise:cdi-api:1.0",
153154
"javax.inject:javax.inject:1",
154-
"junit:junit:4.13.2",
155155
"net.bytebuddy:byte-buddy:%s" % BYTE_BUDDY_VERSION,
156156
"net.bytebuddy:byte-buddy-agent:%s" % BYTE_BUDDY_VERSION,
157157
"net.ltgt.gradle.incap:incap:%s" % INCAP_VERSION,

dagger-android-support/BUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ gen_maven_artifact(
3232
artifact_name = "Dagger Android Support",
3333
artifact_target = "//dagger-android-support/main/java/dagger/android/support:support",
3434
artifact_target_maven_deps = [
35-
"androidx.activity:activity:aar",
35+
"androidx.activity:activity",
3636
"androidx.annotation:annotation",
37-
"androidx.appcompat:appcompat:aar",
38-
"androidx.fragment:fragment:aar",
37+
"androidx.appcompat:appcompat",
38+
"androidx.fragment:fragment",
3939
"androidx.lifecycle:lifecycle-common",
40-
"androidx.lifecycle:lifecycle-viewmodel:aar",
41-
"androidx.lifecycle:lifecycle-viewmodel-savedstate:aar",
40+
"androidx.lifecycle:lifecycle-viewmodel",
41+
"androidx.lifecycle:lifecycle-viewmodel-savedstate",
4242
"com.google.dagger:dagger",
4343
"com.google.dagger:dagger-android",
4444
],

examples/bazel/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ local_path_override(
4343
path = "../../",
4444
)
4545

46-
ROBOLECTRIC_VERSION = "4.11.1"
46+
ROBOLECTRIC_VERSION = "4.16"
4747

4848
bazel_dep(
4949
name = "rules_robolectric",
5050
version = ROBOLECTRIC_VERSION,
5151
)
5252

53-
RULES_JVM_EXTERNAL_TAG = "4.4.2"
53+
RULES_JVM_EXTERNAL_TAG = "6.9"
5454

5555
bazel_dep(
5656
name = "rules_jvm_external",

hilt-android-testing/BUILD

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,16 @@ gen_maven_artifact(
8888
"//hilt-android-testing/main/java/dagger/hilt/testing:package_info",
8989
],
9090
artifact_target_maven_deps = [
91-
"androidx.activity:activity:aar",
91+
"androidx.activity:activity",
9292
"androidx.annotation:annotation",
93-
"androidx.annotation:annotation-experimental:aar",
94-
"androidx.fragment:fragment:aar",
93+
"androidx.annotation:annotation-experimental",
94+
"androidx.fragment:fragment",
9595
"androidx.lifecycle:lifecycle-common",
96-
"androidx.lifecycle:lifecycle-viewmodel:aar",
97-
"androidx.lifecycle:lifecycle-viewmodel-savedstate:aar",
98-
"androidx.multidex:multidex:aar",
99-
"androidx.savedstate:savedstate:aar",
100-
"androidx.test:core:aar",
96+
"androidx.lifecycle:lifecycle-viewmodel",
97+
"androidx.lifecycle:lifecycle-viewmodel-savedstate",
98+
"androidx.multidex:multidex",
99+
"androidx.savedstate:savedstate",
100+
"androidx.test:core",
101101
"com.google.code.findbugs:jsr305",
102102
"com.google.dagger:dagger",
103103
"com.google.dagger:hilt-android",

hilt-android/BUILD

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ gen_maven_artifact(
106106
"//hilt-android/main/java/dagger/hilt/internal/componenttreedeps",
107107
],
108108
artifact_target_maven_deps = [
109-
"androidx.activity:activity:aar",
109+
"androidx.activity:activity",
110110
"androidx.annotation:annotation",
111-
"androidx.annotation:annotation-experimental:aar",
112-
"androidx.fragment:fragment:aar",
111+
"androidx.annotation:annotation-experimental",
112+
"androidx.fragment:fragment",
113113
"androidx.lifecycle:lifecycle-common",
114-
"androidx.lifecycle:lifecycle-viewmodel:aar",
115-
"androidx.lifecycle:lifecycle-viewmodel-savedstate:aar",
116-
"androidx.savedstate:savedstate:aar",
114+
"androidx.lifecycle:lifecycle-viewmodel",
115+
"androidx.lifecycle:lifecycle-viewmodel-savedstate",
116+
"androidx.savedstate:savedstate",
117117
"com.google.code.findbugs:jsr305",
118118
"com.google.dagger:dagger-lint-aar",
119119
"com.google.dagger:dagger",

0 commit comments

Comments
 (0)