jlengrand/quarkus
1
0
Fork 0
mirror of https://github.com/jlengrand/quarkus.git synced 2026-03-10 08:41:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: update Kotlin version to 1.3.61

Browse Source
This commit is contained in:
Manyanda Chitimbo
2020-02-14 13:36:38 +01:00
parent 0dc9e9b0f6
commit 2aee5b4a5f
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bom/runtime/pom.xml
View File

@@ -141,7 +141,7 @@
<aws-lambda-serverless-java-container.version>1.3.1</aws-lambda-serverless-java-container.version>
<awssdk.version>2.10.3</awssdk.version>
<azure-functions-java-library.version>1.3.0</azure-functions-java-library.version>
<kotlin.version>1.3.41</kotlin.version>
<kotlin.version>1.3.61</kotlin.version>
<dekorate.version>0.10.9</dekorate.version>
<maven-artifact-transfer.version>0.10.0</maven-artifact-transfer.version>
<jline.version>2.14.6</jline.version>

2
build-parent/pom.xml
View File

@@ -23,7 +23,7 @@
<!-- These properties are needed in order for them to be resolvable by the generated projects -->
<!-- Quarkus uses jboss-parent and it comes with 3.8.0-jboss-2, we don't want that in the templates -->
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<kotlin.version>1.3.41</kotlin.version>
<kotlin.version>1.3.61</kotlin.version>
<scala.version>2.12.8</scala.version>
<scala-plugin.version>4.1.1</scala-plugin.version>

2
extensions/kotlin/deployment/src/main/java/io/quarkus/kotlin/deployment/KotlinCompilationProvider.java
View File

@@ -25,7 +25,7 @@ public class KotlinCompilationProvider implements CompilationProvider {
private static final Logger log = Logger.getLogger(KotlinCompilationProvider.class);
// see: https://github.com/JetBrains/kotlin/blob/v1.3.41/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java#L192
// see: https://github.com/JetBrains/kotlin/blob/v1.3.61/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java#L181
private final static Pattern OPTION_PATTERN = Pattern.compile("([^:]+):([^=]+)=(.*)");
private static final String KOTLIN_PACKAGE = "org.jetbrains.kotlin";

10
independent-projects/tools/pom.xml
View File

@@ -32,7 +32,7 @@
<!-- These properties are needed in order for them to be resolvable by the generated projects -->
<!-- Quarkus uses jboss-parent and it comes with 3.8.0-jboss-2, we don't want that in the templates -->
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<kotlin.version>1.3.41</kotlin.version>
<kotlin.version>1.3.61</kotlin.version>
<scala.version>2.12.8</scala.version>
<scala-plugin.version>4.1.1</scala-plugin.version>
@@ -148,7 +148,7 @@
<scope>import</scope>
<type>pom</type>
</dependency>
</dependencies>
</dependencyManagement>
@@ -162,7 +162,7 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<plugins>
<plugin>
@@ -295,11 +295,11 @@
</executions>
</plugin>
<plugin>
<!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
<!-- ## IMPORTANT ## In your ~/.m2/settings.xml you
need to add and edit the following profile:
<profile>
<id>release</id>
<properties>
<properties>
<gpg.useagent>false</gpg.useagent>
<gpg.executable>/usr/local/Cellar/gnupg@1.4/1.4.23_1/bin/gpg1</gpg.executable> <- use gpg1 on Mac OS X
<gpg.homedir>~/.gnupg</gpg.homedir> <- Update to your own directory <gpg.passphrase>******</gpg.passphrase> <- Add your passphrase

4
integration-tests/kotlin/src/test/resources/projects/classic-kotlin/pom.xml
View File

@@ -12,7 +12,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<kotlin.version>1.3.41</kotlin.version>
<kotlin.version>1.3.61</kotlin.version>
</properties>
<dependencyManagement>
<dependencies>
@@ -136,4 +136,4 @@
</build>
</profile>
</profiles>
</project>
</project>