From d9c65eb2b9298e6a4b10cd534fa661a7b32baa4e Mon Sep 17 00:00:00 2001 From: "Philip Schlesinger @ Cryoport" Date: Fri, 23 Aug 2024 17:59:30 -0700 Subject: [PATCH 1/5] Broken; working on migrating START HERE NEXT: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-migration.html#intellij-extension --- .gitignore | 3 +- .idea/kotlinScripting.xml | 9 -- .idea/kotlinc.xml | 4 +- .idea/misc.xml | 4 +- .sdkmanrc | 2 +- CHANGELOG.md | 32 +++++ build.gradle.kts | 150 +++++++++-------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 100 insertions(+), 106 deletions(-) delete mode 100644 .idea/kotlinScripting.xml diff --git a/.gitignore b/.gitignore index 467124b..df6ab63 100644 --- a/.gitignore +++ b/.gitignore @@ -126,4 +126,5 @@ gradle-app.setting # End of https://www.toptal.com/developers/gitignore/api/gradle,intellij -.DS_Store \ No newline at end of file +.DS_Store +/.idea diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml deleted file mode 100644 index e56386c..0000000 --- a/.idea/kotlinScripting.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - 2147483647 - true - - - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 46c6ce0..d4b7acc 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 5180e99..0248914 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,10 +4,10 @@ - + - + \ No newline at end of file diff --git a/.sdkmanrc b/.sdkmanrc index 489632b..fcebd7d 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,3 +1,3 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below -java=17.0.5-tem +java=21.0.4-tem diff --git a/CHANGELOG.md b/CHANGELOG.md index aacc14c..de268b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,37 @@ # Changelog +## 2.6.0+jre21 +published to: +- [JetBrains marketplace](https://plugins.jetbrains.com/plugin/15673-asyncapi/versions/stable/520779) +- [GitHub](https://github.com/asyncapi/jasyncapi-idea-plugin/releases/tag/2.5.0%2Bjre17) + +### Added + +- IDEA 2024.2 + +### Fixed + +- No fixes included + +### Changed + +- bump actions/checkout from 3 to 4 +- bump actions/setup-node from 3 to 4 +- bump actions/stale from 5.2.0 to 9.0.0 +- bump amannn/action-semantic-pull-request from 5.2.0 to 5.5.3 +- bump com.fasterxml.jackson.core:jackson-core from 2.15.0 to 2.17.2 +- bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml from 2.15.0 to 2.17.2 +- bump com.fasterxml.jackson.module:jackson-module-kotlin from 2.15.0 to 2.17.2 +- bump hmarr/auto-approve-action from 3.2.1 to 4.0.0 +- bump jvm from 1.9.23 to 2.0.20 +- bump marocchino/sticky-pull-request-comment from 2.5.0 to 2.9.0 +- bump org.jetbrains.intellij from 1.17.3 to 1.17.4 +- bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.11.0 +- bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.11.0 +- bump org.junit.vintage:junit-vintage-engine from 5.9.2 to 5.11.0 +- bump pascalgn/automerge-action from 0.15.6 to 0.16.3 + + ## 2.5.0+jre17 published to: - [JetBrains marketplace](https://plugins.jetbrains.com/plugin/15673-asyncapi/versions/stable/520779) diff --git a/build.gradle.kts b/build.gradle.kts index dda408d..91fd3d9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,12 @@ plugins { - id("org.jetbrains.intellij") version "1.17.4" + id("org.jetbrains.intellij.platform") version "2.0.1" + id("org.jetbrains.intellij.platform.migration") version "2.0.1" java kotlin("jvm") version "2.0.20" } group = "com.asyncapi.plugin.idea" -version = "2.5.0+jre17" +version = "2.6.0+jre21" repositories { mavenCentral() @@ -23,116 +24,85 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version.set("2024.1") + version.set("2024.2") plugins.set(listOf("yaml")) } tasks.getByName("patchPluginXml") { sinceBuild.set("223") - untilBuild.set("241.*") + untilBuild.set("242.*") changeNotes.set("""

Added

    -
  • IDEA 2024.1
    • +
  • IDEA 2024.2

Fixed

    -
  • Incorrect validation of Multi Format Schema and bindings
    • +
  • No fixes this release version

