From 875f4c91130dd58c2447661aa7c4536dfbc8ab58 Mon Sep 17 00:00:00 2001
From: Maciej Walkowiak <walkowiak.maciej@yahoo.com>
Date: Wed, 27 Apr 2022 09:13:07 +0200
Subject: [PATCH] Upgrade Spring Boot dependency to 2.5.13 (#2011)

Fixes #2010
---
 CHANGELOG.md                                 | 1 +
 buildSrc/src/main/java/Config.kt             | 4 +---
 sentry-apache-http-client-5/build.gradle.kts | 2 +-
 sentry-servlet-jakarta/build.gradle.kts      | 6 +++---
 sentry-servlet/build.gradle.kts              | 6 +++---
 sentry-spring-boot-starter/build.gradle.kts  | 2 +-
 sentry-spring/build.gradle.kts               | 2 +-
 7 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fad03d608b..efd37fb788 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ Starting with version `6.6.0` of the `sentry`, [Sentry's version >= v21.9.0](htt
 
 * Fix: Profiling rate decreased from 300hz to 100hz; fixed profiling traces folder creation on manual sdk init (#1997)
 * Fix: Allow disabling sending of client reports via Android Manifest and external options (#2007)
+* Ref: Upgrade Spring Boot dependency to 2.5.13 (#2011)
 
 ## 6.0.0-alpha.6
 
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
index 4e9d234421..29adc89d42 100644
--- a/buildSrc/src/main/java/Config.kt
+++ b/buildSrc/src/main/java/Config.kt
@@ -4,9 +4,7 @@ object Config {
     val kotlinVersion = "1.5.31"
     val kotlinStdLib = "stdlib-jdk8"
 
-    val springBootVersion = "2.4.4"
-    // Spring is currently not compatible with Kotlin 1.4
-    val springKotlinCompatibleLanguageVersion = "1.3"
+    val springBootVersion = "2.5.13"
     val kotlinCompatibleLanguageVersion = "1.4"
 
     object BuildPlugins {
diff --git a/sentry-apache-http-client-5/build.gradle.kts b/sentry-apache-http-client-5/build.gradle.kts
index 2b6b67073d..861f1f7a55 100644
--- a/sentry-apache-http-client-5/build.gradle.kts
+++ b/sentry-apache-http-client-5/build.gradle.kts
@@ -16,7 +16,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 dependencies {
diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts
index 6fbeb7499b..5716ed3b7b 100644
--- a/sentry-servlet-jakarta/build.gradle.kts
+++ b/sentry-servlet-jakarta/build.gradle.kts
@@ -26,7 +26,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 dependencies {
@@ -82,12 +82,12 @@ repositories {
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {
     jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = Config.springKotlinCompatibleLanguageVersion
+    languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 val compileTestKotlin: KotlinCompile by tasks
 compileTestKotlin.kotlinOptions {
     jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = Config.springKotlinCompatibleLanguageVersion
+    languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 tasks.withType<JavaCompile>().configureEach {
diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts
index 93f0f70f49..bbdfbeee98 100644
--- a/sentry-servlet/build.gradle.kts
+++ b/sentry-servlet/build.gradle.kts
@@ -26,7 +26,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 dependencies {
@@ -83,12 +83,12 @@ repositories {
 val compileKotlin: KotlinCompile by tasks
 compileKotlin.kotlinOptions {
     jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = Config.springKotlinCompatibleLanguageVersion
+    languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 val compileTestKotlin: KotlinCompile by tasks
 compileTestKotlin.kotlinOptions {
     jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = Config.springKotlinCompatibleLanguageVersion
+    languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 tasks.withType<JavaCompile>().configureEach {
diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts
index b03afdcbd3..bca7c8daa6 100644
--- a/sentry-spring-boot-starter/build.gradle.kts
+++ b/sentry-spring-boot-starter/build.gradle.kts
@@ -28,7 +28,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 dependencies {
diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts
index afe325fa15..609ebb4fc1 100644
--- a/sentry-spring/build.gradle.kts
+++ b/sentry-spring/build.gradle.kts
@@ -27,7 +27,7 @@ configure<JavaPluginExtension> {
 
 tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
-    kotlinOptions.languageVersion = Config.springKotlinCompatibleLanguageVersion
+    kotlinOptions.languageVersion = Config.kotlinCompatibleLanguageVersion
 }
 
 dependencies {