Skip to content

Create a new "bootstrap" toolchain and compile with 2.1.0 #1244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 35 commits into from
Dec 24, 2024
Merged

Create a new "bootstrap" toolchain and compile with 2.1.0 #1244

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
1d71c79
Create a new "bootstrap" toolchain.
restingbull Dec 14, 2024
125ceb7
Add neverlink and export support.
restingbull Dec 14, 2024
c66eed3
Able to compile with 2.1.0.
restingbull Dec 14, 2024
23ecc6d
Fix naming of outputs in test.
restingbull Dec 16, 2024
e0f20d5
Add cli toolchain to workspace
restingbull Dec 16, 2024
c712839
Cleanup lint
restingbull Dec 16, 2024
10b48d6
Update maven deps
restingbull Dec 16, 2024
3b7bffd
Workaround change in reflection resolution in 2.1.0. Fixed in 2.1.20
restingbull Dec 17, 2024
3f80a00
Pass stdlib to clit compiler runtime.
restingbull Dec 17, 2024
1a70251
Remove integration test as examples now covers all cases.
restingbull Dec 17, 2024
b036cf2
Include coroutines, as the compiler needs them to run
restingbull Dec 17, 2024
7a13ebc
Remove kotlin released references.
restingbull Dec 17, 2024
e2c7fc0
Add 2.1 capabilities
restingbull Dec 17, 2024
2ea9a15
Update docs, add provider to the release
restingbull Dec 18, 2024
a4331ff
Update serializer core
restingbull Dec 18, 2024
435e900
Fix serialization lib
restingbull Dec 18, 2024
b643a76
Clean up deps test
restingbull Dec 18, 2024
52eaa8b
Update defaults and add toolchain to actions
restingbull Dec 18, 2024
64f9ac3
Shutdown and clean. Something seems rotten
restingbull Dec 18, 2024
a913f0e
enable toolchain debug and fix toUpserCase;
restingbull Dec 18, 2024
5f09d1b
Update runner to use override_module when correct
restingbull Dec 18, 2024
79b04ce
switch off rbe
restingbull Dec 19, 2024
fb7c090
Fix workspace cycles
restingbull Dec 19, 2024
0b7da29
Fix ordering on deps, update compose version
restingbull Dec 19, 2024
ae72932
Map compse versions, fix deps toolchain version
restingbull Dec 19, 2024
b0b3abd
update jetpack again
restingbull Dec 19, 2024
fbd257c
Finally get a working set of libraries
restingbull Dec 20, 2024
aca7ee1
Add pnning mechanism and hard code workspace
restingbull Dec 20, 2024
ff12c2c
Remove stdlib. Should pulled from toolchain
restingbull Dec 20, 2024
c40d2e5
Work around https://github.com/bazelbuild/bazel/issues/21225
restingbull Dec 20, 2024
51b753b
Re-enable rbe for integration tests, turn off verbose
restingbull Dec 23, 2024
e78858a
Update options
restingbull Dec 24, 2024
42c2f78
revert jvm default for another pr
restingbull Dec 24, 2024
9088ba7
Add capabilities
restingbull Dec 24, 2024
cd7ca3e
Add capabilities and update docs
restingbull Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update runner to use override_module when correct
  • Loading branch information
@restingbull
restingbull committed Dec 21, 2024
commit 5f09d1b618b0cacb406e5a11e791d8fe3914313a
13 changes: 0 additions & 13 deletions examples/associates/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ kt_register_toolchains()

load("@rules_kotlin//src/main/starlark/core/repositories:versions.bzl", "versions")

http_archive(
name = "rules_android",
sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
strip_prefix = "rules_android-0.1.1",
urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
)

http_archive(
name = "bazel_skylib",
sha256 = versions.SKYLIB_SHA,
Expand Down Expand Up @@ -52,9 +45,3 @@ maven_install(
"https://repo1.maven.org/maven2",
],
)

http_archive(
name = "rules_pkg",
sha256 = "8a298e832762eda1830597d64fe7db58178aa84cd5926d76d5b744d6558941c2",
url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz",
)
9 changes: 5 additions & 4 deletions src/main/kotlin/io/bazel/kotlin/test/BazelIntegrationTestRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ object BazelIntegrationTestRunner {
bzlmod && workspace.hasModule() || !bzlmod && workspace.hasWorkspace()
}.forEach { bzlmod ->
println("Starting bzlmod $bzlmod test")
val overrideFlag = if (bzlmod) "--override_module=rules_kotlin=$unpack" else "--override_repository=rules_kotlin=$unpack"
bazel.run(
workspace,
"--bazelrc=$bazelrc",
Expand All @@ -77,13 +78,13 @@ object BazelIntegrationTestRunner {
"--bazelrc=$bazelrc",
"info",
*version.workspaceFlag(bzlmod),
"--override_repository=rules_kotlin=$unpack",
overrideFlag
).onFailThrow()
bazel.run(
workspace,
"--bazelrc=$bazelrc",
"build",
"--override_repository=rules_kotlin=$unpack",
overrideFlag,
"//...",
*version.workspaceFlag(bzlmod)
).onFailThrow()
Expand All @@ -92,7 +93,7 @@ object BazelIntegrationTestRunner {
"--bazelrc=$bazelrc",
"query",
*version.workspaceFlag(bzlmod),
"--override_repository=rules_kotlin=$unpack",
overrideFlag,
"kind(\".*_test\", \"//...\")",
).ok { process ->
if (process.stdOut.isNotEmpty()) {
Expand All @@ -101,7 +102,7 @@ object BazelIntegrationTestRunner {
"--bazelrc=$bazelrc",
"test",
*version.workspaceFlag(bzlmod),
"--override_repository=rules_kotlin=$unpack",
overrideFlag,
"--test_output=all",
"//...",
).onFailThrow()
Expand Down