Repository navigation
chore(build): Compile with a JDK 21 toolchain and upgrade Mockito and Error Prone #6242
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,107 @@ | ||
| 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.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.dsl.KotlinAndroidProjectExtension | ||
| 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, for Java and for Kotlin | ||
| * - published Android modules main code targets Java 1.8 | ||
| * - minSdk is set for Android libraries | ||
| */ | ||
| class JdkTargetConvention : Plugin<Project> { | ||
| override fun apply(project: Project) { | ||
| project.plugins.withType(JavaBasePlugin::class.java) { | ||
| project.extensions.getByType(JavaPluginExtension::class.java).toolchain { | ||
| languageVersion.set(BUILD_JDK) | ||
| } | ||
| } | ||
|
|
||
| project.plugins.withId("com.vanniktech.maven.publish") { | ||
| // Only works for non-android modules | ||
| // See https://issuetracker.google.com/issues/278800528 | ||
| project.plugins.withId("java-library") { | ||
| project.tasks.named("compileJava", JavaCompile::class.java) { | ||
| options.release.set(PUBLISHED_JAVA_VERSION.majorVersion.toInt()) | ||
| } | ||
| } | ||
| // -Xjdk-release is the Kotlin counterpart of release: without it Kotlin resolves against the | ||
| // build JDK and happily compiles e.g. Files.readString() into Java 8 bytecode. The version | ||
| // follows jvmTarget, which the modules that publish a higher level set themselves. | ||
| project.plugins.withId("org.jetbrains.kotlin.jvm") { | ||
| project.tasks.named("compileKotlin", KotlinJvmCompile::class.java) { | ||
| compilerOptions.freeCompilerArgs.add( | ||
|
Contributor
There was a problem hiding this comment. something seems wrong about this. let's jump on a call if this doesn't make sense. that means that we need to do the same here. |
||
| compilerOptions.jvmTarget.map { "-Xjdk-release=${it.target}" } | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
cursor[bot] marked this conversation as resolved.
|
||
|
|
||
| project.plugins.withId("com.android.library") { | ||
| val android = project.extensions.getByType(BaseExtension::class.java) | ||
|
markushi marked this conversation as resolved.
|
||
| 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 = | ||
|
markushi marked this conversation as resolved.
|
||
| extensions | ||
| .getByType(VersionCatalogsExtension::class.java) | ||
| .named("libs") | ||
| .findVersion("minSdk") | ||
| .orElseThrow { IllegalStateException("libs.versions.minSdk is missing") } | ||
| .requiredVersion | ||
| .toInt() | ||
|
|
||
| /** | ||
| * Mockito 5 and mockito-kotlin 6 are built for Java 11, so test code - which is never published - | ||
| * cannot share the Java 8 target of the main code. AGP has no per variant compileOptions, so this | ||
| * goes through the Kotlin compilations: their compile task providers are configured after AGP | ||
| * wrote its own compileOptions, which an apply time configureEach would lose against. | ||
| */ | ||
| private fun Project.targetBuildJdkForUnitTests() { | ||
| plugins.withId("org.jetbrains.kotlin.android") { | ||
| extensions | ||
| .getByType(KotlinAndroidProjectExtension::class.java) | ||
| .target | ||
| .compilations | ||
| .configureEach { | ||
| if (name.endsWith("UnitTest")) { | ||
| compileTaskProvider.configure { | ||
| compilerOptions.jvmTarget.set(JvmTarget.fromTarget(BUILD_JDK.toString())) | ||
| } | ||
| compileJavaTaskProvider?.configure { | ||
| 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
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 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
compileReleaseJavafor example meaning that these tasks are not set properly: https://scans.gradle.com/s/mom72s36qrefi/timeline?name=compileReleaseJavaThere 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.
Fully agree it's fragile! This block is for pure JVM modules, where there's only "compileJava", and no variants. Once all our published modules target JDK 11, hopefully most of the code within this plugin can be greatly simplified.