mirror of
https://github.com/GayPizzaSpecifications/pork.git
synced 2025-08-03 21:21:33 +00:00
swap to jdk 21
This commit is contained in:
@ -20,13 +20,14 @@ dependencies {
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.toVersion(22)
|
||||
targetCompatibility = JavaVersion.toVersion(22)
|
||||
val javaVersion = JavaVersion.toVersion(21)
|
||||
sourceCompatibility = javaVersion
|
||||
targetCompatibility = javaVersion
|
||||
}
|
||||
|
||||
tasks.withType<KotlinCompile> {
|
||||
compilerOptions {
|
||||
jvmTarget.set(JvmTarget.JVM_22)
|
||||
jvmTarget.set(JvmTarget.JVM_21)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,8 +3,10 @@ package gay.pizza.pork.buildext
|
||||
import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.Task
|
||||
import org.gradle.api.tasks.TaskProvider
|
||||
import org.gradle.kotlin.dsl.create
|
||||
import org.gradle.kotlin.dsl.getByType
|
||||
import org.gradle.kotlin.dsl.register
|
||||
|
||||
class PorkAstPlugin : Plugin<Project> {
|
||||
override fun apply(target: Project) {
|
||||
@ -22,12 +24,12 @@ class PorkAstPlugin : Plugin<Project> {
|
||||
private fun getAstExtension(project: Project): PorkAstExtension =
|
||||
project.extensions.getByType<PorkAstExtension>()
|
||||
|
||||
private fun createGenerateAstCode(project: Project): Task {
|
||||
private fun createGenerateAstCode(project: Project): TaskProvider<*> {
|
||||
val extension = getAstExtension(project)
|
||||
val codegenType = extension.astCodegenType.get()
|
||||
if (codegenType == AstCodegenType.Standard) {
|
||||
return project.tasks.create("generateAstCode", GenerateStandardAstCode::class)
|
||||
return project.tasks.register("generateAstCode", GenerateStandardAstCode::class)
|
||||
}
|
||||
return project.tasks.create("generateAstCode", GeneratePorkIdeaAstCode::class)
|
||||
return project.tasks.register("generateAstCode", GeneratePorkIdeaAstCode::class)
|
||||
}
|
||||
}
|
||||
|
@ -17,14 +17,14 @@ open class PorkModulePlugin : Plugin<Project> {
|
||||
target.repositories.maven(url = "https://gitlab.com/api/v4/projects/49101454/packages/maven")
|
||||
|
||||
target.extensions.getByType<JavaPluginExtension>().apply {
|
||||
val javaVersion = JavaVersion.toVersion(22)
|
||||
val javaVersion = JavaVersion.toVersion(21)
|
||||
sourceCompatibility = javaVersion
|
||||
targetCompatibility = javaVersion
|
||||
}
|
||||
|
||||
target.tasks.withType<KotlinCompile> {
|
||||
compilerOptions {
|
||||
jvmTarget.set(JvmTarget.JVM_22)
|
||||
jvmTarget.set(JvmTarget.JVM_21)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2,7 +2,9 @@ package gay.pizza.pork.buildext
|
||||
|
||||
import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.api.tasks.TaskProvider
|
||||
import org.gradle.kotlin.dsl.create
|
||||
import org.gradle.kotlin.dsl.register
|
||||
|
||||
class PorkStdlibPlugin : Plugin<Project> {
|
||||
override fun apply(target: Project) {
|
||||
@ -11,6 +13,6 @@ class PorkStdlibPlugin : Plugin<Project> {
|
||||
processResources.dependsOn(generateStdlibManifest)
|
||||
}
|
||||
|
||||
private fun createGenerateStdlibManifest(project: Project): GenerateStdlibManifest =
|
||||
project.tasks.create("generateStdlibManifest", GenerateStdlibManifest::class)
|
||||
private fun createGenerateStdlibManifest(project: Project): TaskProvider<GenerateStdlibManifest> =
|
||||
project.tasks.register("generateStdlibManifest", GenerateStdlibManifest::class)
|
||||
}
|
||||
|
Reference in New Issue
Block a user