From 483b5d98aa9e69902e070d583af2a2c235d5bd2c Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:05:13 +0530
Subject: [PATCH 01/17] Updated intellij platform 2.1.0 and kotlin jvm version
1.9.24
Updated intellij platform and kotlin jvm version
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 63cd89ac6..1aadc7380 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
plugins {
id 'java'
- id 'org.jetbrains.intellij' version '1.17.3'
- id 'org.jetbrains.kotlin.jvm' version '1.7.22'
+ id 'org.jetbrains.intellij.platform' version '2.1.0'
+ id "org.jetbrains.kotlin.jvm" version '1.9.24'
}
group 'io.openliberty.tools'
From 19c8088dadb15a0f13c478d36022bf4fb85dd790 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:26:54 +0530
Subject: [PATCH 02/17] Updated build.gradle and added gradle.properties file
Updated source compatability and target compatability in build.gradle and given java version inside gradle.properties file
---
build.gradle | 8 ++++++--
gradle.properties | 4 ++++
2 files changed, 10 insertions(+), 2 deletions(-)
create mode 100644 gradle.properties
diff --git a/build.gradle b/build.gradle
index 1aadc7380..6a9e4dd3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,12 @@ plugins {
group 'io.openliberty.tools'
version '24.0.9'
-sourceCompatibility = 17
-targetCompatibility = 17
+allprojects {
+ apply plugin: 'java'
+ sourceCompatibility = javaVersion
+ targetCompatibility = javaVersion
+ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
+}
def remoteRobotVersion = "0.11.18"
// To switch to nightly version, append "@nightly" to the version number (i.e. 0.4.1-20240828-013108@nightly)
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 000000000..cdce67bca
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,4 @@
+javaVersion=17
+javaTargetVersion=17
+
+
From d0a87d915d17cd34f87524c73f82392815b8e143 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:49:04 +0530
Subject: [PATCH 03/17] Added intellijPlatform, since and until build, bundled
plugin, intellij version and platform
Changed intellij to intellijPlatform and added it inside dependencies tag
---
build.gradle | 34 ++++++++++++++++++++--------------
gradle.properties | 13 +++++++++++++
2 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6a9e4dd3f..8b558979d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,7 +47,9 @@ repositories {
maven {
url = "https://cache-redirector.jetbrains.com/download-pgp-verifier"
}
-
+ intellijPlatform {
+ defaultRepositories()
+ }
mavenLocal() // TODO remove once Liberty LS is publicly available
}
@@ -64,7 +66,7 @@ configurations {
// Ensures that the JVM target is set to 17 for all Kotlin compilation tasks, including both main and test sources.
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
kotlinOptions {
- jvmTarget = "17"
+ jvmTarget = javaVersion
}
}
}
@@ -101,7 +103,7 @@ dependencies {
testImplementation 'com.intellij.remoterobot:remote-robot:' + remoteRobotVersion
testImplementation 'com.intellij.remoterobot:remote-fixtures:' + remoteRobotVersion
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
- testImplementation('com.jetbrains.intellij.maven:maven-test-framework:241.15989.150') {
+ testImplementation('com.jetbrains.intellij.maven:maven-test-framework:242.23726.103') {
transitive = false
}
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
@@ -133,6 +135,21 @@ dependencies {
implementation files(new File(buildDir, 'server')) {
builtBy 'copyDeps'
}
+ intellijPlatform {
+ create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
+ bundledPlugins providers.gradleProperty("platformBundledPlugins").orElse("").get().split(',').toList()
+
+ def lsp4ij = providers.gradleProperty('useLocal') && providers.gradleProperty('useLocal') == 'true' ?
+ file("../lsp4ij/build/distributions/LSP4IJ/") :
+ 'com.redhat.devtools.lsp4ij:' + lsp4ijVersion
+ plugins lsp4ij
+ pluginVerifier()
+ zipSigner()
+ instrumentationTools()
+
+ testFramework TestFrameworkType.Platform.INSTANCE
+ testFramework TestFrameworkType.Plugin.Java.INSTANCE
+ }
}
task copyDeps(type: Copy) {
@@ -145,17 +162,6 @@ runIde {
jvmArgs '--add-exports', 'java.base/jdk.internal.vm=ALL-UNNAMED'
}
-intellij {
- // For a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
- version = '2024.1.6'
-
- def lsp4ij = project.hasProperty('useLocal') && project.property('useLocal') == 'true' ?
- file("../lsp4ij/build/distributions/LSP4IJ/") :
- 'com.redhat.devtools.lsp4ij:' + lsp4ijVersion
- plugins = ['java', 'maven', 'gradle-java', 'properties', 'terminal', 'org.jetbrains.idea.maven', 'com.intellij.gradle', lsp4ij]
- updateSinceUntilBuild = false
-}
-
downloadRobotServerPlugin {
version.set(remoteRobotVersion)
}
diff --git a/gradle.properties b/gradle.properties
index cdce67bca..a6b0eb016 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,17 @@
+useLocal=false
+pluginSinceBuild=241.14494.240
+pluginUntilBuild=242.*
+
javaVersion=17
javaTargetVersion=17
+# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
+# Target IntelliJ Community by default
+platformType=IC
+platformVersion=2024.1
+
+# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
+# Example: platformBundledPlugins = com.intellij.java
+# We need com.intellij.java to compile JPS, and markdown.
+platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
\ No newline at end of file
From 3ad17dbcca9739cc4486878eb0220fc8639318bb Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:03:34 +0530
Subject: [PATCH 04/17] Updated runIde task in build.gradle
Updated runIde task in build.gradle
---
build.gradle | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 8b558979d..9c5b4851d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -159,7 +159,12 @@ task copyDeps(type: Copy) {
}
runIde {
- jvmArgs '--add-exports', 'java.base/jdk.internal.vm=ALL-UNNAMED'
+ jvmArgumentProviders.add({
+ [
+ "--add-exports",
+ "java.base/jdk.internal.vm=ALL-UNNAMED",
+ ]
+ } as CommandLineArgumentProvider)
}
downloadRobotServerPlugin {
From 111d7a4da6cd48868f29e02b0ad190d0792138bc Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:09:33 +0530
Subject: [PATCH 05/17] Updated intellijPlatform tag to add
buildSearchableOptions, since build, until build and add the changeNotes
Added intellijPlatform tag to add buildSearchableOptions, since build, until build and add the changeNotes
---
build.gradle | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9c5b4851d..df2c7216b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -192,18 +192,15 @@ test {
}
}
-tasks {
- // Disabling buildSearchableOptions, which runs as part of the buildPlugin task.
- // this is to buildSearchableOptions to workaround the "Only one instance of IDEA can be run at a time" problem.
- // Per documentation: https://plugins.jetbrains.com/docs/intellij/ide-development-instance.html#the-development-instance-sandbox-directory
- buildSearchableOptions {
- enabled = false
- }
-}
-
-patchPluginXml {
- changeNotes = """
- 24.0.9
+intellijPlatform {
+ buildSearchableOptions = false
+ pluginConfiguration {
+ ideaVersion {
+ sinceBuild = providers.gradleProperty("pluginSinceBuild")
+ untilBuild = providers.gradleProperty("pluginUntilBuild")
+ }
+ changeNotes = """
+ 24.0.9
Version 24.0.9 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 24.0.9 requires IntelliJ IDEA version 2024.1.* ONLY and a minimum of Java 17.
Notable changes:
@@ -341,5 +338,6 @@ patchPluginXml {
- First preview release
"""
- version project.version
+ version project.version
+ }
}
From e518aceedac41cc06f4b3e459e609336c5597987 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 11:49:04 +0530
Subject: [PATCH 06/17] Updated kotlin version to 2.0.20
Changed intellij to intellijPlatform and added it inside dependencies tag
---
build.gradle | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index df2c7216b..b4dac268c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
plugins {
id 'java'
id 'org.jetbrains.intellij.platform' version '2.1.0'
- id "org.jetbrains.kotlin.jvm" version '1.9.24'
+ id "org.jetbrains.kotlin.jvm" version '2.0.20'
}
group 'io.openliberty.tools'
@@ -103,9 +103,7 @@ dependencies {
testImplementation 'com.intellij.remoterobot:remote-robot:' + remoteRobotVersion
testImplementation 'com.intellij.remoterobot:remote-fixtures:' + remoteRobotVersion
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
- testImplementation('com.jetbrains.intellij.maven:maven-test-framework:242.23726.103') {
- transitive = false
- }
+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.9.2'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.9.2'
@@ -149,6 +147,7 @@ dependencies {
testFramework TestFrameworkType.Platform.INSTANCE
testFramework TestFrameworkType.Plugin.Java.INSTANCE
+ testFramework TestFrameworkType.Plugin.Ma
}
}
From 7385bb63565536035dfc46ceb3532d4ab0d6eb98 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 28 Oct 2024 12:25:36 +0530
Subject: [PATCH 07/17] updated platformVersion
updated platformVersion
---
build.gradle | 1 -
gradle.properties | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index b4dac268c..87da48668 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,6 @@ group 'io.openliberty.tools'
version '24.0.9'
allprojects {
- apply plugin: 'java'
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
diff --git a/gradle.properties b/gradle.properties
index a6b0eb016..d4cd2dacc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ javaTargetVersion=17
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
# Target IntelliJ Community by default
platformType=IC
-platformVersion=2024.1
+platformVersion=2024.2.4
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
# Example: platformBundledPlugins = com.intellij.java
From 843b27a45c7445c2f784eb7ad0c681667e0fd732 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:14:27 +0530
Subject: [PATCH 08/17] Updated remote robot version
---
build.gradle | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 87da48668..8a72c763a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,16 +7,16 @@ plugins {
group 'io.openliberty.tools'
version '24.0.9'
+def remoteRobotVersion = "0.11.23"
+// To switch to nightly version, append "@nightly" to the version number (i.e. 0.4.1-20240828-013108@nightly)
+def lsp4ijVersion = '0.7.0'
+
allprojects {
sourceCompatibility = javaVersion
targetCompatibility = javaVersion
tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
}
-def remoteRobotVersion = "0.11.18"
-// To switch to nightly version, append "@nightly" to the version number (i.e. 0.4.1-20240828-013108@nightly)
-def lsp4ijVersion = '0.7.0'
-
repositories {
mavenCentral()
maven {
From ea0cbf095d06c481e440baad42ddcbcb3e08fed5 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:17:53 +0530
Subject: [PATCH 09/17] Removed manual dependency added for maven test
Removed manual dependency added for maven test as jetbrains providing a testframework which will auto download latest maven test version
---
build.gradle | 2 +-
gradle.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index 8a72c763a..5911dc57b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,7 +146,7 @@ dependencies {
testFramework TestFrameworkType.Platform.INSTANCE
testFramework TestFrameworkType.Plugin.Java.INSTANCE
- testFramework TestFrameworkType.Plugin.Ma
+ testFramework TestFrameworkType.Plugin.Maven.INSTANCE
}
}
diff --git a/gradle.properties b/gradle.properties
index d4cd2dacc..a6b0eb016 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ javaTargetVersion=17
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
# Target IntelliJ Community by default
platformType=IC
-platformVersion=2024.2.4
+platformVersion=2024.1
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
# Example: platformBundledPlugins = com.intellij.java
From 717e0e1d5785cf8464e6ca26d85814f7c9275137 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:23:42 +0530
Subject: [PATCH 10/17] defaulted intellij version to 2024.1 and added
kotlin.stdlib.default.dependency=false
defaulted intellij version to 2024.1 i.e PROD version and added kotlin.stdlib.default.dependency=false
to stop including this lib automatically when build is ran
---
gradle.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index a6b0eb016..d86cb7246 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,4 +14,5 @@ platformVersion=2024.1
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
# Example: platformBundledPlugins = com.intellij.java
# We need com.intellij.java to compile JPS, and markdown.
-platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
\ No newline at end of file
+platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
+kotlin.stdlib.default.dependency=false
\ No newline at end of file
From 8f91cb6817712aba5e838ada96061dc9a92da764 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:33:00 +0530
Subject: [PATCH 11/17] Added an import and commented runIdeForUiTest task
Added an import and commented runIdeForUiTest task as it doesn't support intellij 2024.2 version
---
build.gradle | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/build.gradle b/build.gradle
index 5911dc57b..c3838914b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,4 @@
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
plugins {
id 'java'
id 'org.jetbrains.intellij.platform' version '2.1.0'
@@ -165,21 +166,21 @@ runIde {
} as CommandLineArgumentProvider)
}
-downloadRobotServerPlugin {
- version.set(remoteRobotVersion)
-}
+//downloadRobotServerPlugin {
+// version.set(remoteRobotVersion)
+//}
-runIdeForUiTests {
- systemProperty "robot-server.port", "8082"
- systemProperty "ide.mac.message.dialogs.as.sheets", "false"
- systemProperty "jb.privacy.policy.text", ""
- systemProperty "jb.consents.confirmation.enabled", "false"
- systemProperty "idea.trust.all.projects", "true"
- systemProperty "ide.show.tips.on.startup.default.value", "false"
- systemProperty "ide.mac.file.chooser.native", "false"
- systemProperty "jbScreenMenuBar.enabled", "false"
- systemProperty "apple.laf.useScreenMenuBar", "false"
-}
+//runIdeForUiTests {
+// systemProperty "robot-server.port", "8082"
+// systemProperty "ide.mac.message.dialogs.as.sheets", "false"
+// systemProperty "jb.privacy.policy.text", ""
+// systemProperty "jb.consents.confirmation.enabled", "false"
+// systemProperty "idea.trust.all.projects", "true"
+// systemProperty "ide.show.tips.on.startup.default.value", "false"
+// systemProperty "ide.mac.file.chooser.native", "false"
+// systemProperty "jbScreenMenuBar.enabled", "false"
+// systemProperty "apple.laf.useScreenMenuBar", "false"
+//}
test {
useJUnitPlatform()
From 3f83037369b25734f551fd6ee58245050efe8bde Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 16:42:21 +0530
Subject: [PATCH 12/17] Removed UI test task from build.gradle and updated few
comments
---
build.gradle | 19 ++-----------------
gradle.properties | 4 ----
2 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/build.gradle b/build.gradle
index c3838914b..1784625b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
plugins {
id 'java'
id 'org.jetbrains.intellij.platform' version '2.1.0'
- id "org.jetbrains.kotlin.jvm" version '2.0.20'
+ id 'org.jetbrains.kotlin.jvm' version '2.0.20'
}
group 'io.openliberty.tools'
@@ -134,6 +134,7 @@ dependencies {
builtBy 'copyDeps'
}
intellijPlatform {
+ // For a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
create(providers.gradleProperty("platformType"), providers.gradleProperty("platformVersion"))
bundledPlugins providers.gradleProperty("platformBundledPlugins").orElse("").get().split(',').toList()
@@ -166,22 +167,6 @@ runIde {
} as CommandLineArgumentProvider)
}
-//downloadRobotServerPlugin {
-// version.set(remoteRobotVersion)
-//}
-
-//runIdeForUiTests {
-// systemProperty "robot-server.port", "8082"
-// systemProperty "ide.mac.message.dialogs.as.sheets", "false"
-// systemProperty "jb.privacy.policy.text", ""
-// systemProperty "jb.consents.confirmation.enabled", "false"
-// systemProperty "idea.trust.all.projects", "true"
-// systemProperty "ide.show.tips.on.startup.default.value", "false"
-// systemProperty "ide.mac.file.chooser.native", "false"
-// systemProperty "jbScreenMenuBar.enabled", "false"
-// systemProperty "apple.laf.useScreenMenuBar", "false"
-//}
-
test {
useJUnitPlatform()
diff --git a/gradle.properties b/gradle.properties
index d86cb7246..af5d1de0f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,14 +5,10 @@ pluginUntilBuild=242.*
javaVersion=17
javaTargetVersion=17
-
-# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
# Target IntelliJ Community by default
platformType=IC
platformVersion=2024.1
-# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
# Example: platformBundledPlugins = com.intellij.java
-# We need com.intellij.java to compile JPS, and markdown.
platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
kotlin.stdlib.default.dependency=false
\ No newline at end of file
From 8d1e9deb2341be8c9e828d5fdcf408b5ad7ae422 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:00:57 +0530
Subject: [PATCH 13/17] Removed since and until build from plugin.xml
Removed since and until build from plugin.xml since already given in gradle.properties
---
src/main/resources/META-INF/plugin.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index d8dd76374..adc0ca28f 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -20,8 +20,6 @@
com.intellij.gradle
com.redhat.devtools.lsp4ij
-
-
From 58c7ff6d05fb460908f900dbcdbfd1b04bb11d08 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 8 Nov 2024 17:37:29 +0530
Subject: [PATCH 14/17] Updated the intellij version in gradle.properties to
latest supporting for 2024.1 version
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index af5d1de0f..4dcda0e3d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,7 @@ javaTargetVersion=17
# Target IntelliJ Community by default
platformType=IC
-platformVersion=2024.1
+platformVersion=2024.1.7
# Example: platformBundledPlugins = com.intellij.java
platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
From 39b2e89fa4c6134c856e5887e16aa12367347002 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Mon, 11 Nov 2024 17:27:14 +0530
Subject: [PATCH 15/17] Update pluginSinceBuild version from 241.14494.240 to
241
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 4dcda0e3d..951cf0f8a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
useLocal=false
-pluginSinceBuild=241.14494.240
+pluginSinceBuild=241
pluginUntilBuild=242.*
javaVersion=17
From b1cb75cc2eeca0487e3161976c8d9454dbf9b46a Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Thu, 14 Nov 2024 11:27:18 +0530
Subject: [PATCH 16/17] Removed kotlin.stdlib.default.dependency as that will
be required when running UI test
---
gradle.properties | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 951cf0f8a..490e2ca93 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,5 +10,4 @@ platformType=IC
platformVersion=2024.1.7
# Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
-kotlin.stdlib.default.dependency=false
\ No newline at end of file
+platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
\ No newline at end of file
From f595ab6859d46b40b22afa3f7a51e0137e9b3b76 Mon Sep 17 00:00:00 2001
From: Staicy Mathew <40750411+staicy123@users.noreply.github.com>
Date: Fri, 15 Nov 2024 16:28:55 +0530
Subject: [PATCH 17/17] Added back runIdeForUiTests task
---
build.gradle | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 1784625b0..5003d8cc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -151,7 +151,6 @@ dependencies {
testFramework TestFrameworkType.Plugin.Maven.INSTANCE
}
}
-
task copyDeps(type: Copy) {
from configurations.lsp
into new File(buildDir, 'server/server')
@@ -175,6 +174,21 @@ test {
exceptionFormat = 'full'
}
}
+downloadRobotServerPlugin {
+ version.set(remoteRobotVersion)
+}
+
+runIdeForUiTests {
+ systemProperty "robot-server.port", "8082"
+ systemProperty "ide.mac.message.dialogs.as.sheets", "false"
+ systemProperty "jb.privacy.policy.text", ""
+ systemProperty "jb.consents.confirmation.enabled", "false"
+ systemProperty "idea.trust.all.projects", "true"
+ systemProperty "ide.show.tips.on.startup.default.value", "false"
+ systemProperty "ide.mac.file.chooser.native", "false"
+ systemProperty "jbScreenMenuBar.enabled", "false"
+ systemProperty "apple.laf.useScreenMenuBar", "false"
+}
intellijPlatform {
buildSearchableOptions = false