Skip to content

Commit fb7c090

Browse files
committed
Fix workspace cycles
1 parent 79b04ce commit fb7c090

File tree

3 files changed

+32
-24
lines changed

3 files changed

+32
-24
lines changed

examples/android/WORKSPACE

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
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")
124

135
http_archive(
146
name = "rules_kotlin",
157
sha256 = "34e8c0351764b71d78f76c8746e98063979ce08dcf1a91666f3f3bc2949a533d",
168
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.5/rules_kotlin-v1.9.5.tar.gz",
179
)
1810

11+
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "versions")
12+
1913
kotlin_repositories()
2014

15+
load("@rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
16+
2117
kt_register_toolchains()
2218

2319
http_archive(
@@ -39,6 +35,8 @@ http_archive(
3935
),
4036
)
4137

38+
load("@rules_jvm_external//:defs.bzl", "maven_install")
39+
4240
maven_install(
4341
artifacts = [
4442
"androidx.appcompat:appcompat:1.0.0",
@@ -69,6 +67,11 @@ http_archive(
6967
urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION],
7068
)
7169

70+
load(
71+
"@rules_android//android:rules.bzl",
72+
"android_sdk_repository",
73+
)
74+
7275
android_sdk_repository(name = "androidsdk")
7376

7477
http_archive(
@@ -78,6 +81,8 @@ http_archive(
7881
urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.10.3.tar.gz"],
7982
)
8083

84+
load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
85+
8186
robolectric_repositories()
8287

8388
android_ndk_repository(name = "androidndk")

examples/associates/projects/core/api/src/main/kotlin/core/api/api.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ data class MyType(
1212
}
1313

1414
internal fun String.camelCase() = this.split("_").joinToString("") {
15-
"${it[0].upperCase()}${it.substring(1)}"
15+
"${it[0].uppercase()}${it.substring(1)}"
1616
}

examples/deps/WORKSPACE

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2-
load(
3-
"@rules_android//android:rules.bzl",
4-
"android_sdk_repository",
2+
3+
http_archive(
4+
name = "bazel_skylib",
5+
sha256 = versions.SKYLIB_SHA,
6+
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/%s/bazel-skylib-%s.tar.gz" % (
7+
versions.SKYLIB_VERSION,
8+
versions.SKYLIB_VERSION,
9+
)],
510
)
6-
load("@rules_jvm_external//:defs.bzl", "maven_install")
7-
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
8-
load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "versions")
911

1012
http_archive(
1113
name = "rules_kotlin",
1214
sha256 = "34e8c0351764b71d78f76c8746e98063979ce08dcf1a91666f3f3bc2949a533d",
1315
url = "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.5/rules_kotlin-v1.9.5.tar.gz",
1416
)
1517

18+
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
19+
load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "versions")
20+
1621
kotlin_repositories()
1722

1823
register_toolchains("//bzl:experimental_toolchain")
1924

20-
http_archive(
21-
name = "bazel_skylib",
22-
sha256 = versions.SKYLIB_SHA,
23-
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/%s/bazel-skylib-%s.tar.gz" % (
24-
versions.SKYLIB_VERSION,
25-
versions.SKYLIB_VERSION,
26-
)],
27-
)
28-
2925
http_archive(
3026
name = "rules_jvm_external",
3127
sha256 = versions.RULES_JVM_EXTERNAL_SHA,
@@ -36,6 +32,8 @@ http_archive(
3632
),
3733
)
3834

35+
load("@rules_jvm_external//:defs.bzl", "maven_install")
36+
3937
maven_install(
4038
artifacts = [
4139
"com.google.auto.value:auto-value:1.6.5",
@@ -54,6 +52,11 @@ http_archive(
5452
urls = ["https://github.com/bazelbuild/rules_android/archive/v%s.zip" % versions.ANDROID.VERSION],
5553
)
5654

55+
load(
56+
"@rules_android//android:rules.bzl",
57+
"android_sdk_repository",
58+
)
59+
5760
android_sdk_repository(
5861
name = "androidsdk",
5962
)

0 commit comments

Comments
 (0)