Repository navigation
chore(build): Compile with a JDK 21 toolchain and upgrade Mockito and Error Prone #6242
+405
−478
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package io.sentry.gradle | ||
|
|
||
| import com.android.build.gradle.BaseExtension | ||
| import org.gradle.api.JavaVersion | ||
| import org.gradle.api.Plugin | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.Task | ||
| import org.gradle.api.artifacts.VersionCatalogsExtension | ||
| import org.gradle.api.plugins.JavaBasePlugin | ||
| import org.gradle.api.plugins.JavaPluginExtension | ||
| import org.gradle.api.tasks.compile.JavaCompile | ||
| import org.gradle.jvm.toolchain.JavaLanguageVersion | ||
| import org.jetbrains.kotlin.gradle.dsl.JvmTarget | ||
| import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile | ||
|
|
||
| /** The JDK every module compiles and tests with, whatever JDK runs Gradle. */ | ||
| private val BUILD_JDK = JavaLanguageVersion.of(21) | ||
|
|
||
| /** The level the SDK publishes, so that Java 8 consumers can still use it. */ | ||
| private val PUBLISHED_JAVA_VERSION = JavaVersion.VERSION_1_8 | ||
|
|
||
| /** | ||
| * Holds every toolchain, bytecode level decision and compilation option of a module. It does the | ||
| * following | ||
| * - sample apps target the build JDK (21) | ||
| * - unit test code will target the build JDK (21) (required for Mockito 5) | ||
| * - published JVM modules main code pins the Java 1.8 release | ||
| * - published Android modules main code targets Java 1.8 | ||
| * - minSdk is set for Android libraries | ||
| */ | ||
| class SentryCompilationPlugin : Plugin<Project> { | ||
| override fun apply(project: Project) { | ||
| project.plugins.withType(JavaBasePlugin::class.java) { | ||
| project.extensions.getByType(JavaPluginExtension::class.java).toolchain { | ||
| languageVersion.set(BUILD_JDK) | ||
| } | ||
| } | ||
|
|
||
| // Only works for non-android modules | ||
| // See https://issuetracker.google.com/issues/278800528 | ||
| project.plugins.withId("com.vanniktech.maven.publish") { | ||
|
Contributor
There was a problem hiding this comment. i was going to ask why this line exists but then i saw your other comment. i think this is fragile since it relies on precise task namings. i don't think this would match |
||
| project.plugins.withId("java-library") { | ||
| project.tasks.named("compileJava", JavaCompile::class.java) { | ||
| options.release.set(PUBLISHED_JAVA_VERSION.majorVersion.toInt()) | ||
| } | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. Kotlin lacks JDK API release pinMedium Severity The new JDK 21 toolchain pins published Java with Additional Locations (1)  Triggered by project rule: PR Review Guidelines for Cursor Bugbot Reviewed by Cursor Bugbot for commit e387384. Configure here. |
||
|
|
||
| project.plugins.withId("com.android.library") { | ||
| val android = project.extensions.getByType(BaseExtension::class.java) | ||
|
Contributor
There was a problem hiding this comment. we have some production kotlin code. do you know if this sets the JDK compatibility on that? I looked at how ANdroidx does this might be worth copying. They notably don't set the toolchain anywhere in code. https://github.com/androidx/androidx/blob/95347b245f1527ec6856a3daa580a1c0abbddc11/buildSrc/private/src/main/kotlin/androidx/build/AndroidXImplPlugin.kt#L492 |
||
| android.compileOptions { | ||
| sourceCompatibility = PUBLISHED_JAVA_VERSION | ||
| targetCompatibility = PUBLISHED_JAVA_VERSION | ||
| } | ||
| android.defaultConfig { aarMetadata { minCompileSdk = project.minSdk() } } | ||
| } | ||
|
|
||
| listOf("com.android.library", "com.android.application").forEach { pluginId -> | ||
| project.plugins.withId(pluginId) { project.targetBuildJdkForUnitTests() } | ||
| } | ||
| } | ||
|
|
||
| private fun Project.minSdk(): Int = | ||
|
|
||
| extensions | ||
| .getByType(VersionCatalogsExtension::class.java) | ||
| .named("libs") | ||
| .findVersion("minSdk") | ||
| .orElseThrow { IllegalStateException("libs.versions.minSdk is missing") } | ||
| .requiredVersion | ||
| .toInt() | ||
|
|
||
| private fun Project.targetBuildJdkForUnitTests() { | ||
| val unitTestTask = { task: Task -> task.name.contains("UnitTest") } | ||
| // jvmTarget is a Property, so this set wins over the AGP convention whenever it runs. | ||
| tasks.withType(KotlinJvmCompile::class.java).matching(unitTestTask).configureEach { | ||
| compilerOptions.jvmTarget.set(JvmTarget.fromTarget(BUILD_JDK.toString())) | ||
| } | ||
| // source/targetCompatibility are plain fields, so the last write wins, and AGP writes its | ||
| // compileOptions while it creates the compile tasks. Registering earlier - at apply time or | ||
| // in onVariants - is silently overwritten, so right now there's no way around afterEvaluate. | ||
| afterEvaluate { | ||
|
Contributor
There was a problem hiding this comment. here, we don't have any strict requirements on sourcecompatibilty or targetcompatibility since this is test code. i think we should just set the toolchain here (and hopefully also remove the |
||
| tasks.withType(JavaCompile::class.java).matching(unitTestTask).configureEach { | ||
| sourceCompatibility = BUILD_JDK.toString() | ||
| targetCompatibility = BUILD_JDK.toString() | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,3 @@ | ||
| plugins { | ||
| `kotlin-dsl` | ||
| } | ||
|
markushi marked this conversation as resolved.
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think this is about "java compatibility" so i think a name like
JdkTargetConventionor something like that would make more sense.