mirror of
https://github.com/GayPizzaSpecifications/pork.git
synced 2025-08-02 12:50:55 +00:00
upgrade everything to modern versions
This commit is contained in:
parent
d079244fd7
commit
4ec5624be4
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@ out/
|
|||||||
/kotlin-js-store
|
/kotlin-js-store
|
||||||
/.fleet/*
|
/.fleet/*
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
.intellijPlatform
|
||||||
|
@ -3,5 +3,5 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<Wrapper> {
|
tasks.withType<Wrapper> {
|
||||||
gradleVersion = "8.5"
|
gradleVersion = "8.11.1"
|
||||||
}
|
}
|
||||||
|
@ -12,10 +12,10 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-serialization:1.9.22")
|
implementation("org.jetbrains.kotlin:kotlin-serialization:1.7.3")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0")
|
||||||
implementation("com.charleskorn.kaml:kaml:0.56.0")
|
implementation("com.charleskorn.kaml:kaml:0.66.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
|
@ -28,7 +28,7 @@ open class PorkModulePlugin : Plugin<Project> {
|
|||||||
|
|
||||||
target.dependencies {
|
target.dependencies {
|
||||||
add("implementation", "org.jetbrains.kotlin:kotlin-bom")
|
add("implementation", "org.jetbrains.kotlin:kotlin-bom")
|
||||||
add("implementation", "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
|
add("implementation", "org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
|
||||||
add("api", "gay.pizza.dough:dough-core:0.1.0-SNAPSHOT")
|
add("api", "gay.pizza.dough:dough-core:0.1.0-SNAPSHOT")
|
||||||
add("api", "gay.pizza.dough:dough-fs:0.1.0-SNAPSHOT")
|
add("api", "gay.pizza.dough:dough-fs:0.1.0-SNAPSHOT")
|
||||||
}
|
}
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
7
gradlew
vendored
7
gradlew
vendored
@ -15,6 +15,8 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
#
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
@ -55,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@ -84,7 +86,8 @@ done
|
|||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
|
||||||
|
' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
|
22
gradlew.bat
vendored
22
gradlew.bat
vendored
@ -13,6 +13,8 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@ -1,39 +1,33 @@
|
|||||||
import gay.pizza.pork.buildext.AstCodegenType
|
import gay.pizza.pork.buildext.AstCodegenType
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("org.jetbrains.intellij") version "1.16.1"
|
id("org.jetbrains.intellij.platform") version "2.1.0"
|
||||||
id("gay.pizza.pork.module")
|
id("gay.pizza.pork.module")
|
||||||
id("gay.pizza.pork.ast")
|
id("gay.pizza.pork.ast")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
intellijPlatform {
|
||||||
|
defaultRepositories()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(project(":common"))
|
implementation(project(":common"))
|
||||||
implementation(project(":parser"))
|
implementation(project(":parser"))
|
||||||
|
|
||||||
|
intellijPlatform {
|
||||||
|
intellijIdeaCommunity("2024.2")
|
||||||
|
pluginVerifier()
|
||||||
|
zipSigner()
|
||||||
|
instrumentationTools()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
porkAst {
|
porkAst {
|
||||||
astCodegenType.set(AstCodegenType.PorkIdea)
|
astCodegenType.set(AstCodegenType.PorkIdea)
|
||||||
}
|
}
|
||||||
|
|
||||||
intellij {
|
|
||||||
pluginName.set(properties["pluginName"].toString())
|
|
||||||
version.set(properties["platformVersion"].toString())
|
|
||||||
type.set(properties["platformType"].toString())
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks {
|
|
||||||
buildSearchableOptions {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
|
|
||||||
patchPluginXml {
|
|
||||||
version.set(project.properties["pluginVersion"].toString())
|
|
||||||
sinceBuild.set(project.properties["pluginSinceBuild"].toString())
|
|
||||||
untilBuild.set(project.properties["pluginUntilBuild"].toString())
|
|
||||||
pluginDescription.set("Pork Language support for IntelliJ IDEs")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
project.afterEvaluate {
|
project.afterEvaluate {
|
||||||
tasks.buildPlugin {
|
tasks.buildPlugin {
|
||||||
exclude("**/lib/annotations*.jar")
|
exclude("**/lib/annotations*.jar")
|
||||||
|
@ -2,12 +2,12 @@
|
|||||||
pluginGroup = gay.pizza.plugins.pork
|
pluginGroup = gay.pizza.plugins.pork
|
||||||
pluginName = Pork
|
pluginName = Pork
|
||||||
pluginRepositoryUrl = https://github.com/GayPizzaSpecifications/pork
|
pluginRepositoryUrl = https://github.com/GayPizzaSpecifications/pork
|
||||||
pluginVersion = 0.1.1
|
pluginVersion = 0.1.2
|
||||||
|
|
||||||
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
|
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
|
||||||
pluginSinceBuild = 233
|
pluginSinceBuild = 242
|
||||||
pluginUntilBuild = 233.*
|
pluginUntilBuild = 243.*
|
||||||
|
|
||||||
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
|
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
|
||||||
platformType = IC
|
platformType = IC
|
||||||
platformVersion = 2023.3.2
|
platformVersion = 2024.2
|
||||||
|
Loading…
Reference in New Issue
Block a user