Skip to content

Commit d43abc9

Browse files
committed
Able to compile with 2.1.0.
Still some outstanding issues iwth the core rules test.
1 parent 4728e7d commit d43abc9

File tree

12 files changed

+154
-115
lines changed

12 files changed

+154
-115
lines changed

MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ maven.install(
7575
"com.google.auto.service:auto-service-annotations:1.1.1",
7676
"com.google.auto.value:auto-value:1.10.1",
7777
"com.google.auto.value:auto-value-annotations:1.10.1",
78-
"com.google.dagger:dagger:2.51",
79-
"com.google.dagger:dagger-compiler:2.51",
80-
"com.google.dagger:dagger-producers:2.51",
78+
"com.google.dagger:dagger:2.53.1",
79+
"com.google.dagger:dagger-compiler:2.53.1",
80+
"com.google.dagger:dagger-producers:2.53.1",
8181
"javax.annotation:javax.annotation-api:1.3.2",
8282
"javax.inject:javax.inject:1",
8383
"org.apache.commons:commons-compress:1.26.2",

examples/android/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ maven.install(
1818
"junit:junit:4.12",
1919
"androidx.test.espresso:espresso-core:3.1.1",
2020
"org.hamcrest:hamcrest-library:1.3",
21-
"org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc",
21+
"org.jetbrains.kotlinx:kotlinx-serialization-core:1.0-M1-1.4.0-rc",
2222
"com.squareup.moshi:moshi:1.14.0",
2323
"com.squareup.moshi:moshi-kotlin:1.14.0",
2424
"com.squareup.moshi:moshi-kotlin-codegen:1.14.0",

examples/android/WORKSPACE

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
workspace(name = "android_example")
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
5+
load(
6+
"@rules_android//android:rules.bzl",
7+
"android_sdk_repository",
8+
)
9+
load("@rules_jvm_external//:defs.bzl", "maven_install")
10+
load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
11+
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "versions")
412

513
http_archive(
614
name = "rules_kotlin",
715
sha256 = "34e8c0351764b71d78f76c8746e98063979ce08dcf1a91666f3f3bc2949a533d",
816
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.5/rules_kotlin-v1.9.5.tar.gz",
917
)
1018

11-
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "versions")
12-
1319
kotlin_repositories()
1420

15-
load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
16-
1721
kt_register_toolchains()
1822

1923
http_archive(
@@ -35,15 +39,13 @@ http_archive(
3539
),
3640
)
3741

38-
load("@rules_jvm_external//:defs.bzl", "maven_install")
39-
4042
maven_install(
4143
artifacts = [
4244
"androidx.appcompat:appcompat:1.0.0",
4345
"junit:junit:4.12",
4446
"androidx.test.espresso:espresso-core:3.1.1",
4547
"org.hamcrest:hamcrest-library:1.3",
46-
"org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc",
48+
"org.jetbrains.kotlinx:kotlinx-serialization-core:1.0-M1-1.4.0-rc",
4749
"com.squareup.moshi:moshi:1.14.0",
4850
"com.squareup.moshi:moshi-kotlin:1.14.0",
4951
"com.squareup.moshi:moshi-kotlin-codegen:1.14.0",
@@ -67,11 +69,6 @@ http_archive(
6769
urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION],
6870
)
6971

70-
load(
71-
"@rules_android//android:rules.bzl",
72-
"android_sdk_repository",
73-
)
74-
7572
android_sdk_repository(name = "androidsdk")
7673

7774
http_archive(
@@ -81,8 +78,6 @@ http_archive(
8178
urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.10.3.tar.gz"],
8279
)
8380

84-
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
85-
8681
robolectric_repositories()
8782

8883
android_ndk_repository(name = "androidndk")

examples/deps/WORKSPACE

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
3+
load(
4+
"@rules_android//android:rules.bzl",
5+
"android_sdk_repository",
6+
)
7+
load("@rules_jvm_external//:defs.bzl", "maven_install")
8+
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
9+
load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "versions")
210

311
http_archive(
412
name = "rules_kotlin",
513
sha256 = "34e8c0351764b71d78f76c8746e98063979ce08dcf1a91666f3f3bc2949a533d",
614
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.5/rules_kotlin-v1.9.5.tar.gz",
715
)
816

9-
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
10-
1117
kotlin_repositories()
1218

1319
register_toolchains("//bzl:experimental_toolchain")
1420

15-
load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "versions")
16-
1721
http_archive(
1822
name = "bazel_skylib",
1923
sha256 = versions.SKYLIB_SHA,
@@ -33,15 +37,13 @@ http_archive(
3337
),
3438
)
3539

36-
load("@rules_jvm_external//:defs.bzl", "maven_install")
37-
3840
maven_install(
3941
artifacts = [
4042
"androidx.appcompat:appcompat:1.0.0",
4143
"junit:junit:4.12",
4244
"androidx.test.espresso:espresso-core:3.1.1",
4345
"org.hamcrest:hamcrest-library:1.3",
44-
"org.jetbrains.kotlinx:kotlinx-serialization-runtime:1.0-M1-1.4.0-rc",
46+
"org.jetbrains.kotlinx:kotlinx-serialization-core:1.0-M1-1.4.0-rc",
4547
"com.google.dagger:dagger:2.45",
4648
"com.google.dagger:dagger-compiler:2.45",
4749
"com.google.dagger:dagger-producers:2.45",
@@ -62,11 +64,6 @@ http_archive(
6264
urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION],
6365
)
6466

65-
load(
66-
"@rules_android//android:rules.bzl",
67-
"android_sdk_repository",
68-
)
69-
7067
android_sdk_repository(
7168
name = "androidsdk",
7269
)
@@ -77,6 +74,4 @@ http_archive(
7774
urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.7.3.tar.gz"],
7875
)
7976

80-
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
81-
8277
robolectric_repositories()

0 commit comments

Comments
 (0)