mirror of
https://github.com/GayPizzaSpecifications/pork.git
synced 2025-08-02 12:50:55 +00:00
swap to jdk 21
This commit is contained in:
parent
61fbb6f35f
commit
b1c6aac335
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -7,10 +7,10 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
|
||||
- name: Set up JDK 22
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
|
||||
with:
|
||||
java-version: '22'
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
|
||||
|
@ -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)
|
||||
}
|
||||
|
@ -1,13 +0,0 @@
|
||||
# IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
|
||||
pluginGroup = gay.pizza.plugins.pork
|
||||
pluginName = Pork
|
||||
pluginRepositoryUrl = https://github.com/GayPizzaSpecifications/pork
|
||||
pluginVersion = 0.1.2
|
||||
|
||||
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
|
||||
pluginSinceBuild = 242
|
||||
pluginUntilBuild = 243.*
|
||||
|
||||
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
|
||||
platformType = IC
|
||||
platformVersion = 2024.2
|
Loading…
Reference in New Issue
Block a user