2024.3 release compatibility

- gradle upgrade to 8.10
- platform plugin to 2.0.1
- intellij idea 2024.3

Author: hurricup

.gitignore

@@ -33,3 +33,4 @@ jflex*.jar
 *.sdf
 *.iobj
 *.ipdb
+.intellijPlatform

.idea/modules.xml

@@ -14,13 +14,17 @@
  * limitations under the License.
  */
 
-import de.undercouch.gradle.tasks.download.*
+import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
 import java.io.ByteArrayOutputStream
 
+fun properties(key: String) = providers.gradleProperty(key)
+
 plugins {
-    id("org.jetbrains.intellij").version("1.13.3")
-    id("org.jetbrains.kotlin.jvm").version("1.8.21")
+    id("org.jetbrains.intellij.platform") version "2.0.1"
+    id("org.jetbrains.kotlin.jvm") version "2.0.21"
     id("de.undercouch.download").version("5.3.0")
 }
 
@@ -42,7 +46,7 @@ data class BuildData(
 val buildDataList = listOf(
     BuildData(
         ideaSDKShortVersion = "243",
-        ideaSDKVersion = "243-EAP-SNAPSHOT",
+        ideaSDKVersion = "2024.3",
         sinceBuild = "232",
         untilBuild = "243.*",
         bunch = "212",
@@ -146,9 +150,15 @@ task("installEmmyDebugger", type = Copy::class) {
 }
 
 project(":") {
+    apply(plugin = "org.jetbrains.intellij.platform")
+
     repositories {
-        maven(url = "https://www.jetbrains.com/intellij-repository/releases")
         mavenCentral()
+        intellijPlatform {
+            defaultRepositories()
+            jetbrainsRuntime()
+            nightly()
+        }
     }
 
     dependencies {
@@ -158,6 +168,18 @@ project(":") {
         implementation("org.luaj:luaj-jse:3.0.1")
         implementation("org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5")
         implementation("com.jgoodies:forms:1.2.1")
+
+        intellijPlatform {
+            create("IC", buildVersionData.ideaSDKVersion, useInstaller = properties("useInstaller").get().toBoolean())
+            instrumentationTools()
+            jetbrainsRuntime()
+
+            // some code used in tests was moved to the java plugin and not available in the platform
+            bundledPlugins("com.intellij.java")
+            testFramework(TestFrameworkType.Plugin.Java)
+        }
+        testImplementation("junit:junit:4.13.2")
+        testImplementation("org.opentest4j:opentest4j:1.3.0")
     }
 
     sourceSets {
@@ -168,20 +190,6 @@ project(":") {
         }
     }
 
-    /*configure<JavaPluginConvention> {
-        sourceCompatibility = buildVersionData.targetCompatibilityLevel
-        targetCompatibility = buildVersionData.targetCompatibilityLevel
-    }*/
-
-    intellij {
-        type.set("IC")
-        updateSinceUntilBuild.set(false)
-        downloadSources.set(!isCI)
-        version.set(buildVersionData.ideaSDKVersion)
-        //localPath.set(System.getenv("IDEA_HOME_${buildVersionData.ideaSDKShortVersion}"))
-        sandboxDir.set("${project.buildDir}/${buildVersionData.ideaSDKShortVersion}/idea-sandbox")
-    }
-
     task("bunch") {
         doLast {
             val rev = getRev()
@@ -228,25 +236,18 @@ project(":") {
             untilBuild.set(buildVersionData.untilBuild)
         }
 
-        instrumentCode {
-            compilerVersion.set(buildVersionData.instrumentCodeCompilerVersion)
-        }
-
         publishPlugin {
             token.set(System.getenv("IDEA_PUBLISH_TOKEN"))
         }
 
-        withType<org.jetbrains.intellij.tasks.PrepareSandboxTask> {
-            doLast {
-                copy {
-                    from("src/main/resources/std")
-                    into("$destinationDir/${pluginName.get()}/std")
-                }
-                copy {
-                    from("src/main/resources/debugger")
-                    into("$destinationDir/${pluginName.get()}/debugger")
-                }
-            }
+        withType<PrepareSandboxTask> {
+            inputs.dir("src/main/resources/std")
+            inputs.dir("src/main/resources/debugger")
+
+            intoChild(intellijPlatform.projectName.map { projectName -> "$projectName/std" })
+                .from(file("src/main/resources/std"))
+            intoChild(intellijPlatform.projectName.map { projectName -> "$projectName/debugger" })
+                .from(file("src/main/resources/debugger"))
         }
     }
-}
+}

build.gradle.kts

@@ -26,3 +26,10 @@ artifactsPath = build/artifacts
 
 org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=utf-8
 #kotlin.stdlib.default.dependency = false
+
+# necessary for snapshot dependencies
+platformToolsVersion=
+
+# also, may be necessary for eap builds
+useInstaller=false
+

gradle.properties

@@ -1,21 +1,7 @@
-#
-# Copyright (c) 2017. tangzx([email protected])
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists