Update intellij platform to 223 (#28)

* chore: configure snapshot version of the JB plugin * chore: update intellij platform to 223.7571.182
monosoul · Dec 1, 2022 · bbd4df6 · bbd4df6
1 parent 1f5228b
commit bbd4df6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 group = "com.github.monosoul"
 
 plugins {
-    id("org.jetbrains.intellij") version "1.10.0"
+    id("org.jetbrains.intellij") version "1.11.0-SNAPSHOT"
     kotlin("jvm") version "1.7.22"
     id("org.jetbrains.kotlinx.kover") version "0.6.1"
 }
@@ -19,11 +19,11 @@ kover {
 }
 
 intellij {
-    version.set("222.3345.118")
+    version.set("223.7571.182")
     pluginName.set("Git extended update-index")
     updateSinceUntilBuild.set(true)
     sameSinceUntilBuild.set(false)
-    plugins.set(listOf("git4idea"))
+    plugins.set(listOf("vcs-git"))
 }
 
 dependencies {
@@ -33,12 +33,7 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.junit.platform:junit-platform-launcher")
     testImplementation("io.strikt:strikt-jvm:0.34.1")
-    testImplementation("io.mockk:mockk-jvm") {
-        version {
-            strictly("1.13.1")
-            because("versions higher than 1.13.1 cause failures")
-        }
-    }
+    testImplementation("io.mockk:mockk-jvm:1.13.3")
     testImplementation("org.apache.commons:commons-lang3:3.12.0")
 }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1 +1,8 @@
-rootProject.name = "git-extended-update-index-plugin"
+rootProject.name = "git-extended-update-index-plugin"
+
+pluginManagement {
+    repositories {
+        maven("https://oss.sonatype.org/content/repositories/snapshots/")
+        gradlePluginPortal()
+    }
+}
diff --git a/.../kotlin/com/github/monosoul/git/updateindex/extended/UpdateIndexLineHandlerFactoryTest.kt b/.../kotlin/com/github/monosoul/git/updateindex/extended/UpdateIndexLineHandlerFactoryTest.kt
@@ -45,7 +45,7 @@ internal class UpdateIndexLineHandlerFactoryTest {
     private lateinit var vcsManager: ProjectLevelVcsManager
 
     @MockK
-    private lateinit var gitExecutable: GitExecutable
+    private lateinit var gitExecutable: GitExecutable.Local
 
     @MockK(relaxed = true)
     private lateinit var virtualFileManager: VirtualFileManager

diff --git a/.../monosoul/git/updateindex/extended/changes/view/SkippedWorktreeChangesViewModifierTest.kt b/.../monosoul/git/updateindex/extended/changes/view/SkippedWorktreeChangesViewModifierTest.kt
@@ -15,10 +15,12 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.util.Disposer.dispose
 import com.intellij.openapi.vcs.FilePath
 import com.intellij.openapi.vcs.LocalFilePath
+import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode
 import com.intellij.openapi.vcs.changes.ui.ChangesViewModelBuilder
 import com.intellij.openapi.vcs.changes.ui.NoneChangesGroupingFactory
 import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder
 import com.intellij.openapi.vfs.LocalFileSystem
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileManager
 import io.mockk.Called
 import io.mockk.every
@@ -127,14 +129,19 @@ internal class SkippedWorktreeChangesViewModifierTest {
             get { root }.isNotNull()
             get { getChildCount(root) } isEqualTo 1
             get { getChild(root, 0) }.isA<ChangesBrowserSkippedWorktreeNode>() and {
-                get { allFilesUnder }
-                    .hasSize(files.size)
+                get { listAllFiles() }.hasSize(files.size)
                     .map { it.path }
                     .containsExactlyInAnyOrder(files.map { "/${it.path}" })
             }
         }
     }
 
+    private fun ChangesBrowserSkippedWorktreeNode.listAllFiles() = traverse()
+        .filter(ChangesBrowserNode<*>::isLeaf)
+        .map(ChangesBrowserNode<*>::getUserObject)
+        .filter(VirtualFile::class.java)
+        .toList()
+
     private class FilesArgumentSource : AbstractMultiArgumentsSource({
         List<FilePath>(Random.nextInt(1..10)) {
             LocalFilePath(RandomStringUtils.randomAlphabetic(LIMIT), false)