Changed

    -
  • 2.0.0 schema validation and completion:
      -
    • Updated allowed extension name: ^x-[\w\d\-\_]+${'$'} was changed to ^x-[\w\d\.\x2d_]+${'$'}
      • -
    • OpenAPI schema v3
      • -
    • Added schemaFormat to messages to recognize properly non AsyncAPI Schemas
      • -
    • Was updated JsonSchema Draft 07
      • -
    -
    • -
  • 2.1.0 schema validation and completion:
      -
    • OpenAPI schema v3
      • -
    • Added schemaFormat to messages to recognize properly non AsyncAPI Schemas
      • -
    • Was updated JsonSchema Draft 07
      • -
    -
    • -
  • 2.2.0 schema validation and completion:
      -
    • OpenAPI schema v3
      • -
    • Added schemaFormat to messages to recognize properly non AsyncAPI Schemas
      • -
    • Was updated JsonSchema Draft 07
      • -
    -
    • -
  • 2.3.0 schema validation and completion:
      -
    • OpenAPI schema v3
      • -
    • Added schemaFormat to messages to recognize properly non AsyncAPI Schemas
      • -
    • Was updated JsonSchema Draft 07
      • -
    -
    • -
  • 2.4.0 schema validation and completion:
      -
    • OpenAPI schema v3
      • -
    • Added schemaFormat to messages to recognize properly non AsyncAPI Schemas
      • -
    • Was updated JsonSchema Draft 07
      • -
    -
    • -
  • 2.5.0 schema validation and completion:
      -
    • OpenAPI schema v3
      • -
    • Added schemaFormat to messages to recognize properly non AsyncAPI Schemas
      • -
    • Was updated JsonSchema Draft 07
      • -
    -
    • -
  • 3.0.0 schema validation and completion:
      -
    • Bindings:
        -
      • Solace:
          -
        • server binding 0.4.0
          • -
        • operation binding 0.4.0
          • -
        -
        • -
      • HTTP:
          -
        • message binding 0.3.0
          • -
        • operation binding 0.3.0
          • -
        -
        • -
      -
      • -
    -
    • +
  • Gradle now 8.10
    • +
  • Plugin verifier now 1.373
    • +
  • Now using Github Dependabot
    • +
  • bump actions/checkout from 3 to 4
    • +
  • bump actions/setup-node from 3 to 4
    • +
  • bump actions/stale from 5.2.0 to 9.0.0
    • +
  • bump amannn/action-semantic-pull-request from 5.2.0 to 5.5.3
    • +
  • bump com.fasterxml.jackson.core:jackson-core from 2.15.0 to 2.17.2
    • +
  • bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml from 2.15.0 to 2.17.2
    • +
  • bump com.fasterxml.jackson.module:jackson-module-kotlin from 2.15.0 to 2.17.2
    • +
  • bump hmarr/auto-approve-action from 3.2.1 to 4.0.0
    • +
  • bump jvm from 1.9.23 to 2.0.20
    • +
  • bump marocchino/sticky-pull-request-comment from 2.5.0 to 2.9.0
    • +
  • bump org.jetbrains.intellij from 1.17.3 to 1.17.4
    • +
  • bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.11.0
    • +
  • bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.11.0
    • +
  • bump org.junit.vintage:junit-vintage-engine from 5.9.2 to 5.11.0
    • +
  • bump pascalgn/automerge-action from 0.15.6 to 0.16.3
