diff --git a/CHANGELOG.md b/CHANGELOG.md index 30d5c922..076ece1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,32 +2,17 @@ ## [Unreleased] -## [242.5] - 2024-11-23 - +## [233.32] - 2024-12-19 ### Added -- WSL - Support [Wiki](https://github.com/grisha9/gmaven-plugin/wiki/GMaven-project-settings#wsl-support-wondows-users-only) -- Deployed maven plugin to maven central and migrate on it ([issue](https://github.com/grisha9/gmaven-plugin/issues/21)) -- ### Fixed -- Escaping space symbol in starting maven process path ([issue](https://github.com/grisha9/gmaven-plugin/issues/20)) +- move features with master -## [242.4] - 2024-11-07 -### Added -- Incremental sync (Experimental feature in gmaven settings) -- ### Fixed -- Sync Maven-plugin fixed process result output -- Escaping space symbol in path ([issue](https://github.com/grisha9/gmaven-plugin/issues/20)) +## [233.31] - 2024-11-20 -## [242.2] - 2024-10-10 -### Added -- Read only mode [wiki](https://github.com/grisha9/gmaven-plugin/wiki/GMaven-project-settings#readonly-mode) -- Full support [Maven Daemon](https://github.com/grisha9/gmaven-plugin/wiki/GMaven-project-settings#maven-daemon-full-support) +### Fixed -## [242.1] - 2024-09-15 -### Added -- Support IDEA 242.* version. Icons for new UI. -- Rework Maven integration via [file](https://github.com/grisha9/gmaven-plugin/wiki/New-integration-with-Maven-model-reader-plugin-via-file.-Since-242.1-GMaven-version) +- Split module - test scope +- Gmaven run config setting (visible in Gradle) ## [233.30] - 2024-07-13 ### Fixed @@ -134,7 +119,8 @@ ## [232.14] - 2023-10-26 ### Added - Quick fix for Maven distribution -- Gutter icons for configuration files. [Wiki](https://github.com/grisha9/gmaven-plugin/wiki/GMaven-registry-keys#gmavengutterannotation) +- Gutter icons for configuration + files. [Wiki](https://github.com/grisha9/gmaven-plugin/wiki/GMaven-registry-keys#gmavengutterannotation) - Icon for Maven project configuration files ## [232.13] - 2023-10-16 diff --git a/gmaven/build.gradle.kts b/gmaven/build.gradle.kts index 44b96ca9..4e9b38a2 100644 --- a/gmaven/build.gradle.kts +++ b/gmaven/build.gradle.kts @@ -1,10 +1,7 @@ -import org.jetbrains.intellij.platform.gradle.TestFrameworkType - plugins { id("java") - id("org.jetbrains.kotlin.jvm") version "1.9.24" - id("org.jetbrains.intellij.platform") version "2.0.1" - id("org.jetbrains.intellij.platform.migration") version "2.0.1" + id("org.jetbrains.kotlin.jvm") version "1.8.22" + id("org.jetbrains.intellij") version "1.17.1" id("org.jetbrains.changelog") version "2.1.0" } @@ -13,46 +10,49 @@ version = providers.gradleProperty("pluginVersion").get() repositories { mavenCentral() - intellijPlatform { - defaultRepositories() - } + maven("https://www.jetbrains.com/intellij-repository/releases") + maven("https://cache-redirector.jetbrains.com/intellij-dependencies") } dependencies { - intellijPlatform { - intellijIdeaCommunity(providers.gradleProperty("platformVersion")) - instrumentationTools() - - bundledPlugin("com.intellij.java") - bundledPlugin("com.intellij.properties") - bundledPlugin("org.intellij.groovy") - bundledPlugin("org.jetbrains.kotlin") - bundledPlugin("org.jetbrains.plugins.terminal") - bundledPlugin("com.jetbrains.sh") - - testImplementation("junit:junit:4.12") - testFramework(TestFrameworkType.Platform) - testFramework(TestFrameworkType.Plugin.Java) - - zipSigner() - } - implementation(project(":server-api")) runtimeOnly(project(":maven-ext-event-handler")) runtimeOnly("io.github.grisha9:maven-model-reader-plugin:0.4") } -intellijPlatform { +// Configure Gradle IntelliJ Plugin +// Read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html +intellij { + version.set(providers.gradleProperty("platformVersion").get()) + type.set("IC") // Target IDE Platform + plugins.set( + listOf( + "java", + "properties", + "org.intellij.groovy", + "org.jetbrains.kotlin", + ) + ) +} + +changelog { + headerParserRegex.set("""(\d+\.\d+(.\d+)?)""".toRegex()) + path.set(file("../CHANGELOG.md").canonicalPath) +} - pluginConfiguration { - id = "ru.rzn.gmyasoedov.gmaven" - name = "gmaven" - version = providers.gradleProperty("pluginVersion").get() +tasks { + // Set the JVM compatibility versions + withType { + sourceCompatibility = "17" + targetCompatibility = "17" + } + withType { + kotlinOptions.jvmTarget = "17" + } - ideaVersion { - sinceBuild = providers.gradleProperty("pluginSinceBuild") - untilBuild = providers.gradleProperty("pluginUntilBuild") - } + patchPluginXml { + sinceBuild.set(providers.gradleProperty("pluginSinceBuild").get()) + untilBuild.set(providers.gradleProperty("pluginUntilBuild").get()) val changelog = project.changelog changeNotes.set(providers.gradleProperty("pluginVersion").map { pluginVersion -> @@ -67,30 +67,14 @@ intellijPlatform { }) } - signing { + signPlugin { certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) privateKey.set(System.getenv("PRIVATE_KEY")) password.set(System.getenv("PRIVATE_KEY_PASSWORD")) } - publishing { + publishPlugin { token.set(System.getenv("PUBLISH_TOKEN")) } - - changelog { - headerParserRegex.set("""(\d+\.\d+(.\d+)?)""".toRegex()) - path.set(file("../CHANGELOG.md").canonicalPath) - } -} - -tasks { - // Set the JVM compatibility versions - withType { - sourceCompatibility = "17" - targetCompatibility = "17" - } - withType { - kotlinOptions.jvmTarget = "17" - } } diff --git a/gmaven/src/main/kotlin/ru/rzn/gmyasoedov/gmaven/project/process/WslBaseMavenCommandLine.kt b/gmaven/src/main/kotlin/ru/rzn/gmyasoedov/gmaven/project/process/WslBaseMavenCommandLine.kt index 1cc3dd28..eed908d3 100644 --- a/gmaven/src/main/kotlin/ru/rzn/gmyasoedov/gmaven/project/process/WslBaseMavenCommandLine.kt +++ b/gmaven/src/main/kotlin/ru/rzn/gmyasoedov/gmaven/project/process/WslBaseMavenCommandLine.kt @@ -37,7 +37,7 @@ class WslBaseMavenCommandLine( } commandLine.environment["JAVA_HOME"] = wslDistribution.getWslPath(request.settings.javaHome!!) val wslExtClassesJarPath = wslDistribution.getWslPath(getExtClassesJarPathString())!! - val resultJsonFilePath = wslDistribution.getWslPath(resultFilePath)!! + val resultJsonFilePath = wslDistribution.getWslPath(resultFilePath.toString())!! BaseMavenCommandLine.setupGmavenPluginsProperty( commandLine, request, isImport, resultJsonFilePath, wslExtClassesJarPath ) @@ -50,7 +50,7 @@ class WslBaseMavenCommandLine( val message = "WSL " + GBundle.message("gmaven.notification.mvn.not.found", OpenGMavenSettingsCallback.ID) throw ExternalSystemException(message, OpenGMavenSettingsCallback.ID) } - commandLine.exePath = wslDistribution.getWslPath(windowsPath)!! + commandLine.exePath = wslDistribution.getWslPath(windowsPath.toString())!! commandLine.workDirectory = workingDirectory.toFile() commandLine.isRedirectErrorStream = true @@ -59,7 +59,7 @@ class WslBaseMavenCommandLine( } private fun setupProjectPath(commandLine: GeneralCommandLine, request: GServerRequest) { - commandLine.addParameters("-f", wslDistribution.getWslPath(request.projectPath)) + commandLine.addParameters("-f", wslDistribution.getWslPath(request.projectPath.toString())) } private fun getExeMavenPath(): Path { diff --git a/gmaven/src/main/resources/META-INF/plugin.xml b/gmaven/src/main/resources/META-INF/plugin.xml index 4e1361d1..5affc41b 100644 --- a/gmaven/src/main/resources/META-INF/plugin.xml +++ b/gmaven/src/main/resources/META-INF/plugin.xml @@ -46,8 +46,6 @@ com.intellij.properties org.intellij.groovy org.jetbrains.kotlin - org.jetbrains.plugins.terminal - com.jetbrains.sh - - - - \ No newline at end of file diff --git a/gmaven/src/main/resources/META-INF/terminal-support.xml b/gmaven/src/main/resources/META-INF/terminal-support.xml deleted file mode 100644 index 7efa70cc..00000000 --- a/gmaven/src/main/resources/META-INF/terminal-support.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index c79c53bf..d3ba1698 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ # IntelliJ Platform Artifacts Repositories -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html -pluginVersion=242.5 -pluginSinceBuild=242.21829.142 -pluginUntilBuild=270.* +pluginVersion=233.32 +pluginSinceBuild=233.11799.241 +pluginUntilBuild= # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType=IC -platformVersion=2024.2.3 +platformVersion=2023.3 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency=false