Merge pull request #2254 from digma-ai/upgrade-to-beta8

upgrade to beta8 and remove kotlin plugin workaround

Author: shalom938

build.gradle.kts

@@ -9,7 +9,6 @@ import org.jetbrains.changelog.date
 import org.jetbrains.changelog.exceptions.MissingVersionException
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import org.jetbrains.intellij.platform.gradle.models.ProductRelease
-import org.jetbrains.intellij.platform.gradle.tasks.CustomRunIdeTask
 import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask
 
 fun properties(key: String) = properties(key, project)
@@ -83,10 +82,6 @@ dependencies {
         pluginModule(implementation(project(":maven-support")))
         pluginModule(implementation(project(":rider")))
 
-
-        //we need to supply a jetbrains runtime to runIde because we use maven artifacts for IDE
-        // downloads, see in gradle.properties useBinaryReleases=false
-        jetbrainsRuntime()
         pluginVerifier()
         zipSigner()
     }
@@ -218,14 +213,6 @@ tasks {
 
     prepareSandbox {
 
-        /*
-        sometimes runIde fails with this error:
-        Execution failed for task ':prepareSandbox'.
-        > Cannot access output property '$1$4' of task ':prepareSandbox'. Accessing unreadable inputs or outputs is not supported. Declare the task as untracked by using Task.doNotTrackState(). For more information, please refer to https://docs.gradle.org/8.8/userguide/incremental_build.html#sec:disable-state-tracking in the Gradle documentation.
-        > java.io.IOException: Cannot snapshot /home/shalom/workspace/digma/digma-intellij-plugin/build/idea-sandbox/IC-2024.1.3/system/jcef_cache/SingletonSocket: not a regular file
-        */
-        doNotTrackState("prepareSandbox needs to re-run every time")
-
         //copy rider dlls to the plugin sandbox, so it is packaged in the zip
         from(configurations.getByName("riderDotNetObjects")) {
             into("${rootProject.name}/dotnet/")
@@ -285,22 +272,6 @@ tasks {
         }
     }
 
-// todo: create custom tasks, for example: runWithoutKotlin, runWithoutGradle etc
-// see:https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-custom-tasks.html
-
-
-    val runWithoutGitHubPlugin by registering(CustomRunIdeTask::class) {
-        plugins {
-            disablePlugin("org.jetbrains.plugins.github")
-        }
-    }
-
-    val runWithoutKotlinPlugin by registering(CustomRunIdeTask::class) {
-        plugins {
-            disablePlugin("org.jetbrains.kotlin")
-        }
-    }
-
 
     runIde {
         dependsOn(deleteLog)
@@ -388,4 +359,4 @@ tasks {
             filter<ReplaceTokens>("tokens" to tokens)
         }
     }
-}
+}

building-how-to/building-with-eap.txt

@@ -11,7 +11,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.0-beta7")
+    implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.0.0-beta8")
     implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
     implementation("com.glovoapp.gradle:versioning:1.1.10")
     implementation("de.undercouch:gradle-download-task:5.6.0")

common-build-logic/build.gradle.kts

