diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a04c68..afbe9d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/buildext/build.gradle.kts b/buildext/build.gradle.kts index a805aa9..d7c439b 100644 --- a/buildext/build.gradle.kts +++ b/buildext/build.gradle.kts @@ -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 { compilerOptions { - jvmTarget.set(JvmTarget.JVM_22) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkAstPlugin.kt b/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkAstPlugin.kt index d72b076..703d96f 100644 --- a/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkAstPlugin.kt +++ b/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkAstPlugin.kt @@ -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 { override fun apply(target: Project) { @@ -22,12 +24,12 @@ class PorkAstPlugin : Plugin { private fun getAstExtension(project: Project): PorkAstExtension = project.extensions.getByType() - 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) } } diff --git a/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkModulePlugin.kt b/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkModulePlugin.kt index 6bc947c..8bd2877 100644 --- a/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkModulePlugin.kt +++ b/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkModulePlugin.kt @@ -17,14 +17,14 @@ open class PorkModulePlugin : Plugin { target.repositories.maven(url = "https://gitlab.com/api/v4/projects/49101454/packages/maven") target.extensions.getByType().apply { - val javaVersion = JavaVersion.toVersion(22) + val javaVersion = JavaVersion.toVersion(21) sourceCompatibility = javaVersion targetCompatibility = javaVersion } target.tasks.withType { compilerOptions { - jvmTarget.set(JvmTarget.JVM_22) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkStdlibPlugin.kt b/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkStdlibPlugin.kt index c0f8edd..43a0257 100644 --- a/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkStdlibPlugin.kt +++ b/buildext/src/main/kotlin/gay/pizza/pork/buildext/PorkStdlibPlugin.kt @@ -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 { override fun apply(target: Project) { @@ -11,6 +13,6 @@ class PorkStdlibPlugin : Plugin { processResources.dependsOn(generateStdlibManifest) } - private fun createGenerateStdlibManifest(project: Project): GenerateStdlibManifest = - project.tasks.create("generateStdlibManifest", GenerateStdlibManifest::class) + private fun createGenerateStdlibManifest(project: Project): TaskProvider = + project.tasks.register("generateStdlibManifest", GenerateStdlibManifest::class) } diff --git a/support/pork-idea/gradle.properties b/support/pork-idea/gradle.properties deleted file mode 100644 index 4e1387b..0000000 --- a/support/pork-idea/gradle.properties +++ /dev/null @@ -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