Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions .github/workflows/job.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
contents: "read"
steps:
- name: "Setup: Harden Runner"
uses: step-security/harden-runner@a90bcbc6539c36a85cdfeb73f7e2f433735f215b # v2.15
uses: step-security/harden-runner@8d3c67de8e2fe68ef647c8db1e6a09f647780f40 # v2.19.0
with:
disable-sudo: true
egress-policy: audit
Expand All @@ -42,7 +42,9 @@ jobs:
distribution: graalvm
java-version: "25"
- name: "Setup: Elide"
uses: elide-dev/setup-elide@d91d5859c0722417ea1ac4c682382ac8a6622b80 # v3.0.0
uses: elide-dev/setup-elide@d2f742321bf672300c0935839b6f5c6e562a965b # v4.1.0
with:
channel: nightly
- name: "Build: Java Compiler"
run: ./mvnw clean install -pl plexus-compilers
- name: "Build: Kotlin Plugin"
Expand Down
12 changes: 2 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Configuring Elide as your `javac` compiler:
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<dependencies>
<dependency>
<groupId>dev.elide</groupId>
Expand Down Expand Up @@ -77,14 +77,6 @@ the plugin coordinates:
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.2.0</version>
</dependency>
</dependencies>
```

> [!TIP]
Expand Down Expand Up @@ -134,7 +126,7 @@ Elide:
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<dependencies>
<dependency>
<groupId>dev.elide</groupId>
Expand Down
22 changes: 20 additions & 2 deletions kotlin-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,15 @@
<kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>

<compilerVersion>1.0.0</compilerVersion>
<kotlinVersion>2.3.10</kotlinVersion>
<kotlinVersion>2.3.21</kotlinVersion>
<injectVersion>1</injectVersion>
<plexusVersion>2.16.2</plexusVersion>
<junitVersion>6.0.3</junitVersion>
<mavenVersion>3.9.12</mavenVersion>
<mavenVersion>3.9.15</mavenVersion>
<mavenToolsVersion>3.15.2</mavenToolsVersion>
<mavenTestPluginVersion>3.5.5</mavenTestPluginVersion>
<mavenCompilerVersion>3.15.0</mavenCompilerVersion>
<plexusUtilsVersion>4.0.3</plexusUtilsVersion>
</properties>

<repositories>
Expand Down Expand Up @@ -163,6 +164,23 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<!-- transitive dependency of plexus-compiler-api, updated manually because of a CVE -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>${plexusUtilsVersion}</version>
</dependency>
<!-- transitive dependency of kotlin-maven-plugin, updated manually because of a CVE -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.22.0</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
14 changes: 13 additions & 1 deletion plexus-compilers/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@
<kotlin.code.style>official</kotlin.code.style>
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>

<kotlinVersion>2.3.10</kotlinVersion>
<kotlinVersion>2.3.21</kotlinVersion>
<injectVersion>1</injectVersion>
<plexusVersion>2.16.2</plexusVersion>
<junitVersion>6.0.3</junitVersion>
<mavenTestPluginVersion>3.5.5</mavenTestPluginVersion>
<plexusUtilsVersion>4.0.3</plexusUtilsVersion>
</properties>

<repositories>
Expand Down Expand Up @@ -81,6 +82,17 @@
</plugins>
</build>

<dependencyManagement>
<dependencies>
<!-- transitive dependency of plexus-compiler-api, updated manually because of a CVE -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>${plexusUtilsVersion}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sample-java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This project demonstrates use of Elide as a replacement for `javac` within a Mav
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<dependencies>
<dependency>
<groupId>dev.elide</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sample-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<dependencies>
<dependency>
<groupId>dev.elide</groupId>
Expand Down
8 changes: 0 additions & 8 deletions sample-kotlin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,4 @@ of `org.jetbrains.kotlin:kotlin-maven-plugin`. Use of `<extensions>` is not supp
</plugin>
</plugins>
</build>

<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.2.0</version>
</dependency>
</dependencies>
```
2 changes: 1 addition & 1 deletion sample-kotlin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.2.0</version>
<version>2.3.21</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion sample-mixed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Kotlin plugin `<extensions>` is not supported yet.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<dependencies>
<dependency>
<groupId>dev.elide</groupId>
Expand Down
5 changes: 2 additions & 3 deletions sample-mixed/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<version>3.15.0</version>
<dependencies>
<dependency>
<groupId>dev.elide</groupId>
Expand Down Expand Up @@ -100,8 +100,7 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.2.0</version>
<version>2.3.21</version>
</dependency>
</dependencies>

</project>
Loading