Merge pull request #36 from oroinc/OPP-105-upgrade-to-243.22562.233-gradle-upgrade

OPP-105: Upgrade to 243.22562.233 (2024.3)

Author: amosingiewicz

build.gradle.kts

@@ -1,14 +1,24 @@
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
+import java.io.ByteArrayOutputStream
+
 plugins {
-    id("org.jetbrains.intellij") version "1.14.2"
+    id("org.jetbrains.intellij.platform") version "2.2.0"
     id("groovy")
 }
 
-
 dependencies {
     sourceSets.named("test") {
         testImplementation("org.codehaus.groovy:groovy-all:2.4.14")
         testImplementation("org.opentest4j:opentest4j:1.3.0")
     }
+    intellijPlatform {
+        plugin("com.jetbrains.php:243.21565.193")
+        plugin("com.jetbrains.twig:243.21565.202")
+        bundledPlugin("org.jetbrains.plugins.yaml")
+        bundledPlugin("com.intellij.css")
+        bundledPlugin("JavaScript")
+        create("IU","2024.3")
+    }
 }
 
 buildscript {
@@ -18,44 +28,45 @@ buildscript {
 }
 
 group = "com.oroplatform"
-version = "1.1.1"
+version = "1.1.2"
+
+val pathToIde = project.extra["pathToIde"]
+
+val javaVersionOutput = ByteArrayOutputStream()
+exec {
+    commandLine = listOf("java", "-version")
+    standardOutput = javaVersionOutput
+    errorOutput = javaVersionOutput
+}
 
-val javaLanguageVersionSetting = project.extra["javaLanguageVersionSetting"].toString()
+val javaVersionString = javaVersionOutput.toString().lines().first()
+val javaVersion = Regex("""\d+""").find(javaVersionString)?.value?.toInt() ?: 11
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(javaLanguageVersionSetting))
+        languageVersion.set(JavaLanguageVersion.of(javaVersion))
     }
 }
 
-intellij {
-    pluginName.set("idea-oroplatform-plugin")
-    type.set("IU")
-    version.set("2024.2")
-    plugins.set(listOf(
-        "com.jetbrains.php:242.20224.387",
-        "yaml",
-        "java-i18n",
-        "properties",
-        "css-impl",
-        "JavaScript",
-        "com.jetbrains.twig:242.20224.385"
-    ))
-    sandboxDir.set("${project.rootDir}/.idea-sandbox")
+intellijPlatform {
+    pluginConfiguration {
+        name = "idea-oroplatform-plugin"
+    }
 }
 
 repositories {
     mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+    }
+}
+
+val runPhpStorm by intellijPlatformTesting.runIde.registering {
+    type = IntelliJPlatformType.PhpStorm
+    version = "2024.3"
 }
 
 tasks {
-    runIde {
-        val pathToIde = project.extra["pathToIde"]
-        ideDir.set(file("$pathToIde"))
-    }
-    buildSearchableOptions {
-        enabled = true
-    }
     test {
         // OPP-80: The tests that target PHP code completion and JS completion
         // or those that use the information no longer present in classes.php in the newer version of the platform

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/resources/META-INF/plugin.xml

@@ -10,6 +10,10 @@ Plugin for the PHPStorm that will help to increase the development speed on the
     ]]></description>
 
     <change-notes><![CDATA[
+<h2>1.1.2</h2>
+<ul>
+    <li>Upgrade compatibility with 2024.3 version of PHPStorm.</li>
+</ul>
 <h2>1.1.1</h2>
 <ul>
     <li>Upgrade compatibility with 2024.2 version of PHPStorm.</li>