Skip to content

Commit

Permalink
Merge pull request #27 from spring-petclinic/feature/spring-boot-3.1
Browse files Browse the repository at this point in the history
Bump to Spring Boot 3.1.0 and Kotlin 1.8.21
  • Loading branch information
arey authored Jun 30, 2023
2 parents ae1519c + 7392161 commit b6339ac
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
description = "Kotlin version of the Spring Petclinic application"
group = "org.springframework.samples"
// Align with Spring Version
version = "3.0.5"
version = "3.1.0"

java.sourceCompatibility = JavaVersion.VERSION_17

plugins {
val kotlinVersion = "1.7.22"
id("org.springframework.boot") version "3.0.5"
val kotlinVersion = "1.8.21"
id("org.springframework.boot") version "3.1.0"
id("io.spring.dependency-management") version "1.1.0"
id("com.google.cloud.tools.jib") version "3.1.4"
kotlin("jvm") version kotlinVersion
Expand All @@ -21,12 +21,10 @@ plugins {
val boostrapVersion = "5.1.3"
val fontAwesomeVersion = "4.7.0"

tasks {
withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs = listOf("-Xjsr305=strict")
}
tasks.withType<KotlinCompile> {
kotlinOptions {
jvmTarget = "17"
freeCompilerArgs = listOf("-Xjsr305=strict")
}
}

Expand All @@ -50,7 +48,6 @@ dependencies {
implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
implementation("org.glassfish.jaxb:jaxb-runtime")
implementation("javax.cache:cache-api")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.webjars.npm:bootstrap:$boostrapVersion")
implementation("org.webjars.npm:font-awesome:$fontAwesomeVersion")
Expand All @@ -64,6 +61,7 @@ dependencies {
runtimeOnly("com.mysql:mysql-connector-j")

developmentOnly("org.springframework.boot:spring-boot-devtools")
implementation(kotlin("stdlib-jdk8"))
}

jib {
Expand All @@ -72,3 +70,4 @@ jib {
tags = setOf(project.version.toString(), "latest")
}
}

0 comments on commit b6339ac

Please sign in to comment.