From 7392fe442eb2088e42c37a24ef1567697776932a Mon Sep 17 00:00:00 2001 From: Patrice de Saint Steban Date: Mon, 5 Dec 2022 11:47:01 +0100 Subject: [PATCH] :bookmark: version 1.11.1 update to intellij 2022.2 --- CHANGELOG.md | 3 ++- build.gradle.kts | 25 ++++++++++++++---------- gradle.properties | 13 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a39f3a5..2d48d41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ # gitmoji-intellij-plugin changelog ## [Unreleased] +- Update to intellij 2022.2 ## [1.11.0] -- Bug fix #34 Error when select the option nothing +- Bug fix #34 Error when select the option nothing - Feature #27 Add new option for insert the gitmoji description in the commit ## [1.10.0] diff --git a/build.gradle.kts b/build.gradle.kts index 74d8387..9df023f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,13 +7,15 @@ plugins { // Java support id("java") // Kotlin support - id("org.jetbrains.kotlin.jvm") version "1.6.10" + id("org.jetbrains.kotlin.jvm") version "1.7.21" // Gradle IntelliJ Plugin - id("org.jetbrains.intellij") version "1.4.0" + id("org.jetbrains.intellij") version "1.10.0" // Gradle Changelog Plugin - id("org.jetbrains.changelog") version "1.3.1" + id("org.jetbrains.changelog") version "2.0.0" // Gradle Qodana Plugin id("org.jetbrains.qodana") version "0.1.13" + // Gradle Kover Plugin + id("org.jetbrains.kotlinx.kover") version "0.6.1" } group = properties("pluginGroup") @@ -25,9 +27,8 @@ repositories { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-stdlib") - implementation("com.google.code.gson:gson:2.8.6") + implementation("com.google.code.gson:gson:2.8.9") implementation("com.squareup.okhttp3:okhttp:4.9.1") } @@ -45,6 +46,7 @@ intellij { changelog { version.set(properties("pluginVersion")) groups.set(emptyList()) + repositoryUrl.set(properties("pluginRepositoryUrl")) } // Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin @@ -78,7 +80,7 @@ tasks { // Extract the section from README.md and provide for the plugin's manifest pluginDescription.set( - projectDir.resolve("README.md").readText().lines().run { + file("README.md").readText().lines().run { val start = "" val end = "" @@ -86,14 +88,17 @@ tasks { throw GradleException("Plugin description section not found in README.md:\n$start ... $end") } subList(indexOf(start) + 1, indexOf(end)) - }.joinToString("\n").run { markdownToHTML(this) } + }.joinToString("\n").let { markdownToHTML(it) } ) // Get the latest available change notes from the changelog file changeNotes.set(provider { - changelog.run { - getOrNull(properties("pluginVersion")) ?: getLatest() - }.toHTML() + with(changelog) { + renderItem( + getOrNull(properties("pluginVersion")) ?: getLatest(), + org.jetbrains.changelog.Changelog.OutputType.HTML, + ) + } }) } diff --git a/gradle.properties b/gradle.properties index f0a2ae0..c2f3d91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,27 +3,28 @@ pluginGroup = com.github.patou pluginName = gitmoji-intellij-plugin +pluginRepositoryUrl = https://github.com/patou/gitmoji-intellij-plugin # SemVer format -> https://semver.org -pluginVersion = 1.11.0 +pluginVersion = 1.11.1 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 203 -pluginUntilBuild = 222.* +pluginSinceBuild = 222 +pluginUntilBuild = 223.* # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties platformType = IC -platformVersion = 2021.3 +platformVersion = 2022.3 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 platformPlugins = # Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3 -javaVersion = 11 +javaVersion = 17 # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 7.4 +gradleVersion = 7.5.1 # Opt-out flag for bundling Kotlin standard library. # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists