Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
82a3f0c
feat: add Maven to Elide converter script
rjwalters Nov 15, 2025
5496ff6
feat: add `elide adopt maven` command and fix GraalVM native build
rjwalters Nov 16, 2025
2536c79
Merge branch 'main' into robb/elide-convert
rjwalters Nov 18, 2025
b191f46
feat: add advanced Maven adoption features
rjwalters Nov 18, 2025
ccfb0c1
feat(cli): enhance Maven adoption with plugins, property defaults, an…
rjwalters Nov 18, 2025
5e8f0ca
test(cli): add comprehensive test suite for Maven adoption features
rjwalters Nov 18, 2025
28762f1
test(cli): add Apache Commons Lang integration test
rjwalters Nov 18, 2025
79bf8a6
test(cli): add Jackson Databind integration test
rjwalters Nov 18, 2025
b8a91cc
test(cli): add Spring Cloud multi-module integration test
rjwalters Nov 18, 2025
f12a6fe
feat(cli): enhance Maven adopter UX with colorized output
rjwalters Nov 18, 2025
7d60e79
feat(cli): add Gradle adopter with enhanced UX
rjwalters Nov 18, 2025
bb2104b
test(cli): add OkHttp integration test for Gradle adopter
rjwalters Nov 19, 2025
825c805
docs: add comprehensive migration guides for Maven, Gradle, and Bazel
rjwalters Nov 19, 2025
3695939
feat(cli): add Gradle version catalog support
rjwalters Nov 19, 2025
800e9db
feat(cli): add Bazel and Node.js adopters
rjwalters Nov 19, 2025
f2e01cf
test(cli): add comprehensive tests for Bazel and Node.js adopters
rjwalters Nov 19, 2025
fb412e4
chore: remove legacy Python script
rjwalters Nov 19, 2025
bc35064
feat(cli): add auto-detection for `elide adopt` command
rjwalters Nov 19, 2025
d2e5f59
feat(cli): add auto-detection for adopt command
rjwalters Nov 19, 2025
09a47c5
feat(cli): add polyglot monorepo support to adopt command
rjwalters Nov 19, 2025
b4ad11e
feat(cli): add Python project adopter with pyproject.toml and require…
rjwalters Nov 19, 2025
fe6c0a4
test(cli): add Python adopter real-world integration tests
rjwalters Nov 19, 2025
c5a6d11
docs(cli): update Bazel adopter status to complete
rjwalters Nov 19, 2025
18e06a0
refactor(cli): improve PKL generator output with headers, sections, a…
rjwalters Nov 19, 2025
71335ed
feat(cli): add real-world integration testing framework for Python ad…
rjwalters Nov 19, 2025
3f72c60
fix(cli): add graceful error handling for real-world Python integrati…
rjwalters Nov 19, 2025
7985a8f
feat(cli): integrate ktoml fork with empty line parsing fix
rjwalters Nov 20, 2025
4fa37c2
Merge remote-tracking branch 'origin/main' into robb/elide-convert
rjwalters Nov 20, 2025
394d99b
fix: restore gradle/verification-metadata.xml
rjwalters Nov 20, 2025
0fddf33
chore: remove accidentally committed build artifacts
rjwalters Nov 20, 2025
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.venv/
.DS_Store
TODO.md
.dev/cache
.dev/dependencies
.dev/coverage
Expand Down Expand Up @@ -60,3 +61,8 @@ README.md.br
node_modules
.intellijPlatform/
cosign.key

# External submodule build artifacts
external/ktoml/build/
external/ktoml/.gradle/
external/ktoml/kotlin-js-store/
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@
url = [email protected]:google/boringssl.git
ignore = dirty

[submodule "external/ktoml"]
path = external/ktoml
url = https://github.com/rjwalters/ktoml.git
121 changes: 0 additions & 121 deletions buildscript-gradle.lockfile

This file was deleted.

1 change: 1 addition & 0 deletions external/ktoml
Submodule ktoml added at dfc738
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ versions.java.language = 21
versions.java.toolchain = 25
versions.java.minimum = 21
versions.java.target = 21
versions.kotlin.sdk = 2.2.21
versions.kotlin.sdk = 2.3.0-Beta2
versions.kotlin.language = 2.1
versions.android.sdk.target = 33

