Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Kotlin 2.1.10 #44497

Open
wants to merge 1 commit into
base: 4.0.x
Choose a base branch
from
+438 −400
Open

Upgrade to Kotlin 2.1.10 #44497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion buildSrc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ dependencies {
implementation("org.apache.maven:maven-embedder:${mavenVersion}")
implementation("org.antora:gradle-antora-plugin:1.0.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable:${kotlinVersion}")
implementation("org.springframework:spring-context")
implementation("org.springframework:spring-core")
implementation("org.springframework:spring-web")
Expand Down
5 changes: 4 additions & 1 deletion buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
Expand Down Expand Up @@ -35,6 +35,9 @@
* When the {@link AntoraPlugin} is applied, the conventions in {@link AntoraConventions}
* are applied.
*
* When the {@code org.jetbrains.kotlin.jvm} plugin is applied, the conventions in
* {@link KotlinConventions} are applied.
*
* @author Andy Wilkinson
* @author Christoph Dreis
* @author Mike Smithson
Expand Down
22 changes: 12 additions & 10 deletions buildSrc/src/main/java/org/springframework/boot/build/KotlinConventions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2012-2024 the original author or authors.
* Copyright 2012-2025 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.
Expand All @@ -25,7 +25,9 @@
import org.gradle.api.Project;
import org.gradle.api.tasks.SourceSet;
import org.gradle.api.tasks.SourceSetContainer;
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions;
import org.jetbrains.kotlin.gradle.dsl.JvmTarget;
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions;
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion;
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile;

