From 1575390dd57b7f9945dedc891a2a3e1ad0df5cb9 Mon Sep 17 00:00:00 2001 From: melodicore Date: Wed, 4 Mar 2026 16:44:21 +0200 Subject: [PATCH 1/2] chore: update gh actions --- .github/workflows/job.build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/job.build.yml b/.github/workflows/job.build.yml index 922621d..13e7238 100644 --- a/.github/workflows/job.build.yml +++ b/.github/workflows/job.build.yml @@ -27,22 +27,22 @@ jobs: contents: "read" steps: - name: "Setup: Harden Runner" - uses: step-security/harden-runner@0634a2670c59f64b4a01f0f96f84700a4088b9f0 # v2.12.0 + uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15 with: disable-sudo: true egress-policy: audit - name: "Setup: Checkout" - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 with: fetch-depth: 1 persist-credentials: false - name: "Setup: JDK" - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1 + uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 with: distribution: graalvm - java-version: "24" + java-version: "25" - name: "Setup: Elide" - uses: elide-dev/setup-elide@990b915b2974a70e7654acb1303607b4cd1d3538 # v2.0.0 + uses: elide-dev/setup-elide@d91d5859c0722417ea1ac4c682382ac8a6622b80 # v3.0.0 - name: "Build: Java Compiler" run: ./mvnw clean install -pl plexus-compilers - name: "Build: Kotlin Plugin" From f45ceae951cd75dc1c3844cf1b316c82de898561 Mon Sep 17 00:00:00 2001 From: melodicore Date: Wed, 4 Mar 2026 17:00:29 +0200 Subject: [PATCH 2/2] chore: update deps --- .mvn/wrapper/maven-wrapper.properties | 4 +- kotlin-plugin/pom.xml | 14 +++--- .../kotlin/ElideKotlinJSCompileMojo.java | 34 ------------- .../kotlin/ElideKotlinJSTestCompileMojo.java | 34 ------------- .../kotlin/ElideKotlinJSCompileMojoImpl.kt | 50 ------------------- .../ElideKotlinJSTestCompileMojoImpl.kt | 50 ------------------- plexus-compilers/pom.xml | 8 +-- 7 files changed, 13 insertions(+), 181 deletions(-) delete mode 100644 kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojo.java delete mode 100644 kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojo.java delete mode 100644 kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojoImpl.kt delete mode 100644 kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojoImpl.kt diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d58dfb7..5505623 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip diff --git a/kotlin-plugin/pom.xml b/kotlin-plugin/pom.xml index 32410af..0461e5e 100644 --- a/kotlin-plugin/pom.xml +++ b/kotlin-plugin/pom.xml @@ -41,14 +41,14 @@ 11 1.0.0 - 2.2.0 + 2.3.10 1 - 2.15.0 - 5.11.1 - 3.9.10 - 3.15.1 - 2.22.2 - 3.14.0 + 2.16.2 + 6.0.3 + 3.9.12 + 3.15.2 + 3.5.5 + 3.15.0 diff --git a/kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojo.java b/kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojo.java deleted file mode 100644 index 66955a9..0000000 --- a/kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojo.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2024-2025 Elide Technologies, Inc. - * - * Licensed under the MIT license (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://opensource.org/license/mit/ - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under the License. - */ -package dev.elide.maven.plugin.kotlin; - -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.ResolutionScope; - -/** - * Elide Kotlin to Javascript compiler Mojo. - * - * @author Lauri Heino - * @since 1.0.0 - */ -/* -Disabled until support exists. - -@Mojo(name = "js", - defaultPhase = LifecyclePhase.COMPILE, - requiresDependencyResolution = ResolutionScope.COMPILE, - threadSafe = true) - */ -public class ElideKotlinJSCompileMojo extends ElideKotlinJSCompileMojoImpl { -} diff --git a/kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojo.java b/kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojo.java deleted file mode 100644 index 265b833..0000000 --- a/kotlin-plugin/src/main/java/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojo.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2024-2025 Elide Technologies, Inc. - * - * Licensed under the MIT license (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://opensource.org/license/mit/ - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under the License. - */ -package dev.elide.maven.plugin.kotlin; - -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.ResolutionScope; - -/** - * Elide Kotlin to Javascript test compiler Mojo. - * - * @author Lauri Heino - * @since 1.0.0 - */ -/* -Disabled until support exists. - -@Mojo(name = "test-js", - defaultPhase = LifecyclePhase.TEST_COMPILE, - requiresDependencyResolution = ResolutionScope.TEST, - threadSafe = true) - */ -public class ElideKotlinJSTestCompileMojo extends ElideKotlinJSCompileMojoImpl { -} diff --git a/kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojoImpl.kt b/kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojoImpl.kt deleted file mode 100644 index 20b1c78..0000000 --- a/kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSCompileMojoImpl.kt +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2024-2025 Elide Technologies, Inc. - * - * Licensed under the MIT license (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://opensource.org/license/mit/ - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under the License. - */ -package dev.elide.maven.plugin.kotlin - -import org.apache.maven.plugins.annotations.Parameter -import org.jetbrains.kotlin.cli.common.CLICompiler -import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.maven.K2JSCompilerMojo -import java.io.File - -/** - * Elide Kotlin to Javascript compiler. - * - * @author Lauri Heino - * @since 1.0.0 - */ -internal open class ElideKotlinJSCompileMojoImpl : K2JSCompilerMojo() { - /** - * Elide executable location. - */ - @Parameter(name = "executable") var executable: String? = null - - override fun execCompiler( - compiler: CLICompiler?, - messageCollector: MessageCollector, - arguments: K2JSCompilerArguments, - sourceRoots: List, - ): ExitCode = - ElideRunner.runCompiler( - messageCollector, - arguments, - sourceRoots, - project, - executable, - "kotlinc-js", - false, - ) -} diff --git a/kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojoImpl.kt b/kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojoImpl.kt deleted file mode 100644 index 59dd66c..0000000 --- a/kotlin-plugin/src/main/kotlin/dev/elide/maven/plugin/kotlin/ElideKotlinJSTestCompileMojoImpl.kt +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright (c) 2024-2025 Elide Technologies, Inc. - * - * Licensed under the MIT license (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * https://opensource.org/license/mit/ - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under the License. - */ -package dev.elide.maven.plugin.kotlin - -import org.apache.maven.plugins.annotations.Parameter -import org.jetbrains.kotlin.cli.common.CLICompiler -import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.maven.KotlinTestJSCompilerMojo -import java.io.File - -/** - * Elide Kotlin to Javascript test compiler. - * - * @author Lauri Heino - * @since 1.0.0 - */ -internal open class ElideKotlinJSTestCompileMojoImpl : KotlinTestJSCompilerMojo() { - /** - * Elide executable location. - */ - @Parameter(name = "executable") var executable: String? = null - - override fun execCompiler( - compiler: CLICompiler?, - messageCollector: MessageCollector, - arguments: K2JSCompilerArguments, - sourceRoots: List, - ): ExitCode = - ElideRunner.runCompiler( - messageCollector, - arguments, - sourceRoots, - project, - executable, - "kotlinc-js", - false, - ) -} diff --git a/plexus-compilers/pom.xml b/plexus-compilers/pom.xml index dfbfff9..b7b8c44 100644 --- a/plexus-compilers/pom.xml +++ b/plexus-compilers/pom.xml @@ -46,11 +46,11 @@ official 1.8 - 2.2.0 + 2.3.10 1 - 2.15.0 - 5.11.1 - 2.22.2 + 2.16.2 + 6.0.3 + 3.5.5