Bump the plugin to work with 2025.1 (#58)

Author: Garethp

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
     id("java")
     alias(libs.plugins.kotlinJvm)
     id("org.jetbrains.intellij.platform") version "2.2.1"     // https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id("com.jetbrains.rdgen") version libs.versions.rdGen    // https://www.myget.org/feed/rd-snapshots/package/maven/com.jetbrains.rd/rd-gen
+//    id("com.jetbrains.rdgen") version libs.versions.rdGen    // https://www.myget.org/feed/rd-snapshots/package/maven/com.jetbrains.rd/rd-gen
     id("me.filippov.gradle.jvm.wrapper") version "0.14.0"
 }
 

gradle.properties

@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.RimworldDev
 DotnetSolution=ReSharperPlugin.RimworldDev.sln
 RiderPluginId=com.jetbrains.rider.plugins.rimworlddev
-PluginVersion=2024.1.3
+PluginVersion=2024.1.4
 
 BuildConfiguration=Release
 
@@ -14,15 +14,15 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   Nightly:  2020.3-SNAPSHOT
 #   EAP:      2020.3-EAP2-SNAPSHOT
-ProductVersion=2024.3
+ProductVersion=2025.1
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
 kotlin.stdlib.default.dependency=false
 org.gradle.jvmargs=-Xmx4g
 
-rdVersion=2024.1.1
+rdVersion=2025.1
 rdKotlinVersion=2.1.0
 intellijPlatformGradlePluginVersion=2.2.1
 gradleJvmWrapperVersion=0.14.0
-riderBaseVersion=2024.3
+riderBaseVersion=2025.1

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-kotlin = "1.9.24" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
-rdGen = "2024.1.1" # https://github.com/JetBrains/rd/releases
+kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+rdGen = "2025.1.1" # https://github.com/JetBrains/rd/releases
 
 [libraries]
 kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }

src/dotnet/Plugin.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <SdkVersion>2024.3.0</SdkVersion>
+    <SdkVersion>2025.1.0</SdkVersion>
 
     <Title>Rimworld Development Environment</Title>
     <Description>Bring the intelligence of your IDE to Rimworld XML files. Use information backed by Rimworlds DLL file to autocomplete your XML, Ctrl+Click into the C# that your XML gets translated into and see what options you have when adding items in your mods!</Description>

src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2024.3.0" PrivateAssets="all">
+    <PackageReference Include="JetBrains.ReSharper.SDK" Version="2025.1.0" PrivateAssets="all">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />

src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.Rider.csproj

@@ -22,9 +22,9 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
-    <PackageReference Include="JetBrains.Lifetimes" Version="2024.3.1" />
-    <PackageReference Include="JetBrains.RdFramework" Version="2024.3.1" />
-    <PackageReference Include="JetBrains.Rider.SDK" Version="2024.3.0">
+    <PackageReference Include="JetBrains.Lifetimes" Version="2025.1.0" />
+    <PackageReference Include="JetBrains.RdFramework" Version="2025.1.0" />
+    <PackageReference Include="JetBrains.Rider.SDK" Version="2025.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/rider/main/kotlin/run/RunConfiguration.kt

@@ -15,11 +15,30 @@ import com.jetbrains.rd.platform.util.lifetime
 import com.jetbrains.rider.debugger.IRiderDebuggable
 import com.jetbrains.rider.plugins.unity.run.configurations.UnityAttachToPlayerFactory
 import com.jetbrains.rider.plugins.unity.run.configurations.UnityPlayerDebugConfigurationOptions
-import com.jetbrains.rider.plugins.unity.run.configurations.UnityPlayerDebugConfigurationType
 import com.jetbrains.rider.run.configurations.AsyncRunConfiguration
 import com.jetbrains.rider.run.getProcess
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import org.jetbrains.concurrency.Promise
+import com.jetbrains.rider.plugins.unity.UnityBundle
+import icons.UnityIcons
+
+
+internal class UnityPlayerDebugConfigurationTypeInternal : ConfigurationTypeBase(
+    ID,
+    UnityBundle.message("configuration.type.name.attach.to.unity.player"),
+    UnityBundle.message("configuration.type.description.attach.to.unity.player.and.debug"),
+    UnityIcons.RunConfigurations.AttachToPlayer
+), VirtualConfigurationType {
+    val attachToPlayerFactory = UnityAttachToPlayerFactory(this)
+
+    init {
+        addFactory(attachToPlayerFactory)
+    }
+
+    companion object {
+        const val ID = "UnityPlayer"
+    }
+}
 
 
 class RunConfiguration(project: Project, factory: ConfigurationFactory, name: String) :
@@ -60,7 +79,7 @@ class RunConfiguration(project: Project, factory: ConfigurationFactory, name: St
     @Deprecated("Please, override 'getRunProfileStateAsync' instead")
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun getStateAsync(executor: Executor, environment: ExecutionEnvironment): Promise<RunProfileState> {
-        val attachToDebugFactory = UnityAttachToPlayerFactory(UnityPlayerDebugConfigurationType())
+        val attachToDebugFactory = UnityAttachToPlayerFactory(UnityPlayerDebugConfigurationTypeInternal())
         val attachToDebug = attachToDebugFactory.createTemplateConfiguration(project)
         attachToDebug.name = "Custom Player"
 

src/rider/main/kotlin/run/SettingsEditor.kt

@@ -21,24 +21,18 @@ class SettingsEditor(project: Project) : SettingsEditor<RunConfiguration>() {
 
     init {
         exePath.addBrowseFolderListener(
-            "Executable Path",
-            "",
             null,
-            FileChooserDescriptorFactory.createSingleFileDescriptor()
+            FileChooserDescriptorFactory.singleFile().withTitle("Executable Path").withDescription("")
         )
 
         modListPath.addBrowseFolderListener(
-            "Modlist Path",
-            "",
             project,
-            FileChooserDescriptorFactory.createSingleFileDescriptor()
+            FileChooserDescriptorFactory.singleFile().withTitle("Modlist Path").withDescription("")
         )
 
         saveFilePath.addBrowseFolderListener(
-            "Save File Path",
-            "",
             project,
-            FileChooserDescriptorFactory.createSingleFileDescriptor()
+            FileChooserDescriptorFactory.singleFile().withTitle("Save File Path").withDescription("")
         )
 
         myPanel = FormBuilder

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

@@ -1,9 +1,9 @@
 <idea-plugin require-restart="true">
   <id>com.jetbrains.rider.plugins.rimworlddev</id>
   <name>Rimworld Development Environment</name>
-  <version>2024.1.2</version>
+  <version>2024.1.4</version>
   <vendor url="https://github.com/Garethp/Rider-RimworldDevelopment">Garethp</vendor>
-  <idea-version since-build="243" />
+  <idea-version since-build="251" />
   <depends>com.intellij.modules.rider</depends>
   <depends>com.intellij.resharper.unity</depends>