Release 1.0.3

Closes #2

.gitignore

@@ -1,8 +1,5 @@
 /.idea/*
-!/.idea/compiler.xml
+!/.idea/runConfigurations
-!/.idea/encodings.xml
-!/.idea/gradle.xml
-!/.idea/vcs.xml
 
 /.gradle/
 /build/

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/gradle.xml

@@ -4,9 +4,6 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>

build.gradle.kts

@@ -3,25 +3,29 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-	kotlin("jvm") version "1.6.21"
+	kotlin("jvm") version "1.8.0"
-	id("org.jetbrains.intellij") version "1.7.0"
+	id("org.jetbrains.intellij") version "1.15.0"
 }
 
 group = "com.chylex.intellij.rider.vcsgroupbyproject"
-version = "1.0.2"
+version = "1.0.3"
 
 repositories {
 	mavenCentral()
 }
 
+kotlin {
+	jvmToolchain(17)
+}
+
 intellij {
 	type.set("RD")
-	version.set("2022.2")
+	version.set("2023.2-SNAPSHOT")
 	updateSinceUntilBuild.set(false)
 }
 
 tasks.patchPluginXml {
-	sinceBuild.set("222")
+	sinceBuild.set("232")
 }
 
 tasks.buildSearchableOptions {
@@ -29,8 +33,7 @@ tasks.buildSearchableOptions {
 }
 
 tasks.withType<KotlinCompile> {
-	kotlinOptions.jvmTarget = "11"
 	kotlinOptions.freeCompilerArgs = listOf(
-		"-Xjvm-default=enable"
+		"-Xjvm-default=all"
 	)
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ChangesBrowserProjectNode.kt

@@ -8,6 +8,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNodeRenderer
 import com.jetbrains.rider.model.RdCustomLocation
 import com.jetbrains.rider.model.RdProjectModelItemDescriptor
 import java.io.File
+import java.io.Serial
 
 class ChangesBrowserProjectNode(private val descriptor: RdProjectModelItemDescriptor) : ChangesBrowserNode<RdProjectModelItemDescriptor>(descriptor) {
 	private val type = getType(descriptor)
@@ -30,6 +31,7 @@ class ChangesBrowserProjectNode(private val descriptor: RdProjectModelItemDescri
 	}
 	
 	companion object {
+		@Serial
 		private const val serialVersionUID = 2641007635909904963L
 		
 		private fun getType(descriptor: RdProjectModelItemDescriptor): FileType? {

src/main/kotlin/com/chylex/intellij/rider/vcsgroupbyproject/ProjectChangesGroupingPolicy.kt

@@ -9,8 +9,8 @@ import com.intellij.openapi.vcs.changes.ui.ChangesGroupingPolicyFactory
 import com.intellij.openapi.vcs.changes.ui.StaticFilePath
 import com.intellij.openapi.vcs.changes.ui.TreeModelBuilder
 import com.intellij.openapi.vfs.VirtualFile
+import com.intellij.platform.backend.workspace.WorkspaceModel
 import com.intellij.vcsUtil.VcsUtil
-import com.intellij.workspaceModel.ide.WorkspaceModel
 import com.jetbrains.rider.model.RdCustomLocation
 import com.jetbrains.rider.model.RdProjectDescriptor
 import com.jetbrains.rider.model.RdProjectModelItemDescriptor
@@ -64,11 +64,10 @@ class ProjectChangesGroupingPolicy(private val project: Project, private val mod
 	}
 	
 	private companion object {
-		private val NODE_CACHE = NotNullLazyKey.create<MutableMap<RdProjectModelItemDescriptor?, ChangesBrowserNode<*>>, ChangesBrowserNode<*>>("ChangesTree.ProjectCache") {
+		private val NODE_CACHE = NotNullLazyKey.createLazyKey<MutableMap<RdProjectModelItemDescriptor?, ChangesBrowserNode<*>>, ChangesBrowserNode<*>>("ChangesTree.ProjectCache") {
 			mutableMapOf()
 		}
 		
-		@Suppress("UnstableApiUsage")
 		private fun getSingleProjectEntity(file: VirtualFile, project: Project): ProjectModelEntity? {
 			val workspaceModel = WorkspaceModel.getInstance(project)
 			val entities = walkFileParentsUntilResultIsNotEmpty(file) { workspaceModel.getProjectModelEntities(it, project) }

src/main/resources/META-INF/plugin.xml

@@ -12,6 +12,10 @@
   ]]></description>
   
   <change-notes><![CDATA[
+    <b>Version 1.0.3</b>
+    <ul>
+      <li>Updated for Rider 2023.2 EAP.</li>
+    </ul>
     <b>Version 1.0.2</b>
     <ul>
       <li>Updated for Rider 2022.2.</li>