Skip to content

Commit

Permalink
Merge branch 'main' into add_scm
Browse files Browse the repository at this point in the history
  • Loading branch information
gastaldi authored Oct 24, 2023
2 parents a367451 + cbf3bf8 commit 143f3c9
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 20 deletions.
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ updates:
directory: "/"
schedule:
interval: "daily"
ignore:
- dependency-name: "org.apache.maven.plugins:maven-compiler-plugin"
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import dotty.tools.dotc.interfaces.Diagnostic;
import dotty.tools.dotc.interfaces.SimpleReporter;
import dotty.tools.dotc.interfaces.SourceFile;
import io.quarkus.bootstrap.model.PathsCollection;
import io.quarkus.deployment.dev.CompilationProvider;
import io.quarkus.paths.PathCollection;

/**
* Main.process() documentation for "dotty-interface" overload used here.
Expand Down Expand Up @@ -170,4 +170,4 @@ public void onSourceCompiled(SourceFile source) {
CompilerCallback.super.onSourceCompiled(source);
}
}
}
}
2 changes: 1 addition & 1 deletion docs/antora.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: quarkus-scala3
title: Quarkus - Scala3
title: Scala 3
version: dev
nav:
- modules/ROOT/nav.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
*/
package io.quarkiverse.scala.scala3.it;

import javax.enterprise.context.ApplicationScoped;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;

@Path("/scala3")
@ApplicationScoped
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.quarkiverse.scala.scala3.it;

import io.quarkus.test.junit.NativeImageTest;
import io.quarkus.test.junit.QuarkusIntegrationTest;

@NativeImageTest
@QuarkusIntegrationTest
public class NativeScala3ResourceIT extends Scala3ResourceTest {
}
10 changes: 1 addition & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,9 @@
<url>https://github.com/quarkiverse/quarkus-scala3</url>
</scm>
<properties>
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<quarkus.version>2.1.0.Final</quarkus.version>
<quarkus.version>3.5.0</quarkus.version>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -48,10 +44,6 @@
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.version}</version>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>
Expand Down
2 changes: 1 addition & 1 deletion runtime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
<artifactId>quarkus-extension-maven-plugin</artifactId>
<version>${quarkus.version}</version>
<executions>
<execution>
Expand Down

0 comments on commit 143f3c9

Please sign in to comment.