/**
Expand All @@ -35,7 +37,7 @@
* <ul>
* <li>{@link KotlinCompile} tasks are configured to:
* <ul>
* <li>Use {@code apiVersion} and {@code languageVersion} 1.7.
* <li>Use {@code apiVersion} and {@code languageVersion} 2.1.
* <li>Use {@code jvmTarget} 17.
* <li>Treat all warnings as errors
* <li>Suppress version warnings
Expand All @@ -56,14 +58,14 @@ void apply(Project project) {
}

private void configure(KotlinCompile compile) {
KotlinJvmOptions kotlinOptions = compile.getKotlinOptions();
kotlinOptions.setApiVersion("1.7");
kotlinOptions.setLanguageVersion("1.7");
kotlinOptions.setJvmTarget("17");
kotlinOptions.setAllWarningsAsErrors(true);
List<String> freeCompilerArgs = new ArrayList<>(kotlinOptions.getFreeCompilerArgs());
KotlinJvmCompilerOptions kotlinOptions = compile.getCompilerOptions();
kotlinOptions.getApiVersion().set(KotlinVersion.KOTLIN_2_1);
kotlinOptions.getLanguageVersion().set(KotlinVersion.KOTLIN_2_1);
kotlinOptions.getJvmTarget().set(JvmTarget.JVM_17);
kotlinOptions.getAllWarningsAsErrors().set(true);
List<String> freeCompilerArgs = new ArrayList<>(kotlinOptions.getFreeCompilerArgs().get());
freeCompilerArgs.add("-Xsuppress-version-warnings");
kotlinOptions.setFreeCompilerArgs(freeCompilerArgs);
kotlinOptions.getFreeCompilerArgs().set(freeCompilerArgs);
}

private void configureDokkatoo(Project project) {
Expand Down
2 changes: 1 addition & 1 deletion ...ain/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# === INCLUDE-CODE LOCATIONS ===

include-java=ROOT:example$java/org/springframework/boot/docs
include-kotlin= ROOT:example$kotlin/org/springframework/boot/docs
include-kotlin= ROOT:example$kotlin/org/springframework/boot/docs/kotlin

# === URLs ===

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hamcrestVersion=3.0
jacksonVersion=2.18.2
javaFormatVersion=0.0.43
junitJupiterVersion=5.11.4
kotlinVersion=1.9.25
kotlinVersion=2.1.10
mavenVersion=3.9.4
mockitoVersion=5.15.2
nativeBuildToolsVersion=0.10.5
Expand Down
5 changes: 3 additions & 2 deletions spring-boot-project/spring-boot-dependencies/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,8 +1193,9 @@ bom {
}
library("Kotlin", "${kotlinVersion}") {
prohibit {
versionRange "[2.0.0-Beta1,)"
because "it exceeds our baseline"
contains "-Beta"
contains "-RC"
because "we don't want betas or release candidates"
}
group("org.jetbrains.kotlin") {
imports = [
Expand Down
2 changes: 1 addition & 1 deletion ...ocs/src/main/java/org/springframework/boot/docs/data/nosql/cassandra/connecting/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

package org.springframework.boot.docs.data.nosql.cassandra.connecting;

class User {
public class User {

}
6 changes: 3 additions & 3 deletions ...s/features/externalconfig/typesafeconfigurationproperties/usingannotatedtypes/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package org.springframework.boot.docs.features.externalconfig.typesafeconfigurationproperties.usingannotatedtypes;

class Server {
public class Server {

Server(Object remoteAddress) {
public Server(Object remoteAddress) {
}

void start() {
public void start() {
}

}
2 changes: 1 addition & 1 deletion ...es/springapplication/applicationavailability/managing/CacheCompletelyBrokenException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

package org.springframework.boot.docs.features.springapplication.applicationavailability.managing;

class CacheCompletelyBrokenException extends RuntimeException {
public class CacheCompletelyBrokenException extends RuntimeException {

}
4 changes: 2 additions & 2 deletions ...n/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyErrorBody.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package org.springframework.boot.docs.web.servlet.springmvc.errorhandling;

class MyErrorBody {
public class MyErrorBody {

MyErrorBody(int value, String message) {
public MyErrorBody(int value, String message) {
}

}
2 changes: 1 addition & 1 deletion ...n/java/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/MyException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

package org.springframework.boot.docs.web.servlet.springmvc.errorhandling;

class MyException extends RuntimeException {
public class MyException extends RuntimeException {

}
2 changes: 1 addition & 1 deletion ...ava/org/springframework/boot/docs/web/servlet/springmvc/errorhandling/SomeController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@

package org.springframework.boot.docs.web.servlet.springmvc.errorhandling;

class SomeController {
public class SomeController {

}
2 changes: 1 addition & 1 deletion ...ontextpath/MyCloudFoundryConfiguration.kt → ...ontextpath/MyCloudFoundryConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.cloudfoundry.customcontextpath
package org.springframework.boot.docs.kotlin.actuator.cloudfoundry.customcontextpath

import jakarta.servlet.GenericServlet
import jakarta.servlet.Servlet
Expand Down
2 changes: 1 addition & 1 deletion ...th/MyReactiveCloudFoundryConfiguration.kt → ...th/MyReactiveCloudFoundryConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.docs.actuator.cloudfoundry.customcontextpath
package org.springframework.boot.docs.kotlin.actuator.cloudfoundry.customcontextpath

import org.springframework.boot.autoconfigure.web.reactive.WebFluxProperties
import org.springframework.boot.context.properties.EnableConfigurationProperties
Expand Down
2 changes: 1 addition & 1 deletion ...thindicators/MyReactiveHealthIndicator.kt → ...thindicators/MyReactiveHealthIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.health.reactivehealthindicators
package org.springframework.boot.docs.kotlin.actuator.endpoints.health.reactivehealthindicators

import org.springframework.boot.actuate.health.Health
import org.springframework.boot.actuate.health.ReactiveHealthIndicator
Expand Down
2 changes: 1 addition & 1 deletion ...stomhealthindicators/MyHealthIndicator.kt → ...stomhealthindicators/MyHealthIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.health.writingcustomhealthindicators
package org.springframework.boot.docs.kotlin.actuator.endpoints.health.writingcustomhealthindicators

import org.springframework.boot.actuate.health.Health
import org.springframework.boot.actuate.health.HealthIndicator
Expand Down
2 changes: 1 addition & 1 deletion ...ndpoints/implementingcustom/CustomData.kt → ...ndpoints/implementingcustom/CustomData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.implementingcustom
package org.springframework.boot.docs.kotlin.actuator.endpoints.implementingcustom

class CustomData(val name: String, val counter: Int)
2 changes: 1 addition & 1 deletion ...ndpoints/implementingcustom/MyEndpoint.kt → ...ndpoints/implementingcustom/MyEndpoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.implementingcustom
package org.springframework.boot.docs.kotlin.actuator.endpoints.implementingcustom

import org.springframework.boot.actuate.endpoint.annotation.Endpoint
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation
Expand Down
2 changes: 1 addition & 1 deletion ...stominfocontributors/MyInfoContributor.kt → ...stominfocontributors/MyInfoContributor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.info.writingcustominfocontributors
package org.springframework.boot.docs.kotlin.actuator.endpoints.info.writingcustominfocontributors

import org.springframework.boot.actuate.info.Info
import org.springframework.boot.actuate.info.InfoContributor
Expand Down
2 changes: 1 addition & 1 deletion ...rity/exposeall/MySecurityConfiguration.kt → ...rity/exposeall/MySecurityConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.security.exposeall
package org.springframework.boot.docs.kotlin.actuator.endpoints.security.exposeall

import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest
import org.springframework.context.annotation.Bean
Expand Down
2 changes: 1 addition & 1 deletion ...curity/typical/MySecurityConfiguration.kt → ...curity/typical/MySecurityConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.endpoints.security.typical
package org.springframework.boot.docs.kotlin.actuator.endpoints.security.typical

import org.springframework.boot.actuate.autoconfigure.security.servlet.EndpointRequest
import org.springframework.context.annotation.Bean
Expand Down
2 changes: 1 addition & 1 deletion ...stomizing/MyMetricsFilterConfiguration.kt → ...stomizing/MyMetricsFilterConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.customizing
package org.springframework.boot.docs.kotlin.actuator.metrics.customizing

import io.micrometer.core.instrument.config.MeterFilter
import org.springframework.context.annotation.Bean
Expand Down
2 changes: 1 addition & 1 deletion ...xport/graphite/MyGraphiteConfiguration.kt → ...xport/graphite/MyGraphiteConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.export.graphite
package org.springframework.boot.docs.kotlin.actuator.metrics.export.graphite

import io.micrometer.core.instrument.Clock
import io.micrometer.core.instrument.Meter
Expand Down
2 changes: 1 addition & 1 deletion .../metrics/export/jmx/MyJmxConfiguration.kt → .../metrics/export/jmx/MyJmxConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.export.jmx
package org.springframework.boot.docs.kotlin.actuator.metrics.export.jmx

import io.micrometer.core.instrument.Clock
import io.micrometer.core.instrument.Meter
Expand Down
2 changes: 1 addition & 1 deletion ...ommontags/MyMeterRegistryConfiguration.kt → ...ommontags/MyMeterRegistryConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.gettingstarted.commontags
package org.springframework.boot.docs.kotlin.actuator.metrics.gettingstarted.commontags

import io.micrometer.core.instrument.MeterRegistry
import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer
Expand Down
2 changes: 1 addition & 1 deletion ...cifictype/MyMeterRegistryConfiguration.kt → ...cifictype/MyMeterRegistryConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.gettingstarted.specifictype
package org.springframework.boot.docs.kotlin.actuator.metrics.gettingstarted.specifictype

import io.micrometer.core.instrument.Meter
import io.micrometer.core.instrument.config.NamingConvention
Expand Down
2 changes: 1 addition & 1 deletion ...r/metrics/registeringcustom/Dictionary.kt → ...r/metrics/registeringcustom/Dictionary.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.registeringcustom
package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom

internal class Dictionary {

Expand Down
2 changes: 1 addition & 1 deletion ...uator/metrics/registeringcustom/MyBean.kt → ...uator/metrics/registeringcustom/MyBean.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.registeringcustom
package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom

import io.micrometer.core.instrument.MeterRegistry
import io.micrometer.core.instrument.Tags
Expand Down
2 changes: 1 addition & 1 deletion ...eringcustom/MyMeterBinderConfiguration.kt → ...eringcustom/MyMeterBinderConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.registeringcustom
package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom

import io.micrometer.core.instrument.Gauge
import io.micrometer.core.instrument.binder.MeterBinder
Expand Down
2 changes: 1 addition & 1 deletion ...tuator/metrics/registeringcustom/Queue.kt → ...tuator/metrics/registeringcustom/Queue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.registeringcustom
package org.springframework.boot.docs.kotlin.actuator.metrics.registeringcustom

class Queue {

Expand Down
2 changes: 1 addition & 1 deletion ...godb/command/CustomCommandTagsProvider.kt → ...godb/command/CustomCommandTagsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.supported.mongodb.command
package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.command

import com.mongodb.event.CommandEvent
import io.micrometer.core.instrument.Tag
Expand Down
2 changes: 1 addition & 1 deletion ...and/MyCommandTagsProviderConfiguration.kt → ...and/MyCommandTagsProviderConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.supported.mongodb.command
package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.command

import io.micrometer.core.instrument.binder.mongodb.MongoCommandTagsProvider
import org.springframework.context.annotation.Bean
Expand Down
2 changes: 1 addition & 1 deletion ...npool/CustomConnectionPoolTagsProvider.kt → ...npool/CustomConnectionPoolTagsProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.supported.mongodb.connectionpool
package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.connectionpool

import com.mongodb.event.ConnectionPoolCreatedEvent
import io.micrometer.core.instrument.Tag
Expand Down
2 changes: 1 addition & 1 deletion ...onnectionPoolTagsProviderConfiguration.kt → ...onnectionPoolTagsProviderConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.actuator.metrics.supported.mongodb.connectionpool
package org.springframework.boot.docs.kotlin.actuator.metrics.supported.mongodb.connectionpool

import io.micrometer.core.instrument.binder.mongodb.MongoConnectionPoolTagsProvider
import org.springframework.context.annotation.Bean
Expand Down
2 changes: 1 addition & 1 deletion ...plerepackageimplementation/MyBuildTool.kt → ...plerepackageimplementation/MyBuildTool.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.buildtoolplugins.otherbuildsystems.examplerepackageimplementation
package org.springframework.boot.docs.kotlin.buildtoolplugins.otherbuildsystems.examplerepackageimplementation

import org.springframework.boot.loader.tools.Library
import org.springframework.boot.loader.tools.LibraryCallback
Expand Down
2 changes: 1 addition & 1 deletion ...tadatageneration/MyMessagingProperties.kt → ...tadatageneration/MyMessagingProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.configurationmetadata.annotationprocessor.automaticmetadatageneration
package org.springframework.boot.docs.kotlin.configurationmetadata.annotationprocessor.automaticmetadatageneration

import org.springframework.boot.context.properties.ConfigurationProperties
import java.util.Arrays
Expand Down
2 changes: 1 addition & 1 deletion ...cmetadatageneration/MyServerProperties.kt → ...cmetadatageneration/MyServerProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.configurationmetadata.annotationprocessor.automaticmetadatageneration
package org.springframework.boot.docs.kotlin.configurationmetadata.annotationprocessor.automaticmetadatageneration

import org.springframework.boot.context.properties.ConfigurationProperties

Expand Down
2 changes: 1 addition & 1 deletion ...on/nestedproperties/MyServerProperties.kt → ...on/nestedproperties/MyServerProperties.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package org.springframework.boot.docs.configurationmetadata.annotationprocessor.automaticmetadatageneration.nestedproperties
package org.springframework.boot.docs.kotlin.configurationmetadata.annotationprocessor.automaticmetadatageneration.nestedproperties

import org.springframework.boot.context.properties.ConfigurationProperties

Expand Down
Loading