Skip to content

Commit bbd4df6

Browse files
authored
Update intellij platform to 223 (#28)
* chore: configure snapshot version of the JB plugin * chore: update intellij platform to 223.7571.182
1 parent 1f5228b commit bbd4df6

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

build.gradle.kts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
77
group = "com.github.monosoul"
88

99
plugins {
10-
id("org.jetbrains.intellij") version "1.10.0"
10+
id("org.jetbrains.intellij") version "1.11.0-SNAPSHOT"
1111
kotlin("jvm") version "1.7.22"
1212
id("org.jetbrains.kotlinx.kover") version "0.6.1"
1313
}
@@ -19,11 +19,11 @@ kover {
1919
}
2020

2121
intellij {
22-
version.set("222.3345.118")
22+
version.set("223.7571.182")
2323
pluginName.set("Git extended update-index")
2424
updateSinceUntilBuild.set(true)
2525
sameSinceUntilBuild.set(false)
26-
plugins.set(listOf("git4idea"))
26+
plugins.set(listOf("vcs-git"))
2727
}
2828

2929
dependencies {
@@ -33,12 +33,7 @@ dependencies {
3333
testImplementation("org.junit.jupiter:junit-jupiter")
3434
testImplementation("org.junit.platform:junit-platform-launcher")
3535
testImplementation("io.strikt:strikt-jvm:0.34.1")
36-
testImplementation("io.mockk:mockk-jvm") {
37-
version {
38-
strictly("1.13.1")
39-
because("versions higher than 1.13.1 cause failures")
40-
}
41-
}
36+
testImplementation("io.mockk:mockk-jvm:1.13.3")
4237
testImplementation("org.apache.commons:commons-lang3:3.12.0")
4338
}
4439

settings.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,8 @@
1-
rootProject.name = "git-extended-update-index-plugin"
1+
rootProject.name = "git-extended-update-index-plugin"
2+
3+
pluginManagement {
4+
repositories {
5+
maven("https://oss.sonatype.org/content/repositories/snapshots/")
6+
gradlePluginPortal()
7+
}
8+
}

src/test/kotlin/com/github/monosoul/git/updateindex/extended/UpdateIndexLineHandlerFactoryTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ internal class UpdateIndexLineHandlerFactoryTest {
4545
private lateinit var vcsManager: ProjectLevelVcsManager
4646

4747
@MockK
48-
private lateinit var gitExecutable: GitExecutable
48+
private lateinit var gitExecutable: GitExecutable.Local
4949

5050
@MockK(relaxed = true)
5151
private lateinit var virtualFileManager: VirtualFileManager

src/test/kotlin/com/github/monosoul/git/updateindex/extended/changes/view/SkippedWorktreeChangesViewModifierTest.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ import com.intellij.openapi.progress.ProgressManager
1515
import com.intellij.openapi.util.Disposer.dispose
1616
import com.intellij.openapi.vcs.FilePath
1717
import com.intellij.openapi.vcs.LocalFilePath
18+
import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode
1819
import com.intellij.openapi.vcs.changes.ui.ChangesViewModelBuilder
1920
import com.intellij.openapi.vcs.changes.ui.NoneChangesGroupingFactory
2021
import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder
2122
import com.intellij.openapi.vfs.LocalFileSystem
23+
import com.intellij.openapi.vfs.VirtualFile
2224
import com.intellij.openapi.vfs.VirtualFileManager
2325
import io.mockk.Called
2426
import io.mockk.every
@@ -127,14 +129,19 @@ internal class SkippedWorktreeChangesViewModifierTest {
127129
get { root }.isNotNull()
128130
get { getChildCount(root) } isEqualTo 1
129131
get { getChild(root, 0) }.isA<ChangesBrowserSkippedWorktreeNode>() and {
130-
get { allFilesUnder }
131-
.hasSize(files.size)
132+
get { listAllFiles() }.hasSize(files.size)
132133
.map { it.path }
133134
.containsExactlyInAnyOrder(files.map { "/${it.path}" })
134135
}
135136
}
136137
}
137138

139+
private fun ChangesBrowserSkippedWorktreeNode.listAllFiles() = traverse()
140+
.filter(ChangesBrowserNode<*>::isLeaf)
141+
.map(ChangesBrowserNode<*>::getUserObject)
142+
.filter(VirtualFile::class.java)
143+
.toList()
144+
138145
private class FilesArgumentSource : AbstractMultiArgumentsSource({
139146
List<FilePath>(Random.nextInt(1..10)) {
140147
LocalFilePath(RandomStringUtils.randomAlphabetic(LIMIT), false)

0 commit comments

Comments
 (0)