- """.trimIndent()) + """.trimIndent() + ) } tasks.getByName("runPluginVerifier") { - ideVersions.set(listOf( - "2022.3", - "2022.3.1", - "2022.3.2", - "2022.3.3", - "2023.1", - "2023.1.1", - "2023.1.2", - "2023.1.3", - "2023.1.4", - "2023.1.5", - "2023.2", - "2023.2.1", - "2023.2.2", - "2023.2.3", - "2023.2.4", - "2023.2.5", - "2023.3", - "2023.3.1", - "2023.3.2", - "2023.3.3", - "2023.3.4", - "2023.3.5", - "2023.3.6", - "2024.1" - )) - verifierVersion.set("1.365") + ideVersions.set( + listOf( + "2022.3", + "2022.3.1", + "2022.3.2", + "2022.3.3", + "2023.1", + "2023.1.1", + "2023.1.2", + "2023.1.3", + "2023.1.4", + "2023.1.5", + "2023.2", + "2023.2.1", + "2023.2.2", + "2023.2.3", + "2023.2.4", + "2023.2.5", + "2023.3", + "2023.3.1", + "2023.3.2", + "2023.3.3", + "2023.3.4", + "2023.3.5", + "2023.3.6", + "2024.1", + "2024.2" + ) + ) + verifierVersion.set("1.373") } tasks { compileKotlin { - kotlinOptions.jvmTarget = "17" +// apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) } compileTestKotlin { - kotlinOptions.jvmTarget = "17" +// apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) } test { useJUnitPlatform() @@ -141,6 +111,6 @@ tasks { kotlin { jvmToolchain { - this.languageVersion.set(JavaLanguageVersion.of(17)) + this.languageVersion.set(JavaLanguageVersion.of(21)) } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 3c4c55aa76b2a002e03f6ddbbf01b9db30775763 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 27 Aug 2024 13:57:48 +0400 Subject: [PATCH 2/5] build: rollback to java 17 and migrate intellij block --- ....jetbrains.plugins.yaml-2024.2.0.2+665.xml | 10 ++ .sdkmanrc | 2 +- build.gradle.kts | 169 ++++++++++-------- 3 files changed, 104 insertions(+), 77 deletions(-) create mode 100644 .intellijPlatform/localPlatformArtifacts/bundledPlugin-org.jetbrains.plugins.yaml-2024.2.0.2+665.xml diff --git a/.intellijPlatform/localPlatformArtifacts/bundledPlugin-org.jetbrains.plugins.yaml-2024.2.0.2+665.xml b/.intellijPlatform/localPlatformArtifacts/bundledPlugin-org.jetbrains.plugins.yaml-2024.2.0.2+665.xml new file mode 100644 index 0000000..77e3488 --- /dev/null +++ b/.intellijPlatform/localPlatformArtifacts/bundledPlugin-org.jetbrains.plugins.yaml-2024.2.0.2+665.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.sdkmanrc b/.sdkmanrc index fcebd7d..489632b 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,3 +1,3 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below -java=21.0.4-tem +java=17.0.5-tem diff --git a/build.gradle.kts b/build.gradle.kts index 91fd3d9..691e445 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.intellij.platform.gradle.TestFrameworkType + plugins { id("org.jetbrains.intellij.platform") version "2.0.1" id("org.jetbrains.intellij.platform.migration") version "2.0.1" @@ -6,13 +8,29 @@ plugins { } group = "com.asyncapi.plugin.idea" -version = "2.6.0+jre21" +version = "2.6.0+jre17" repositories { mavenCentral() + intellijPlatform { + defaultRepositories() + } } dependencies { + intellijPlatform { + intellijIdeaCommunity("2024.2.0.2", useInstaller = false) + + // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins. + bundledPlugins(listOf( + "org.jetbrains.plugins.yaml" + )) + + instrumentationTools() + pluginVerifier() + testFramework(TestFrameworkType.Platform) + } + implementation("com.fasterxml.jackson.core:jackson-core:2.17.2") implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.2") @@ -22,87 +40,86 @@ dependencies { testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.11.0") } -// See https://github.com/JetBrains/gradle-intellij-plugin/ -intellij { - version.set("2024.2") - plugins.set(listOf("yaml")) -} -tasks.getByName("patchPluginXml") { - sinceBuild.set("223") - untilBuild.set("242.*") - changeNotes.set(""" -

Added

-
    -
  • IDEA 2024.2
    • -
-

Fixed

-
    -
  • No fixes this release version
    • -
-

Changed

-
    -
  • Gradle now 8.10
    • -
  • Plugin verifier now 1.373
    • -
  • Now using Github Dependabot
    • -
  • bump actions/checkout from 3 to 4
    • -
  • bump actions/setup-node from 3 to 4
    • -
  • bump actions/stale from 5.2.0 to 9.0.0
    • -
  • bump amannn/action-semantic-pull-request from 5.2.0 to 5.5.3
    • -
  • bump com.fasterxml.jackson.core:jackson-core from 2.15.0 to 2.17.2
    • -
  • bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml from 2.15.0 to 2.17.2
    • -
  • bump com.fasterxml.jackson.module:jackson-module-kotlin from 2.15.0 to 2.17.2
    • -
  • bump hmarr/auto-approve-action from 3.2.1 to 4.0.0
    • -
  • bump jvm from 1.9.23 to 2.0.20
    • -
  • bump marocchino/sticky-pull-request-comment from 2.5.0 to 2.9.0
    • -
  • bump org.jetbrains.intellij from 1.17.3 to 1.17.4
    • -
  • bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.11.0
    • -
  • bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.11.0
    • -
  • bump org.junit.vintage:junit-vintage-engine from 5.9.2 to 5.11.0
    • -
  • bump pascalgn/automerge-action from 0.15.6 to 0.16.3
    • -
- """.trimIndent() - ) +// See https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html +intellijPlatform { + instrumentCode = true } +//tasks.getByName("patchPluginXml") { +// sinceBuild.set("223") +// untilBuild.set("242.*") +// changeNotes.set(""" +//

Added

+//
    +//
  • IDEA 2024.2
    • +//
+//

Fixed

+//
    +//
  • No fixes this release version
    • +//
+//

Changed

+//
    +//
  • Gradle now 8.10
    • +//
  • Plugin verifier now 1.373
    • +//
  • Now using Github Dependabot
    • +//
  • bump actions/checkout from 3 to 4
    • +//
  • bump actions/setup-node from 3 to 4
    • +//
  • bump actions/stale from 5.2.0 to 9.0.0
    • +//
  • bump amannn/action-semantic-pull-request from 5.2.0 to 5.5.3
    • +//
  • bump com.fasterxml.jackson.core:jackson-core from 2.15.0 to 2.17.2
    • +//
  • bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml from 2.15.0 to 2.17.2
    • +//
  • bump com.fasterxml.jackson.module:jackson-module-kotlin from 2.15.0 to 2.17.2
    • +//
  • bump hmarr/auto-approve-action from 3.2.1 to 4.0.0
    • +//
  • bump jvm from 1.9.23 to 2.0.20
    • +//
  • bump marocchino/sticky-pull-request-comment from 2.5.0 to 2.9.0
    • +//
  • bump org.jetbrains.intellij from 1.17.3 to 1.17.4
    • +//
  • bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.11.0
    • +//
  • bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.11.0
    • +//
  • bump org.junit.vintage:junit-vintage-engine from 5.9.2 to 5.11.0
    • +//
  • bump pascalgn/automerge-action from 0.15.6 to 0.16.3
    • +//
+// """.trimIndent() +// ) +//} -tasks.getByName("runPluginVerifier") { - ideVersions.set( - listOf( - "2022.3", - "2022.3.1", - "2022.3.2", - "2022.3.3", - "2023.1", - "2023.1.1", - "2023.1.2", - "2023.1.3", - "2023.1.4", - "2023.1.5", - "2023.2", - "2023.2.1", - "2023.2.2", - "2023.2.3", - "2023.2.4", - "2023.2.5", - "2023.3", - "2023.3.1", - "2023.3.2", - "2023.3.3", - "2023.3.4", - "2023.3.5", - "2023.3.6", - "2024.1", - "2024.2" - ) - ) - verifierVersion.set("1.373") -} +//tasks.getByName("runPluginVerifier") { +// ideVersions.set( +// listOf( +// "2022.3", +// "2022.3.1", +// "2022.3.2", +// "2022.3.3", +// "2023.1", +// "2023.1.1", +// "2023.1.2", +// "2023.1.3", +// "2023.1.4", +// "2023.1.5", +// "2023.2", +// "2023.2.1", +// "2023.2.2", +// "2023.2.3", +// "2023.2.4", +// "2023.2.5", +// "2023.3", +// "2023.3.1", +// "2023.3.2", +// "2023.3.3", +// "2023.3.4", +// "2023.3.5", +// "2023.3.6", +// "2024.1", +// "2024.2" +// ) +// ) +// verifierVersion.set("1.373") +//} tasks { compileKotlin { -// apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) + kotlinOptions.jvmTarget = "17" } compileTestKotlin { -// apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) + kotlinOptions.jvmTarget = "17" } test { useJUnitPlatform() @@ -111,6 +128,6 @@ tasks { kotlin { jvmToolchain { - this.languageVersion.set(JavaLanguageVersion.of(21)) + this.languageVersion.set(JavaLanguageVersion.of(17)) } } From bd718cd1ca6b206fe5e3b5e234ef0687190f87e6 Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 27 Aug 2024 13:59:22 +0400 Subject: [PATCH 3/5] build(plugin.xml): remove applicationService for services annotated with '@Service' Service class annotated with '@Service' must not be registered in the 'plugin. xml' file --- .idea/misc.xml | 2 +- src/main/resources/META-INF/plugin.xml | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 0248914..653f88b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,7 +4,7 @@ - + diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index a03342b..18fce28 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -27,12 +27,6 @@ - - - - - - From 53de3bcf0e8285849ce21ee7f5e591e4d849af8d Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 27 Aug 2024 14:20:51 +0400 Subject: [PATCH 4/5] build(plugin.xml): migrate patchPluginXml --- build.gradle.kts | 56 +++++++------------- src/main/resources/META-INF/description.html | 13 +++++ src/main/resources/META-INF/plugin.xml | 16 ------ 3 files changed, 33 insertions(+), 52 deletions(-) create mode 100644 src/main/resources/META-INF/description.html diff --git a/build.gradle.kts b/build.gradle.kts index 691e445..fa2116a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,43 +43,27 @@ dependencies { // See https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html intellijPlatform { instrumentCode = true + + pluginConfiguration { + description = providers.fileContents( + layout.projectDirectory.file("src/main/resources/META-INF/description.html") + ).asText + + changeNotes = """ +

Added

+
    +
  • IDEA 2024.2
    • +
+ """.trimIndent() + } +} + +tasks { + patchPluginXml { + sinceBuild = "223" + untilBuild = "242.*" + } } -//tasks.getByName("patchPluginXml") { -// sinceBuild.set("223") -// untilBuild.set("242.*") -// changeNotes.set(""" -//

Added

-//
    -//
  • IDEA 2024.2
    • -//
-//

Fixed

-//
    -//
  • No fixes this release version
    • -//
-//

Changed

-//
    -//
  • Gradle now 8.10
    • -//
  • Plugin verifier now 1.373
    • -//
  • Now using Github Dependabot
    • -//
  • bump actions/checkout from 3 to 4
    • -//
  • bump actions/setup-node from 3 to 4
    • -//
  • bump actions/stale from 5.2.0 to 9.0.0
    • -//
  • bump amannn/action-semantic-pull-request from 5.2.0 to 5.5.3
    • -//
  • bump com.fasterxml.jackson.core:jackson-core from 2.15.0 to 2.17.2
    • -//
  • bump com.fasterxml.jackson.dataformat:jackson-dataformat-yaml from 2.15.0 to 2.17.2
    • -//
  • bump com.fasterxml.jackson.module:jackson-module-kotlin from 2.15.0 to 2.17.2
    • -//
  • bump hmarr/auto-approve-action from 3.2.1 to 4.0.0
    • -//
  • bump jvm from 1.9.23 to 2.0.20
    • -//
  • bump marocchino/sticky-pull-request-comment from 2.5.0 to 2.9.0
    • -//
  • bump org.jetbrains.intellij from 1.17.3 to 1.17.4
    • -//
  • bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.11.0
    • -//
  • bump org.junit.jupiter:junit-jupiter-engine from 5.9.2 to 5.11.0
    • -//
  • bump org.junit.vintage:junit-vintage-engine from 5.9.2 to 5.11.0
    • -//
  • bump pascalgn/automerge-action from 0.15.6 to 0.16.3
    • -//
-// """.trimIndent() -// ) -//} //tasks.getByName("runPluginVerifier") { // ideVersions.set( diff --git a/src/main/resources/META-INF/description.html b/src/main/resources/META-INF/description.html new file mode 100644 index 0000000..74b4c0b --- /dev/null +++ b/src/main/resources/META-INF/description.html @@ -0,0 +1,13 @@ +

Edit AsyncAPI specifications in the IDE with syntax highlighting, auto-completion and a live preview.

+
+

Features

+
    +
  • Recognition of AsyncAPI specifications
    • +
  • AsyncAPI specification auto-completion
    • +
  • AsyncAPI specification example creation from file -> new -> AsyncAPI specification
    • +
  • AsyncAPI specification inspection and validation using AsyncAPI JSON Schema
    • +
  • Local references resolving with auto-completion in AsyncAPI specification
    • +
  • File references resolving with auto-completion in AsyncAPI specification
    • +
  • AsyncAPI specification preview as html in built-in/external browser
    • +
+
\ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 18fce28..5301a5d 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -3,22 +3,6 @@ AsyncAPI AsyncAPI - ⚠️ This plugin doesn't support AsyncAPI 1.x -

Plugin to help you easily edit AsyncAPI specification files.

-

Features

-
    -
  • Recognition of AsyncAPI specifications.
    • -
  • AsyncAPI specification auto-completion.
    • -
  • AsyncAPI specification example creation from file -> new -> AsyncAPI specification.
    • -
  • AsyncAPI specification inspection and validation using AsyncAPI JSON Schema.
    • -
  • Local references resolving with auto-completion in AsyncAPI specification.
    • -
  • File references resolving with auto-completion in AsyncAPI specification.
    • -
  • AsyncAPI specification preview as html in built-in/external browser.
    • -
- ]]> - - com.intellij.modules.platform From 94dd100bde2db1dbf17805a01849d2a6b1ba393a Mon Sep 17 00:00:00 2001 From: Pavel Bodiachevskii Date: Tue, 27 Aug 2024 20:49:43 +0400 Subject: [PATCH 5/5] build: migrate patchPluginXml --- .gitignore | 2 ++ README.md | 2 +- build.gradle.kts | 82 ++++++++++++++++++++++++++++-------------------- 3 files changed, 51 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index df6ab63..4d352d4 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,5 @@ gradle-app.setting .DS_Store /.idea +.intellijPlatform +.kotlin \ No newline at end of file diff --git a/README.md b/README.md index fe13796..72a71db 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ cd jasyncapi-idea-plugin NOTE: This will take a while the first time as it will have to download every single version of IntelliJ IDEA listed in the `runPluginVerifier` section of the `build.gradle.kts` file. ```sh -./gradlew :runPluginVerifier +./gradlew :verifyPlugin ``` ... should have no errors 5. install plugin from disk - [JetBrains Instruction](https://www.jetbrains.com/help/idea/managing-plugins.html#install_plugin_from_disk) diff --git a/build.gradle.kts b/build.gradle.kts index fa2116a..b1bb06e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,8 +1,8 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType +import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask plugins { id("org.jetbrains.intellij.platform") version "2.0.1" - id("org.jetbrains.intellij.platform.migration") version "2.0.1" java kotlin("jvm") version "2.0.20" } @@ -56,6 +56,53 @@ intellijPlatform { """.trimIndent() } + + pluginVerification { + failureLevel = listOf( + VerifyPluginTask.FailureLevel.INVALID_PLUGIN, + VerifyPluginTask.FailureLevel.COMPATIBILITY_PROBLEMS, + VerifyPluginTask.FailureLevel.NOT_DYNAMIC + ) + + ides { + ides(listOf( + "2022.3", + "2022.3.1", + "2022.3.2", + "2022.3.3", + "2023.1", + "2023.1.1", + "2023.1.2", + "2023.1.3", + "2023.1.4", + "2023.1.5", + "2023.2", + "2023.2.1", + "2023.2.2", + "2023.2.3", + "2023.2.4", + "2023.2.5", + "2023.3", + "2023.3.1", + "2023.3.2", + "2023.3.3", + "2023.3.4", + "2023.3.5", + "2023.3.6", + "2023.3.7", + "2024.1", + "2024.1.1", + "2024.1.2", + "2024.1.3", + "2024.1.4", + "2024.1.5", + "2024.1.6", + "2024.2", + "2024.2.0.1", + "2024.2.0.2" + )) + } + } } tasks { @@ -65,39 +112,6 @@ tasks { } } -//tasks.getByName("runPluginVerifier") { -// ideVersions.set( -// listOf( -// "2022.3", -// "2022.3.1", -// "2022.3.2", -// "2022.3.3", -// "2023.1", -// "2023.1.1", -// "2023.1.2", -// "2023.1.3", -// "2023.1.4", -// "2023.1.5", -// "2023.2", -// "2023.2.1", -// "2023.2.2", -// "2023.2.3", -// "2023.2.4", -// "2023.2.5", -// "2023.3", -// "2023.3.1", -// "2023.3.2", -// "2023.3.3", -// "2023.3.4", -// "2023.3.5", -// "2023.3.6", -// "2024.1", -// "2024.2" -// ) -// ) -// verifierVersion.set("1.373") -//} - tasks { compileKotlin { kotlinOptions.jvmTarget = "17"