Update to Gradle 8.0 (#2563)

romtsn · web-flow · commit d23b4ea5e11e · 2023-04-07T09:55:54.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,13 @@
 - Fix timestamps of PerformanceCollectionData in profiles ([#2632](https://github.com/getsentry/sentry-java/pull/2632))
 - Fix missing propagateMinConstraints flag for SentryTraced ([#2637](https://github.com/getsentry/sentry-java/pull/2637))
 
+### Dependencies
+- Bump compile Kotlin version to 1.8.0
+- Bump compile Compose version to 1.3.0
+- Bump Gradle from v7.6.0 to v8.0.2 ([#2563](https://github.com/getsentry/sentry-java/pull/2563))
+    - [changelog](https://github.com/gradle/gradle/blob/master/CHANGELOG.md#v802)
+    - [diff](https://github.com/gradle/gradle/compare/v7.6.0...v8.0.2)
+
 ## 6.17.0
 
 ### Features
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,4 @@
+
 import com.diffplug.spotless.LineEnding
 import com.vanniktech.maven.publish.MavenPublishPlugin
 import com.vanniktech.maven.publish.MavenPublishPluginExtension
@@ -117,16 +118,27 @@ subprojects {
                     from("build${sep}libs")
                     from("build${sep}publications${sep}maven")
                     // android modules
-                    from("build${sep}outputs${sep}aar")
+                    from("build${sep}outputs${sep}aar") {
+                        include("*-release*")
+                    }
                     from("build${sep}publications${sep}release")
                 }
             }
+            // craft only uses zip archives
+            this.forEach { dist ->
+                if (dist.name == DistributionPlugin.MAIN_DISTRIBUTION_NAME) {
+                    tasks.getByName("distTar").enabled = false
+                } else {
+                    tasks.getByName(dist.name + "DistTar").enabled = false
+                }
+            }
         }
 
         tasks.named("distZip").configure {
             this.dependsOn("publishToMavenLocal")
             this.doLast {
-                val distributionFilePath = "${this.project.buildDir}${sep}distributions${sep}${this.project.name}-${this.project.version}.zip"
+                val distributionFilePath =
+                    "${this.project.buildDir}${sep}distributions${sep}${this.project.name}-${this.project.version}.zip"
                 val file = File(distributionFilePath)
                 if (!file.exists()) throw IllegalStateException("Distribution file: $distributionFilePath does not exist")
                 if (file.length() == 0L) throw IllegalStateException("Distribution file: $distributionFilePath is empty")
@@ -160,14 +172,15 @@ spotless {
         googleJavaFormat()
         targetExclude("**/generated/**", "**/vendor/**")
     }
-
     kotlin {
         target("**/*.kt")
         ktlint()
+        targetExclude("**/sentry-native/**")
     }
     kotlinGradle {
         target("**/*.kts")
         ktlint()
+        targetExclude("**/sentry-native/**")
     }
 }
 
@@ -197,3 +210,11 @@ gradle.projectsEvaluated {
             }
     }
 }
+
+// Workaround for https://youtrack.jetbrains.com/issue/IDEA-316081/Gradle-8-toolchain-error-Toolchain-from-executable-property-does-not-match-toolchain-from-javaLauncher-property-when-different
+gradle.taskGraph.whenReady {
+    val task = this.allTasks.find { it.name.endsWith(".main()") } as? JavaExec
+    task?.let {
+        it.setExecutable(it.javaLauncher.get().executablePath.asFile.absolutePath)
+    }
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,5 +9,5 @@ repositories {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+    kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
 }
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -2,14 +2,15 @@ import java.math.BigDecimal
 
 object Config {
     val AGP = System.getenv("VERSION_AGP") ?: "7.3.0"
-    val kotlinVersion = "1.6.10"
+    val kotlinVersion = "1.8.0"
     val kotlinStdLib = "stdlib-jdk8"
 
     val springBootVersion = "2.7.5"
     val springBoot3Version = "3.0.3"
     val kotlinCompatibleLanguageVersion = "1.4"
 
-    val composeVersion = "1.1.1"
+    val composeVersion = "1.3.0"
+    val androidComposeCompilerVersion = "1.4.0"
 
     object BuildPlugins {
         val androidGradle = "com.android.tools.build:gradle:$AGP"
@@ -22,7 +23,7 @@ object Config {
         val gretty = "org.gretty"
         val grettyVersion = "4.0.0"
         val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.18.0"
-        val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$kotlinVersion"
+        val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
         val dokkaPluginAlias = "org.jetbrains.dokka"
         val composeGradlePlugin = "org.jetbrains.compose:compose-gradle-plugin:$composeVersion"
     }
@@ -48,8 +49,7 @@ object Config {
         val okHttpVersion = "4.9.2"
         val appCompat = "androidx.appcompat:appcompat:1.3.0"
         val timber = "com.jakewharton.timber:timber:4.7.1"
-        val okhttpBom = "com.squareup.okhttp3:okhttp-bom:$okHttpVersion"
-        val okhttp = "com.squareup.okhttp3:okhttp"
+        val okhttp = "com.squareup.okhttp3:okhttp:$okHttpVersion"
         val leakCanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"
         val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.3"
 
@@ -178,7 +178,6 @@ object Config {
         val mockitoInline = "org.mockito:mockito-inline:4.8.0"
         val awaitility = "org.awaitility:awaitility-kotlin:4.1.1"
         val mockWebserver = "com.squareup.okhttp3:mockwebserver:${Libs.okHttpVersion}"
-        val mockWebserver4 = "com.squareup.okhttp3:mockwebserver:4.9.3"
         val jsonUnit = "net.javacrumbs.json-unit:json-unit:2.32.0"
         val hsqldb = "org.hsqldb:hsqldb:2.6.1"
         val javaFaker = "com.github.javafaker:javafaker:1.0.2"
@@ -198,7 +197,7 @@ object Config {
         val detekt = "io.gitlab.arturbosch.detekt"
         val detektVersion = "1.19.0"
         val detektPlugin = "io.gitlab.arturbosch.detekt"
-        val binaryCompatibilityValidatorVersion = "0.8.0"
+        val binaryCompatibilityValidatorVersion = "0.13.0"
         val binaryCompatibilityValidatorPlugin = "org.jetbrains.kotlinx:binary-compatibility-validator:$binaryCompatibilityValidatorVersion"
         val binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator"
     }
diff --git a/buildSrc/src/main/java/Publication.kt b/buildSrc/src/main/java/Publication.kt
@@ -14,6 +14,7 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {
     this.maybeCreate("android").contents {
         from("build${sep}publications${sep}androidRelease")
         from("build${sep}outputs${sep}aar") {
+            include("*-release*")
             rename {
                 it.replace("-release", "-android-release")
             }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
diff --git a/sentry-android-core/.gitignore b/sentry-android-core/.gitignore
@@ -1 +1,3 @@
 INSTALLATION
+last_crash
+/sentry
diff --git a/sentry-android-fragment/.gitignore b/sentry-android-fragment/.gitignore
@@ -1 +1,3 @@
 /build
+last_crash
+/sentry
diff --git a/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts b/sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
@@ -40,7 +40,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Config.composeVersion
+        kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
     }
 
     signingConfigs {
diff --git a/sentry-android-okhttp/build.gradle.kts b/sentry-android-okhttp/build.gradle.kts
@@ -69,13 +69,11 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    compileOnly(Config.Libs.okhttpBom)
     compileOnly(Config.Libs.okhttp)
 
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
 
     // tests
-    testImplementation(Config.Libs.okhttpBom)
     testImplementation(Config.Libs.okhttp)
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.androidxJunit)
diff --git a/sentry-apollo-3/build.gradle.kts b/sentry-apollo-3/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(Config.TestLibs.mockitoInline)
-    testImplementation(Config.TestLibs.mockWebserver4)
+    testImplementation(Config.TestLibs.mockWebserver)
 }
 
 configure<SourceSetContainer> {
diff --git a/sentry-apollo/build.gradle.kts b/sentry-apollo/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(Config.TestLibs.mockitoInline)
-    testImplementation(Config.TestLibs.mockWebserver4)
+    testImplementation(Config.TestLibs.mockWebserver)
     testImplementation(Config.Libs.apolloCoroutines)
 }
 
diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts
@@ -20,6 +20,9 @@ kotlin {
 
     android {
         publishLibraryVariants("release")
+        compilations.all {
+            kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
+        }
     }
     jvm("desktop") {
         compilations.all {
@@ -53,7 +56,7 @@ kotlin {
                 implementation(Config.Libs.lifecycleCommonJava8)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(Config.TestLibs.kotlinTestJunit)
                 implementation(Config.TestLibs.mockitoKotlin)
diff --git a/sentry-compose/gradle.properties b/sentry-compose/gradle.properties
@@ -1 +1,2 @@
 kotlin.mpp.stability.nowarn=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
diff --git a/sentry-compose/src/androidUnitTest/kotlin/io/sentry/compose/SentryLifecycleObserverTest.kt b/sentry-compose/src/androidUnitTest/kotlin/io/sentry/compose/SentryLifecycleObserverTest.kt
diff --git a/sentry-jdbc/build.gradle.kts b/sentry-jdbc/build.gradle.kts
@@ -50,8 +50,8 @@ jacoco {
 
 tasks.jacocoTestReport {
     reports {
-        xml.isEnabled = true
-        html.isEnabled = false
+        xml.required.set(true)
+        html.required.set(false)
     }
 }
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts
@@ -56,8 +56,8 @@ jacoco {
 
 tasks.jacocoTestReport {
     reports {
-        xml.isEnabled = true
-        html.isEnabled = false
+        xml.required.set(true)
+        html.required.set(false)
     }
 }
 
diff --git a/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts b/sentry-opentelemetry/sentry-opentelemetry-core/build.gradle.kts
@@ -53,8 +53,8 @@ jacoco {
 
 tasks.jacocoTestReport {
     reports {
-        xml.isEnabled = true
-        html.isEnabled = false
+        xml.required.set(true)
+        html.required.set(false)
     }
 }
 
diff --git a/sentry-samples/sentry-samples-android/build.gradle.kts b/sentry-samples/sentry-samples-android/build.gradle.kts
@@ -41,7 +41,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Config.composeVersion
+        kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion
     }
 
     dependenciesInfo {
diff --git a/sentry-servlet-jakarta/build.gradle.kts b/sentry-servlet-jakarta/build.gradle.kts
@@ -1,25 +1,15 @@
-import io.spring.gradle.dependencymanagement.dsl.DependencyManagementExtension
 import net.ltgt.gradle.errorprone.errorprone
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 plugins {
     `java-library`
     kotlin("jvm")
     jacoco
     id(Config.QualityPlugins.errorProne)
     id(Config.QualityPlugins.gradleVersions)
-    id(Config.BuildPlugins.springBoot) version Config.springBootVersion apply false
-    id(Config.BuildPlugins.springDependencyManagement) version Config.BuildPlugins.springDependencyManagementVersion
     id(Config.BuildPlugins.buildConfig) version Config.BuildPlugins.buildConfigVersion
 }
 
-the<DependencyManagementExtension>().apply {
-    imports {
-        mavenBom(SpringBootPlugin.BOM_COORDINATES)
-    }
-}
-
 configure<JavaPluginExtension> {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
@@ -77,19 +67,6 @@ tasks {
         dependsOn(jacocoTestReport)
     }
 }
-repositories {
-    mavenCentral()
-}
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = Config.kotlinCompatibleLanguageVersion
-}
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_1_8.toString()
-    languageVersion = Config.kotlinCompatibleLanguageVersion
-}
 
 tasks.withType<JavaCompile>().configureEach {
     options.errorprone {
diff --git a/sentry-servlet/build.gradle.kts b/sentry-servlet/build.gradle.kts
diff --git a/sentry-spring-boot-starter-jakarta/build.gradle.kts b/sentry-spring-boot-starter-jakarta/build.gradle.kts
diff --git a/sentry-spring-boot-starter/build.gradle.kts b/sentry-spring-boot-starter/build.gradle.kts
diff --git a/sentry-spring-jakarta/build.gradle.kts b/sentry-spring-jakarta/build.gradle.kts
diff --git a/sentry-spring/build.gradle.kts b/sentry-spring/build.gradle.kts
diff --git a/sentry/src/test/java/io/sentry/vendor/gson/internal/bind/util/ISO8601UtilsTest.java b/sentry/src/test/java/io/sentry/vendor/gson/internal/bind/util/ISO8601UtilsTest.java

Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,5 @@ repositories {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`tasks.withType<KotlinCompile>().configureEach {`
`12`		`- kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`12`	`+ kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ fun DistributionContainer.configureForMultiplatform(project: Project) {`
`14`	`14`	`this.maybeCreate("android").contents {`
`15`	`15`	`from("build${sep}publications${sep}androidRelease")`
`16`	`16`	`from("build${sep}outputs${sep}aar") {`
	`17`	`+ include("-release")`
`17`	`18`	`rename {`
`18`	`19`	`it.replace("-release", "-android-release")`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`INSTALLATION`
	`2`	`+last_crash`
	`3`	`+/sentry`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ android {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`composeOptions {`
`43`		`- kotlinCompilerExtensionVersion = Config.composeVersion`
	`43`	`+ kotlinCompilerExtensionVersion = Config.androidComposeCompilerVersion`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`signingConfigs {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ dependencies {`
`39`	`39`	`testImplementation(Config.TestLibs.kotlinTestJunit)`
`40`	`40`	`testImplementation(Config.TestLibs.mockitoKotlin)`
`41`	`41`	`testImplementation(Config.TestLibs.mockitoInline)`
`42`		`- testImplementation(Config.TestLibs.mockWebserver4)`
	`42`	`+ testImplementation(Config.TestLibs.mockWebserver)`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`configure<SourceSetContainer> {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@ kotlin {`
`20`	`20`
`21`	`21`	`android {`
`22`	`22`	`publishLibraryVariants("release")`
	`23`	`+ compilations.all {`
	`24`	`+ kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`25`	`+ }`
`23`	`26`	`}`
`24`	`27`	`jvm("desktop") {`
`25`	`28`	`compilations.all {`
`@@ -53,7 +56,7 @@ kotlin {`
`53`	`56`	`implementation(Config.Libs.lifecycleCommonJava8)`
`54`	`57`	`}`
`55`	`58`	`}`
`56`		`- val androidTest by getting {`
	`59`	`+ val androidUnitTest by getting {`
`57`	`60`	`dependencies {`
`58`	`61`	`implementation(Config.TestLibs.kotlinTestJunit)`
`59`	`62`	`implementation(Config.TestLibs.mockitoKotlin)`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`	`1`	`kotlin.mpp.stability.nowarn=true`
	`2`	`+kotlin.mpp.androidSourceSetLayoutVersion=2`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ jacoco {`
`50`	`50`
`51`	`51`	`tasks.jacocoTestReport {`
`52`	`52`	`reports {`
`53`		`- xml.isEnabled = true`
`54`		`- html.isEnabled = false`
	`53`	`+ xml.required.set(true)`
	`54`	`+ html.required.set(false)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ jacoco {`
`56`	`56`
`57`	`57`	`tasks.jacocoTestReport {`
`58`	`58`	`reports {`
`59`		`- xml.isEnabled = true`
`60`		`- html.isEnabled = false`
	`59`	`+ xml.required.set(true)`
	`60`	`+ html.required.set(false)`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ jacoco {`
`53`	`53`
`54`	`54`	`tasks.jacocoTestReport {`
`55`	`55`	`reports {`
`56`		`- xml.isEnabled = true`
`57`		`- html.isEnabled = false`
	`56`	`+ xml.required.set(true)`
	`57`	`+ html.required.set(false)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`