lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-12-02 19:34:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Kotlin 1.2.20

Browse Source 
This commits upgrade to Kotlin 1.2.20 and uses the new stdlib artifact
names. As a result, 2.0  milestones prior to Spring Boot 2.0.0.RC1 are
no longer supported.

Closes gh-576
This commit is contained in:
Stephane Nicoll
2018-02-01 11:24:22 +01:00
parent 18ef480a23
commit 1d9a68d6fc
15 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
initializr-generator/src/main/java/io/spring/initializr/generator/ProjectGenerator.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -557,9 +557,9 @@ public class ProjectGenerator {
return "kotlin-stdlib";
}
else if ("1.7".equals(javaVersion)) {
return "kotlin-stdlib-jre7";
return "kotlin-stdlib-jdk7";
}
return "kotlin-stdlib-jre8";
return "kotlin-stdlib-jdk8";
}
private static boolean isJava8OrLater(ProjectRequest request) {

2
initializr-generator/src/test/resources/project/gradle/kotlin-java7-build.gradle.gen
View File

@@ -31,7 +31,7 @@ repositories {
dependencies {
compile('org.springframework.boot:spring-boot-starter')
compile("org.jetbrains.kotlin:kotlin-stdlib-jre7:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile('org.springframework.boot:spring-boot-starter-test')
}

2
initializr-generator/src/test/resources/project/gradle/kotlin-java9-build.gradle.gen
View File

@@ -40,7 +40,7 @@ repositories {
dependencies {
compile('org.springframework.boot:spring-boot-starter')
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
compile("org.jetbrains.kotlin:kotlin-reflect")
testCompile('org.springframework.boot:spring-boot-starter-test')
}

2
initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-build.gradle.gen
View File

@@ -40,7 +40,7 @@ repositories {
dependencies {
compile('org.springframework.boot:spring-boot-starter')
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
compile("org.jetbrains.kotlin:kotlin-reflect")
testCompile('org.springframework.boot:spring-boot-starter-test')
}

2
initializr-generator/src/test/resources/project/gradle/kotlin-springboot2-legacy-build.gradle.gen
View File

@@ -40,7 +40,7 @@ repositories {
dependencies {
compile('org.springframework.boot:spring-boot-starter')
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile('org.springframework.boot:spring-boot-starter-test')
}

2
initializr-generator/src/test/resources/project/kotlin/standard/build.gradle.gen
View File

@@ -37,7 +37,7 @@ repositories {
dependencies {
compile('org.springframework.boot:spring-boot-starter')
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
testCompile('org.springframework.boot:spring-boot-starter-test')
}

2
initializr-generator/src/test/resources/project/kotlin/standard/pom.xml.gen
View File

@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre8</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>

2
initializr-generator/src/test/resources/project/kotlin/war/build.gradle.gen
View File

@@ -41,7 +41,7 @@ configurations {
dependencies {
compile('org.springframework.boot:spring-boot-starter-web')
compile("org.jetbrains.kotlin:kotlin-stdlib-jre8:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlinVersion}")
compile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
testCompile('org.springframework.boot:spring-boot-starter-test')

2
initializr-generator/src/test/resources/project/kotlin/war/pom.xml.gen
View File

@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre8</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>

2
initializr-generator/src/test/resources/project/maven/kotlin-java7-pom.xml.gen
View File

@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre7</artifactId>
<artifactId>kotlin-stdlib-jdk7</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>

2
initializr-generator/src/test/resources/project/maven/kotlin-java9-pom.xml.gen
View File

@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre8</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>

2
initializr-generator/src/test/resources/project/maven/kotlin-springboot2-legacy-pom.xml.gen
View File

@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre8</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
<dependency>

2
initializr-generator/src/test/resources/project/maven/kotlin-springboot2-pom.xml.gen
View File

@@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jre8</artifactId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>