Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gradle Plugin: Support Java 11 #4863

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Gradle Plugin: Support Java 11 #4863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
625ee2c
Use Java 11 as Gradle JVM
hfhbd Dec 1, 2023
bd55d8d
Use JVM 17 for worker actions
hfhbd Dec 1, 2023
6943714
Fix
hfhbd Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions sqldelight-gradle-plugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ tasks.named('dockerTest') {
":sqldelight-compiler:environment:publishAllPublicationsToInstallLocallyRepository",
":sqlite-migrations:environment:publishAllPublicationsToInstallLocallyRepository",
)
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(11)
}
environment("ORG_GRADLE_PROJECT_sqldelightVersion", project.version)
}

Expand Down
12 changes: 11 additions & 1 deletion sqldelight-gradle-plugin/src/main/kotlin/app/cash/sqldelight/gradle/SqlDelightWorkerTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import org.gradle.api.file.ConfigurableFileCollection
import org.gradle.api.tasks.CacheableTask
import org.gradle.api.tasks.Classpath
import org.gradle.api.tasks.SourceTask
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.jvm.toolchain.JavaToolchainService
import org.gradle.workers.WorkQueue
import org.gradle.workers.WorkerExecutor

Expand All @@ -18,11 +20,19 @@ abstract class SqlDelightWorkerTask : SourceTask() {
@get:Inject
internal abstract val workerExecutor: WorkerExecutor

@get:Inject
internal abstract val jvmToolchain: JavaToolchainService

@get:Classpath
abstract val classpath: ConfigurableFileCollection

internal fun workQueue(): WorkQueue =
workerExecutor.classLoaderIsolation {
workerExecutor.processIsolation {
it.classpath.from(classpath)
it.forkOptions {
it.executable = jvmToolchain.launcherFor {
it.languageVersion.set(JavaLanguageVersion.of(17))
}.get().executablePath.toString()
}
}
}