Upgrade SDK to 2023.2.0 (#89)

* Upgrade SDK to 2023.2.0-eap02

* Update SDK

* Upgrade gradle version

* Add plugin bundle #95

* Fix option class name

* Upgrade SDK to 2023.2.0

Author: olsh

.nuke/build.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "Build Schema",
   "$ref": "#/definitions/build",
+  "title": "Build Schema",
   "definitions": {
     "build": {
       "type": "object",
@@ -117,4 +117,4 @@
       }
     }
   }
-}
+}

Directory.Build.props

@@ -2,7 +2,7 @@
 
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkVersion>2023.1.0</SdkVersion>
+    <SdkVersion>2023.2.0</SdkVersion>
   </PropertyGroup>
   <!-- https://jetbrains.slack.com/archives/CBZ36NH7C/p1628090127002200 -->
   <PropertyGroup>

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'org.jetbrains.kotlin.jvm' version '1.8.10'
-    id 'org.jetbrains.intellij' version '1.13.1'
+    id 'org.jetbrains.intellij' version '1.15.0'
 }
 
 buildDir = 'gradle-build'
@@ -49,7 +49,7 @@ prepareSandbox {
 }
 
 wrapper {
-    gradleVersion = '7.4.2'
+    gradleVersion = '8.2.1'
     distributionType = Wrapper.DistributionType.ALL
     distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }

build/Build.cs

@@ -38,7 +38,7 @@ protected override void OnBuildInitialized()
         WaveMajorVersion = int.Parse(sdkMatch.Groups[1]
             .Value + sdkMatch.Groups[2]
             .Value);
-        WaveVersionsRange = $"[{WaveMajorVersion}.0, {WaveMajorVersion + 1}.0)";
+        WaveVersionsRange = $"{WaveMajorVersion}.0";
 
         base.OnBuildInitialized();
     }
@@ -51,7 +51,7 @@ protected override void OnBuildInitialized()
 
     [Solution] readonly Solution Solution;
 
-    [LocalExecutable("./gradlew.bat")] readonly Tool Gradle;
+    [LocalPath("./gradlew.bat")] readonly Tool Gradle;
 
     string NuGetPackageFileName => $"{Project.Name}.{ExtensionVersion}.nupkg";
 
@@ -139,7 +139,7 @@ protected override void OnBuildInitialized()
                 productVersion += $"{SdkVersionSuffix.Replace("0", string.Empty).ToUpper()}-SNAPSHOT";
             }
 
-            Gradle($"buildPlugin -PPluginVersion={ExtensionVersion} -PProductVersion={productVersion} -PDotNetOutputDirectory={OutputDirectory} -PDotNetProjectName={Project.Name}", customLogger:
+            Gradle($"buildPlugin -PPluginVersion={ExtensionVersion} -PProductVersion={productVersion} -PDotNetOutputDirectory={OutputDirectory} -PDotNetProjectName={Project.Name}", logger:
                 (_, s) =>
                 {
                     // Gradle writes warnings to stderr

build/_build.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.3.0" />
+    <PackageReference Include="Nuke.Common" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.2.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/rider/main/kotlin/com/jetbrains/rider/settings/StructuredLoggingBundle.kt

@@ -0,0 +1,22 @@
+package com.jetbrains.rider.settings
+
+import com.intellij.DynamicBundle
+import org.jetbrains.annotations.Nls
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.annotations.PropertyKey
+
+class StructuredLoggingBundle : DynamicBundle(BUNDLE) {
+    companion object {
+        @NonNls
+        private const val BUNDLE = "messages.StructuredLoggingBundle"
+        private val INSTANCE: StructuredLoggingBundle = StructuredLoggingBundle()
+
+        @Nls
+        fun message(
+            @PropertyKey(resourceBundle = BUNDLE) key: String,
+            vararg params: Any
+        ): String {
+            return INSTANCE.getMessage(key, *params)
+        }
+    }
+}

src/rider/main/kotlin/com/jetbrains/rider/settings/StructuredLoggingPluginOptionsPage.kt

@@ -1,8 +1,12 @@
 package com.jetbrains.rider.settings
 
 import com.jetbrains.rider.settings.simple.SimpleOptionsPage
+import com.jetbrains.rider.settings.StructuredLoggingBundle
 
-class StructuredLoggingPluginOptionsPage : SimpleOptionsPage("Structured Logging", "StructuredLogging") {
+class StructuredLoggingPluginOptionsPage : SimpleOptionsPage(
+    name = StructuredLoggingBundle.message("configurable.name.structuredlogging.title"),
+    pageId = "StructuredLogging")
+{
     override fun getId(): String {
         return "StructuredLogging"
     }

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

@@ -14,8 +14,14 @@
   <version></version>
   <vendor url="https://github.com/olsh/resharper-structured-logging">Oleg Shevchenko</vendor>
   <idea-version since-build="" until-build=""/>
+  <resource-bundle>messages.StructuredLoggingBundle</resource-bundle>
   <extensions defaultExtensionNs="com.intellij" >
-    <applicationConfigurable groupId="language" instance="com.jetbrains.rider.settings.StructuredLoggingPluginOptionsPage" id="StructuredLogging" />
+    <applicationConfigurable 
+      groupId="language" 
+      instance="com.jetbrains.rider.settings.StructuredLoggingPluginOptionsPage" 
+      id="StructuredLogging"
+      bundle="messages.StructuredLoggingBundle"
+      key="configurable.name.structuredlogging.title" />
   </extensions>
   <depends>com.intellij.modules.rider</depends>
 </idea-plugin>

src/rider/main/resources/messages/StructuredLoggingBundle.properties

@@ -0,0 +1 @@
+configurable.name.structuredlogging.title=Structured Logging