From f0de1d8a88a9d9e0ccd08d3e032898f8b5d5f58d Mon Sep 17 00:00:00 2001 From: Jon Morgan Date: Sun, 10 Dec 2023 09:12:46 +0000 Subject: [PATCH] WIP: stop needing to bump max version --- build.gradle.kts | 15 +-------- gradle.properties | 11 +------ qodana.yml | 6 ---- src/main/resources/META-INF/plugin.xml | 2 +- .../jmorjsm/rosepineintellij/MyPluginTest.kt | 31 ------------------- src/test/testData/rename/foo.xml | 3 -- src/test/testData/rename/foo_after.xml | 3 -- 7 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 qodana.yml delete mode 100644 src/test/kotlin/com/github/jmorjsm/rosepineintellij/MyPluginTest.kt delete mode 100644 src/test/testData/rename/foo.xml delete mode 100644 src/test/testData/rename/foo_after.xml diff --git a/build.gradle.kts b/build.gradle.kts index e171ba2..83f9a0d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,8 +12,6 @@ plugins { id("org.jetbrains.intellij") version "1.10.2" // Gradle Changelog Plugin id("org.jetbrains.changelog") version "1.3.1" - // Gradle Qodana Plugin - id("org.jetbrains.qodana") version "0.1.13" } group = properties("pluginGroup") @@ -34,8 +32,7 @@ intellij { version.set(properties("platformVersion")) type.set(properties("platformType")) - // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file. - plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty)) + updateSinceUntilBuild.set(false) } // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin @@ -44,14 +41,6 @@ changelog { groups.set(emptyList()) } -// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin -qodana { - cachePath.set(projectDir.resolve(".qodana").canonicalPath) - reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath) - saveReport.set(true) - showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false) -} - tasks { wrapper { gradleVersion = properties("gradleVersion") @@ -59,8 +48,6 @@ tasks { patchPluginXml { version.set(properties("pluginVersion")) - sinceBuild.set(properties("pluginSinceBuild")) - untilBuild.set(properties("pluginUntilBuild")) // Get the latest available change notes from the changelog file changeNotes.set(provider { diff --git a/gradle.properties b/gradle.properties index 41f0090..a743133 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,21 +4,12 @@ pluginGroup = com.github.jmorjsm.rosepineintellij pluginName = rose-pine-intellij # SemVer format -> https://semver.org -pluginVersion = 0.0.8 - -# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -# for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 213 -pluginUntilBuild = 232.* +pluginVersion = 0.1.0 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties platformType = IC platformVersion = 2022.2 -# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html -# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 -platformPlugins = - # Gradle Releases -> https://github.com/gradle/gradle/releases gradleVersion = 7.5.1 diff --git a/qodana.yml b/qodana.yml deleted file mode 100644 index dac95d3..0000000 --- a/qodana.yml +++ /dev/null @@ -1,6 +0,0 @@ -# Qodana configuration: -# https://www.jetbrains.com/help/qodana/qodana-yaml.html - -version: 1.0 -profile: - name: qodana.recommended diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index a295cbd..765e3b2 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -10,7 +10,7 @@ Includes all three of the rose pine themes (rose-pine, rose-pine-dawn, rose-pine-moon). ]]> - + com.intellij.modules.platform diff --git a/src/test/kotlin/com/github/jmorjsm/rosepineintellij/MyPluginTest.kt b/src/test/kotlin/com/github/jmorjsm/rosepineintellij/MyPluginTest.kt deleted file mode 100644 index dd554f6..0000000 --- a/src/test/kotlin/com/github/jmorjsm/rosepineintellij/MyPluginTest.kt +++ /dev/null @@ -1,31 +0,0 @@ -package com.github.jmorjsm.rosepineintellij - -import com.intellij.ide.highlighter.XmlFileType -import com.intellij.psi.xml.XmlFile -import com.intellij.testFramework.TestDataPath -import com.intellij.testFramework.fixtures.BasePlatformTestCase -import com.intellij.util.PsiErrorElementUtil - -@TestDataPath("\$CONTENT_ROOT/src/test/testData") -class MyPluginTest : BasePlatformTestCase() { - - fun testXMLFile() { - val psiFile = myFixture.configureByText(XmlFileType.INSTANCE, "bar") - val xmlFile = assertInstanceOf(psiFile, XmlFile::class.java) - - assertFalse(PsiErrorElementUtil.hasErrors(project, xmlFile.virtualFile)) - - assertNotNull(xmlFile.rootTag) - - xmlFile.rootTag?.let { - assertEquals("foo", it.name) - assertEquals("bar", it.value.text) - } - } - - override fun getTestDataPath() = "src/test/testData/rename" - - fun testRename() { - myFixture.testRename("foo.xml", "foo_after.xml", "a2") - } -} diff --git a/src/test/testData/rename/foo.xml b/src/test/testData/rename/foo.xml deleted file mode 100644 index b21e9f2..0000000 --- a/src/test/testData/rename/foo.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 1>Foo - diff --git a/src/test/testData/rename/foo_after.xml b/src/test/testData/rename/foo_after.xml deleted file mode 100644 index 980ca96..0000000 --- a/src/test/testData/rename/foo_after.xml +++ /dev/null @@ -1,3 +0,0 @@ - - Foo -