strips/pork
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/pork.git synced 2025-08-03 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

swap to jdk 21

Browse Source
This commit is contained in:
Alex Zenla
2025-03-16 23:57:48 -07:00
parent 61fbb6f35f
commit b1c6aac335
6 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -7,10 +7,10 @@ jobs:
steps: steps:
- name: Checkout Repository - name: Checkout Repository
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Set up JDK 22 - name: Set up JDK 21
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4 uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4
with: with:
java-version: '22' java-version: '21'
distribution: 'temurin' distribution: 'temurin'
- name: Setup Gradle - name: Setup Gradle
uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4 uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4

7
buildext/build.gradle.kts
View File

@ -20,13 +20,14 @@ dependencies {
} }
java { java {
sourceCompatibility = JavaVersion.toVersion(22) val javaVersion = JavaVersion.toVersion(21)
targetCompatibility = JavaVersion.toVersion(22) sourceCompatibility = javaVersion
targetCompatibility = javaVersion
} }
tasks.withType<KotlinCompile> { tasks.withType<KotlinCompile> {
compilerOptions { compilerOptions {
jvmTarget.set(JvmTarget.JVM_22) jvmTarget.set(JvmTarget.JVM_21)
} }
} }

8
buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkAstPlugin.kt
View File

@ -3,8 +3,10 @@ package gay.pizza.pork.buildext
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.Task import org.gradle.api.Task
import org.gradle.api.tasks.TaskProvider
import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.getByType import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.register
class PorkAstPlugin : Plugin<Project> { class PorkAstPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
@ -22,12 +24,12 @@ class PorkAstPlugin : Plugin<Project> {
private fun getAstExtension(project: Project): PorkAstExtension = private fun getAstExtension(project: Project): PorkAstExtension =
project.extensions.getByType<PorkAstExtension>() project.extensions.getByType<PorkAstExtension>()
private fun createGenerateAstCode(project: Project): Task { private fun createGenerateAstCode(project: Project): TaskProvider<*> {
val extension = getAstExtension(project) val extension = getAstExtension(project)
val codegenType = extension.astCodegenType.get() val codegenType = extension.astCodegenType.get()
if (codegenType == AstCodegenType.Standard) { 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)
} }
} }

4
buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkModulePlugin.kt
View File

@ -17,14 +17,14 @@ open class PorkModulePlugin : Plugin<Project> {
target.repositories.maven(url = "https://gitlab.com/api/v4/projects/49101454/packages/maven") target.repositories.maven(url = "https://gitlab.com/api/v4/projects/49101454/packages/maven")
target.extensions.getByType<JavaPluginExtension>().apply { target.extensions.getByType<JavaPluginExtension>().apply {
val javaVersion = JavaVersion.toVersion(22) val javaVersion = JavaVersion.toVersion(21)
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
targetCompatibility = javaVersion targetCompatibility = javaVersion
} }
target.tasks.withType<KotlinCompile> { target.tasks.withType<KotlinCompile> {
compilerOptions { compilerOptions {
jvmTarget.set(JvmTarget.JVM_22) jvmTarget.set(JvmTarget.JVM_21)
} }
} }

6
buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkStdlibPlugin.kt
View File

@ -2,7 +2,9 @@ package gay.pizza.pork.buildext
import org.gradle.api.Plugin import org.gradle.api.Plugin
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.tasks.TaskProvider
import org.gradle.kotlin.dsl.create import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.register
class PorkStdlibPlugin : Plugin<Project> { class PorkStdlibPlugin : Plugin<Project> {
override fun apply(target: Project) { override fun apply(target: Project) {
@ -11,6 +13,6 @@ class PorkStdlibPlugin : Plugin<Project> {
processResources.dependsOn(generateStdlibManifest) processResources.dependsOn(generateStdlibManifest)
} }
private fun createGenerateStdlibManifest(project: Project): GenerateStdlibManifest = private fun createGenerateStdlibManifest(project: Project): TaskProvider<GenerateStdlibManifest> =
project.tasks.create("generateStdlibManifest", GenerateStdlibManifest::class) project.tasks.register("generateStdlibManifest", GenerateStdlibManifest::class)
} }

13
support/pork-idea/gradle.properties
View File

@ -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