Skip to content

Commit

Permalink
remove dead code and update platform
Browse files Browse the repository at this point in the history
  • Loading branch information
czoido committed Sep 30, 2024
1 parent b060999 commit 0d4f8e7
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 103 deletions.
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ pluginRepositoryUrl = https://github.com/conan-io/conan-clion-plugin/
pluginVersion = 2.0.7

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 233
pluginSinceBuild = 241
pluginUntilBuild = 243.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = CL
platformVersion = 2023.2
platformVersion = 2024.1

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# libraries
annotations = "24.0.1"
junit = "4.13.2"
kotlinxSerializationJson = "1.5.0"
kotlinxSerializationJson = "1.6.2"

# plugins
changelog = "2.2.1"
Expand Down
4 changes: 0 additions & 4 deletions src/main/kotlin/com/jfrog/conan/clion/cmake/CMake.kt
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,6 @@ class CMake(val project: Project) {
return CMakeSettings.getInstance(project).activeProfiles
}

fun getSelectedBuildConfiguration(): CMakeConfiguration? {
return CMakeAppRunConfiguration.getSelectedBuildAndRunConfigurations(project)?.buildConfiguration
}

fun handleAdvancedSettings() {
val isCMakeParallel = !AdvancedSettings.getBoolean("cmake.reload.profiles.sequentially")

Expand Down

This file was deleted.

25 changes: 4 additions & 21 deletions src/test/kotlin/com/jfrog/conan/clionplugin/MyPluginTest.kt
Original file line number Diff line number Diff line change
@@ -1,30 +1,13 @@
package com.jfrog.conan.clion

import com.intellij.ide.highlighter.XmlFileType
import com.intellij.psi.xml.XmlFile
import com.intellij.testFramework.TestDataPath
import com.intellij.openapi.components.service
import com.intellij.testFramework.fixtures.BasePlatformTestCase
import com.intellij.util.PsiErrorElementUtil
import com.jfrog.conan.clion.services.ConanService

@TestDataPath("\$CONTENT_ROOT/src/test/testData")
class MyPluginTest : BasePlatformTestCase() {

fun testXMLFile() {
val psiFile = myFixture.configureByText(XmlFileType.INSTANCE, "<foo>bar</foo>")
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)
}
}

fun testRename() {
myFixture.testRename("foo.xml", "foo_after.xml", "a2")
fun testProjectService() {
val projectService = project.service<ConanService>()
}

override fun getTestDataPath() = "src/test/testData/rename"
Expand Down

0 comments on commit 0d4f8e7

Please sign in to comment.