Expand Down
2 changes: 1 addition & 1 deletion gradle/elide.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ kover-plugin = "0.9.1"
ksp = "2.2.21-2.0.4"
ktor = "3.3.1"
ktlint = "1.1.1"
ktoml = "0.7.1"
ktoml = "0.8.9-rjwalters"
larray = "0.2.1"
lettuce = "6.2.5.RELEASE"
lmaxDisruptor = "4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
13 changes: 0 additions & 13 deletions package-lock.kdl
Original file line number Diff line number Diff line change
Expand Up @@ -772,14 +772,6 @@ dependencies{
"@types/node" ">=0.0.0"
}
}
pkg "@types/conventional-commits-parser" "@types/node"{
version "24.8.1"
resolved "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz"
integrity "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q=="
dependencies{
undici-types ">=7.14.0 <7.15.0-0"
}
}
pkg "@types/debug"{
version "4.1.12"
resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz"
Expand Down Expand Up @@ -4318,11 +4310,6 @@ version "5.9.3"
resolved "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz"
integrity "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="
}
pkg undici-types{
version "7.14.0"
resolved "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz"
integrity "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA=="
}
pkg unicorn-magic{
version "0.1.0"
resolved "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz"
Expand Down
41 changes: 37 additions & 4 deletions packages/cli/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -957,8 +957,6 @@ val initializeAtBuildtime: List<String> = listOf(
"org.pkl.core.runtime.VmLanguageProvider",
"elide.runtime.lang.typescript",
"elide.runtime.typescript",
"elide.runtime.plugins.js.JavaScript",
"elide.runtime.plugins.js.JavaScript\$Plugin",
"elide.runtime.plugins.AbstractLanguagePlugin",
"elide.runtime.plugins.AbstractLanguagePlugin\$Companion",
"elide.tool.io.RuntimeWorkdirManager",
Expand Down Expand Up @@ -1377,6 +1375,22 @@ val commonNativeArgs = listOfNotNull(
"-J--add-exports=java.base/jdk.internal.module=ALL-UNNAMED",
"-J--add-exports=java.base/jdk.internal.jrtfs=ALL-UNNAMED",
"-J--add-exports=jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=org.graalvm.truffle.runtime",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=com.oracle.truffle.enterprise.svm",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED",
"-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=ALL-UNNAMED",
"-J--add-exports=jdk.graal.compiler/jdk.graal.compiler.util.json=com.oracle.graal.reporter",
"-J--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"-J--add-opens=java.base/java.io=ALL-UNNAMED",
Expand All @@ -1385,6 +1399,21 @@ val commonNativeArgs = listOfNotNull(
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=io.netty.common/io.netty.util=org.graalvm.nativeimage.builder",
"--add-opens=io.netty.common/io.netty.util.internal.svm=org.graalvm.nativeimage.builder",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=org.graalvm.truffle.runtime",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=com.oracle.truffle.enterprise.svm",
"--add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=ALL-UNNAMED",
"-H:+PreserveFramePointer",
"-H:+ReportExceptionStackTraces",
"-H:+AddAllCharsets",
Expand Down Expand Up @@ -1468,7 +1497,7 @@ val commonNativeArgs = listOfNotNull(
"-Dtruffle.TrustAllTruffleRuntimeProviders=true",
"-Dgraalvm.locatorDisabled=false",
"-Dpolyglotimpl.DisableVersionChecks=false",
"-Dpolyglotimpl.AttachLibraryFailureAction=throw",
"-Dpolyglotimpl.AttachLibraryFailureAction=ignore",
"-Dnetty.default.allocator.max-order=3",
"-Dnetty.resource-leak-detector-level=DISABLED",
"-Djansi.eager=false",
Expand Down Expand Up @@ -1816,7 +1845,11 @@ val darwinOnlyArgs = defaultPlatformArgs.plus(listOfNotNull(
"--parallelism=${nativeBuildCpus(Runtime.getRuntime().availableProcessors())}",
) else listOf(
"-J-Xmx64g",
"--parallelism=12",
"--parallelism=${nativeBuildCpus(Runtime.getRuntime().availableProcessors())}",
"-H:DeadlockWatchdogInterval=60", // Increase watchdog timeout from default 10s to 60s
"-J-Djava.util.concurrent.ForkJoinPool.common.parallelism=4", // Reduce ForkJoinPool parallelism
"--initialize-at-run-time=io.micronaut.http.ssl.SelfSignedCertificateProvider", // Defer SSL cert generation to runtime to avoid BouncyCastle compilation timeout
"--initialize-at-run-time=io.netty.pkitesting", // Defer Netty PKI testing to runtime
))).plus(if (oracleGvm && enableAuxCache) listOf(
"-H:+AuxiliaryEngineCache",
) else emptyList())
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/src/main/kotlin/elide/tool/cli/Elide.kt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import elide.runtime.gvm.internals.intrinsics.ElideIntrinsic
import elide.tool.cli.cfg.ElideCLITool.ELIDE_TOOL_VERSION
import elide.tool.cli.cmd.builder.ToolBuildCommand
import elide.tool.cli.cmd.builder.ToolWhichCommand
import elide.tool.cli.cmd.adopt.AdoptCommand
import elide.tool.cli.cmd.classpath.ClasspathCommand
import elide.tool.cli.cmd.deps.AddCommand
import elide.tool.cli.cmd.deps.InstallCommand
Expand Down Expand Up @@ -117,6 +118,7 @@ internal const val ELIDE_HEADER = ("@|bold,fg(magenta)%n" +
ClasspathCommand::class,
ToolProjectCommand::class,
InitCommand::class,
AdoptCommand::class,
InstallCommand::class,
AddCommand::class,
ToolInfoCommand::class,
Expand Down
Loading
Loading