diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 768d9ef..a6f265b 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -17,17 +17,17 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '20' + java-version: '21' - name: Build if: ${{ !startsWith(github.ref, 'refs/tags/') }} - run: ./gradlew build + run: ./gradlew buildPlugin env: - ORG_GRADLE_PROJECT_version: 0.1-DEV + ORG_GRADLE_PROJECT_pluginVersion: 0.1-DEV - name: Build and Sign if: ${{ startsWith(github.ref, 'refs/tags/') }} run: ./gradlew signPlugin env: - ORG_GRADLE_PROJECT_version: ${{ github.ref_name }} + ORG_GRADLE_PROJECT_pluginVersion: ${{ github.ref_name }} CERTIFICATE_CHAIN: ${{ secrets.SIGNING_CERTIFICATE }} PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }} - name: Create Draft Release diff --git a/.gitignore b/.gitignore index b63da45..9ae33fc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ build/ out/ !**/src/main/**/out/ !**/src/test/**/out/ +.intellijPlatform/ ### Eclipse ### .apt_generated diff --git a/build.gradle.kts b/build.gradle.kts index 61c22ca..69a0aa3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,47 +1,63 @@ plugins { - id("java") - id("org.jetbrains.kotlin.jvm") version "1.9.21" - id("org.jetbrains.intellij") version "1.17.3" + id("java") + id("org.jetbrains.kotlin.jvm") version "1.9.25" + id("org.jetbrains.intellij.platform") version "2.1.0" } group = "im.simo.rubymine.sorbetlsp" +version = providers.gradleProperty("pluginVersion").get() -repositories { - mavenCentral() +kotlin { + jvmToolchain(21) } -// Configure Gradle IntelliJ Plugin -// Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html -intellij { - version.set("2024.2") - type.set("IU") // Target IDE Platform +repositories { + mavenCentral() + intellijPlatform { + defaultRepositories() + } +} - plugins.set(listOf( - "org.jetbrains.plugins.ruby:242.20224.387" - )) +dependencies { + intellijPlatform { + rubymine("2024.2") + bundledPlugin("org.jetbrains.plugins.ruby") + instrumentationTools() + pluginVerifier() + zipSigner() + } } -tasks { - // Set the JVM compatibility versions - withType { - sourceCompatibility = "20" - targetCompatibility = "17" - } - withType { - kotlinOptions.jvmTarget = "17" - } +intellijPlatform { + pluginConfiguration { + version = providers.gradleProperty("pluginVersion").get() - patchPluginXml { - sinceBuild.set("242") + ideaVersion { + sinceBuild = "242" + // no max build. see https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-tasks.html#patchPluginXml-untilBuild + untilBuild = provider { null } } + } - signPlugin { - certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) - privateKey.set(System.getenv("PRIVATE_KEY")) - password.set(System.getenv("PRIVATE_KEY_PASSWORD")) - } + signing { + privateKey = providers.environmentVariable("PRIVATE_KEY").orNull + password = providers.environmentVariable("PRIVATE_KEY_PASSWORD").orNull + certificateChain = providers.environmentVariable("CERTIFICATE_CHAIN").orNull + } + + publishing { + token = providers.environmentVariable("PUBLISH_TOKEN").orNull + } - publishPlugin { - token.set(System.getenv("PUBLISH_TOKEN")) + pluginVerification { + ides { + recommended() } + } } + +tasks { + wrapper { + gradleVersion = providers.gradleProperty("gradleVersion").get() + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 0fd4233..afec7d5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,13 @@ # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib -kotlin.stdlib.default.dependency=false -# TODO temporary workaround for Kotlin 1.8.20+ (https://jb.gg/intellij-platform-kotlin-oom) -kotlin.incremental.useClasspathSnapshot=false +kotlin.stdlib.default.dependency = false + # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html -org.gradle.configuration-cache=true +org.gradle.configuration-cache = true + # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html -org.gradle.caching=true +org.gradle.caching = true + +# Gradle Releases -> https://github.com/gradle/gradle/releases +gradleVersion = 8.10.2 + +pluginVersion=0.1-DEV \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..7f93135 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index db9a6b8..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..0adc8e1 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +80,11 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# 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 # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +131,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +214,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal