Skip to content

Commit 3121958

Browse files
committed
feat: upgrade Kotlin to 1.4
1 parent 28bca5e commit 3121958

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

README.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ Spring Boot **MVC** web application
1414

1515
### Spring Boot compatibility
1616

17-
| Spring Boot | starter-errors |
18-
|:-----------:|:--------------:|
19-
| 2.3.x | 3.x |
20-
| 2.2.x | 2.x |
21-
| 2.1.x | 1.x |
17+
| Spring Boot | starter-errors | Kotlin |
18+
|:-----------:|:--------------:|:------:|
19+
| 2.3 | 4.x | 1.4 |
20+
| 2.3 | 3.x | 1.3 |
21+
| 2.2 | 2.x | 1.3 |
22+
| 2.1 | 1.x | 1.3 |
2223

2324
Other combinations might work but there're not supported.
2425

@@ -27,7 +28,7 @@ Other combinations might work but there're not supported.
2728
For example with Gradle Kotlin DSL :
2829

2930
```kotlin
30-
implementation("com.ekino.oss.spring:ekino-spring-boot-starter-errors:1.2.0")
31+
implementation("com.ekino.oss.spring:ekino-spring-boot-starter-errors:3.0.0")
3132
```
3233

3334
NB : if you want to use snapshots you need to add the following configuration to your Gradle build script :

build.gradle.kts

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
import org.jetbrains.dokka.gradle.DokkaTask
21
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
32
import org.unbrokendome.gradle.plugins.testsets.dsl.testSets
43
import java.net.URL
54

65
plugins {
7-
val kotlinVersion = "1.3.72"
6+
val kotlinVersion = "1.4.0"
87
`java-library`
98
`maven-publish`
109
signing
1110
kotlin("jvm") version kotlinVersion
1211
kotlin("plugin.spring") version kotlinVersion
1312
id("com.ekino.oss.plugin.kotlin-quality") version "2.0.0"
1413
id("org.unbroken-dome.test-sets") version "3.0.1"
15-
id("org.jetbrains.dokka") version "0.10.1"
14+
id("org.jetbrains.dokka") version "1.4.0-rc"
1615
}
1716

1817
group = "com.ekino.oss.spring"
19-
version = "3.0.1-SNAPSHOT"
18+
version = "4.0.0-SNAPSHOT"
2019

2120
repositories {
2221
mavenCentral()
2322
jcenter()
2423
}
2524

26-
val springBootVersion = "2.3.2.RELEASE"
25+
val springBootVersion = "2.3.3.RELEASE"
2726
val guavaVersion = "29.0-jre"
2827
val awsSdkVersion = "2.7.22"
2928
val jcvVersion = "1.4.2"
@@ -95,7 +94,7 @@ java {
9594
}
9695

9796
val javadocJar by tasks.registering(Jar::class) {
98-
dependsOn("dokka")
97+
dependsOn("dokkaHtml")
9998
archiveClassifier.set("javadoc")
10099
from(buildDir.resolve("dokka"))
101100
}
@@ -113,17 +112,19 @@ tasks {
113112
jvmArgs("-Duser.language=en", "-Dspring.test.constructor.autowire.mode=ALL")
114113
}
115114

116-
withType<DokkaTask> {
117-
configuration {
118-
reportUndocumented = false
119-
jdkVersion = 8
120-
externalDocumentationLink {
121-
url = URL("https://docs.spring.io/spring-framework/docs/5.2.x/javadoc-api/")
122-
packageListUrl = URL(url, "package-list")
123-
}
124-
externalDocumentationLink {
125-
url = URL("https://docs.spring.io/spring-boot/docs/2.2.x/api/")
126-
packageListUrl = URL(url, "package-list")
115+
dokkaHtml {
116+
dokkaSourceSets {
117+
configureEach {
118+
reportUndocumented = false
119+
jdkVersion = 8
120+
externalDocumentationLink {
121+
url = URL("https://docs.spring.io/spring-framework/docs/5.2.x/javadoc-api/")
122+
packageListUrl = URL(url, "package-list")
123+
}
124+
externalDocumentationLink {
125+
url = URL("https://docs.spring.io/spring-boot/docs/2.3.x/api/")
126+
packageListUrl = URL(url, "package-list")
127+
}
127128
}
128129
}
129130
}

gradle.properties

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
# See https://github.com/gradle/gradle/issues/11308
2-
systemProp.org.gradle.internal.publish.checksums.insecure=true
1+
org.gradle.jvmargs=-Xmx1g

0 commit comments

Comments
 (0)