Skip to content

Commit f2678cd

Browse files
committed
Fix ordering on deps, update compose version
1 parent e732fb0 commit f2678cd

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

examples/deps/WORKSPACE

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

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-
)],
10-
)
11-
123
http_archive(
134
name = "rules_kotlin",
145
sha256 = "34e8c0351764b71d78f76c8746e98063979ce08dcf1a91666f3f3bc2949a533d",
@@ -20,7 +11,14 @@ load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "version
2011

2112
kotlin_repositories()
2213

23-
register_toolchains("//bzl:experimental_toolchain")
14+
http_archive(
15+
name = "bazel_skylib",
16+
sha256 = versions.SKYLIB_SHA,
17+
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/%s/bazel-skylib-%s.tar.gz" % (
18+
versions.SKYLIB_VERSION,
19+
versions.SKYLIB_VERSION,
20+
)],
21+
)
2422

2523
http_archive(
2624
name = "rules_jvm_external",
@@ -45,6 +43,8 @@ maven_install(
4543
],
4644
)
4745

46+
register_toolchains("//bzl:experimental_toolchain")
47+
4848
http_archive(
4949
name = "rules_android",
5050
sha256 = versions.ANDROID.SHA,

examples/jetpack_compose/WORKSPACE

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

3-
_COMPOSE_VERSION = "1.2.1"
4-
5-
_KOTLIN_COMPILER_VERSION = "2.0.0"
6-
7-
_KOTLIN_COMPILER_SHA = "ef578730976154fd2c5968d75af8c2703b3de84a78dffe913f670326e149da3b"
8-
93
# Setup Kotlin
10-
114
http_archive(
125
name = "rules_kotlin",
136
sha256 = "34e8c0351764b71d78f76c8746e98063979ce08dcf1a91666f3f3bc2949a533d",
@@ -16,12 +9,7 @@ http_archive(
169

1710
load("@rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories", "kotlinc_version", "versions")
1811

19-
kotlin_repositories(
20-
compiler_release = kotlinc_version(
21-
release = _KOTLIN_COMPILER_VERSION,
22-
sha256 = _KOTLIN_COMPILER_SHA,
23-
),
24-
)
12+
kotlin_repositories()
2513

2614
register_toolchains("//:kotlin_toolchain")
2715

@@ -41,15 +29,15 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
4129

4230
maven_install(
4331
artifacts = [
44-
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:{}".format(_KOTLIN_COMPILER_VERSION),
45-
"org.jetbrains.kotlin:kotlin-stdlib:{}".format(_KOTLIN_COMPILER_VERSION),
32+
"org.jetbrains.kotlin:kotlin-compose-compiler-plugin-embeddable:{}".format(versions.KOTLIN_CURRENT_COMPILER_RELEASE.version),
33+
"org.jetbrains.kotlin:kotlin-stdlib:{}".format(versions.KOTLIN_CURRENT_COMPILER_RELEASE.version),
4634
"androidx.core:core-ktx:1.7.0",
4735
"androidx.appcompat:appcompat:1.4.1",
4836
"androidx.activity:activity-compose:1.4.0",
49-
"androidx.compose.material:material:{}".format(_COMPOSE_VERSION),
50-
"androidx.compose.ui:ui:{}".format(_COMPOSE_VERSION),
51-
"androidx.compose.ui:ui-tooling:{}".format(_COMPOSE_VERSION),
52-
"androidx.compose.runtime:runtime:{}".format(_COMPOSE_VERSION),
37+
"androidx.compose.material:material:{}".format(versions.KOTLIN_CURRENT_COMPILER_RELEASE.version),
38+
"androidx.compose.ui:ui:{}".format(versions.KOTLIN_CURRENT_COMPILER_RELEASE.version),
39+
"androidx.compose.ui:ui-tooling:{}".format(versions.KOTLIN_CURRENT_COMPILER_RELEASE.version),
40+
"androidx.compose.runtime:runtime:{}".format(versions.KOTLIN_CURRENT_COMPILER_RELEASE.version),
5341
],
5442
repositories = [
5543
"https://maven.google.com",

0 commit comments

Comments
 (0)