@@ -173,8 +173,8 @@ object BuildProfiles {
 
             profile = Profile.p241,
             platformVersion = "2024.1.4",
-            riderVersion = "2024.1.3",
-            pycharmVersion = "2024.1.3",
+            riderVersion = "2024.1.4",
+            pycharmVersion = "2024.1.4",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "PROFILE_2023_2",
             platformVersionCode = "241",
@@ -190,15 +190,15 @@ object BuildProfiles {
 
             isEAP = true,
             profile = Profile.p242,
-            platformVersion = "242.18071-EAP-CANDIDATE-SNAPSHOT",
-            riderVersion = "2024.2-EAP4-SNAPSHOT",
+            platformVersion = "242.19533-EAP-CANDIDATE-SNAPSHOT",
+            riderVersion = "2024.2-EAP5-SNAPSHOT",
             pycharmVersion = "242-EAP-SNAPSHOT",
             riderTargetFramework = "net8.0",
             riderResharperVersionConstant = "PROFILE_2023_2",
             platformVersionCode = "242",
             pluginSinceBuild = "242",
             pluginUntilBuild = "242.*",
-            kotlinTarget = KotlinVersion.KOTLIN_1_9.version, //todo: maybe need to upgrade to 2.0
+            kotlinTarget = KotlinVersion.KOTLIN_1_9.version,
             javaVersion = JavaVersion.VERSION_17.majorVersion,
         )
 

common-build-logic/src/main/kotlin/common/BuildProfile.kt

@@ -14,17 +14,21 @@ plugins {
 repositories {
     intellijPlatform {
         defaultRepositories()
+        jetbrainsRuntime()
     }
 }
 
 dependencies {
     intellijPlatform {
         instrumentationTools()
         pluginVerifier()
+        //we need to supply a jetbrains runtime to runIde because we use maven artifacts for IDEs
+        jetbrainsRuntime()
     }
 }
 
 
+
 afterEvaluate {
     if (gradle.startParameter.taskNames.contains("buildPlugin")) {
         withSilenceLogging {

common-build-logic/src/main/kotlin/plugin-library.gradle.kts

@@ -2,7 +2,6 @@ import common.logBuildProfile
 import common.logIntellijPlatformPlugin
 import common.properties
 import common.withSilenceLogging
-import gradle.kotlin.dsl.accessors._44bd68d24449dd49451fa0f0c4976aa6.intellijPlatform
 
 plugins {
     id("digma-base")
@@ -19,12 +18,23 @@ repositories {
     }
 }
 
+dependencies {
+    intellijPlatform {
+        instrumentationTools()
+        pluginVerifier()
+        //we need to supply a jetbrains runtime to runIde because we use maven artifacts for IDEs
+        jetbrainsRuntime()
+    }
+}
+
 intellijPlatform {
     //buildSearchableOptions is a long-running task, we don't need it in every build,
     // local build can do without it. we activate it only in GitHub
     buildSearchableOptions = properties("buildSearchableOptions", project).toBoolean()
 }
 
+
+
 afterEvaluate {
     if (gradle.startParameter.taskNames.contains("buildPlugin")) {
         withSilenceLogging {
@@ -34,14 +44,6 @@ afterEvaluate {
     }
 }
 
-
-dependencies {
-    intellijPlatform {
-        instrumentationTools()
-        pluginVerifier()
-    }
-}
-
 tasks {
 
     //when building with buildPlugin the tests are not executed,

common-build-logic/src/main/kotlin/plugin-project.gradle.kts

@@ -47,25 +47,8 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 ### Intellij platform gradle plugin properties
 ## see https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-gradle-properties.html
 
-## todo: not sure its necessary
-## see https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-gradle-properties.html#useCacheRedirector
-#org.jetbrains.intellij.platform.buildFeature.useCacheRedirector=false
-
 org.jetbrains.intellij.platform.buildFeature.downloadSources=true
-
-##### about useBinaryReleases
-## the intellij platform gradle plugin downloads IDEs from jetbrains CDN: https://data.services.jetbrains.com/products
-## these are exactly the same binaries that users install.
-## but EAP builds are not always released to CDN, only RC are released to CDN, so when building with EAP it is not
-## guaranteed that we'll find it in CDN, in that case it needs to be downloaded from jetbrains maven repo.
-## Rider binary releases do not contain a bundled resharper sdk, maven artifacts do, and with a bundled resharper
-## sdk it is easier and more reliable to configure the dotnet project, that is what Rider team recommend.
-## So because we build with EAP ,and we build with Rider it is more convenient for us to build with maven artifacts.
-## useBinaryReleases=false means the IDEs will be downloaded from maven repo.
-## but IDEs from maven repo do not have a bundled jetbrainsRuntime and a jetbrainsRuntime() needs to be supplied
-## to runIde. see more info about it in the intellij platform extension configuration in the main module.
-org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false
-
+org.jetbrains.intellij.platform.buildFeature.useCacheRedirector=false
 #org.jetbrains.intellij.platform.buildFeature.useClosestVersionResolving=false
 
 ### Intellij platform gradle plugin properties END

gradle.properties

@@ -41,16 +41,7 @@ dependencies {
         }
 
         bundledPlugin("com.intellij.java")
-
-        //there is an issue with plugin verifier that prevents using bundledPlugin("org.jetbrains.kotlin") for 242.
-        //https://youtrack.jetbrains.com/issue/MP-6594
-        //until this issue is fixed we use a direct dependency on kotlin plugin, which is not the best but works.
-        //todo: the dependency is on a version that i'm not sure compatible with 242
-        if (project.currentProfile().profile > BuildProfiles.Profile.p241){
-            plugin("org.jetbrains.kotlin","232-1.9.24-release-822-IJ10072.27")
-        }else{
-            bundledPlugin("org.jetbrains.kotlin")
-        }
+        bundledPlugin("org.jetbrains.kotlin")
     }
 }
 

jvm-common/build.gradle.kts

@@ -21,8 +21,6 @@ plugins {
 /*
 kotlin-stdlib: the kotlin-stdlib must be compatible with the intellij platform version,
  see: https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
-
- todo: maybe use java-platforms instead of versionCatalogs
  */
 dependencyResolutionManagement {
     versionCatalogs {