Upgrade SDK to 2023.2.0 (#47)

olsh · Aug 4, 2023 · 2b769cc · 2b769cc
1 parent 8be9481
commit 2b769cc
Show file tree

Hide file tree

Showing 12 changed files with 207 additions and 149 deletions.
diff --git a/.nuke/build.schema.json b/.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 @@
       }
     }
   }
-}
+}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>

diff --git a/build.gradle b/build.gradle
@@ -1,16 +1,13 @@
 plugins {
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.7.10'
-    id 'org.jetbrains.intellij' version '1.13.0'
+    id 'org.jetbrains.kotlin.jvm' version '1.8.10'
+    id 'org.jetbrains.intellij' version '1.15.0'
 }
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
 buildDir = 'gradle-build'
 version = ext.PluginVersion
 
 compileKotlin {
-    kotlinOptions { jvmTarget = "1.8" }
+    kotlinOptions { jvmTarget = "17" }
 }
 
 intellij {
@@ -52,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"
 }
diff --git a/build/Build.cs b/build/Build.cs
@@ -79,7 +79,7 @@ protected override void OnBuildInitialized()
 
     int WaveMajorVersion { get; set; }
 
-    [LocalExecutable("./gradlew.bat")] readonly Tool Gradle;
+    [LocalPath("./gradlew.bat")] readonly Tool Gradle;
 
     Target UpdateBuildVersion => _ => _
         .Requires(() => AppVeyor)
@@ -133,7 +133,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

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="6.3.0" />
+    <PackageReference Include="Nuke.Common" Version="7.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageDownload Include="dotnet-sonarscanner" Version="[5.9.2]" />
-    <PackageDownload Include="NuGet.CommandLine" Version="[6.3.1]" />
+    <PackageDownload Include="dotnet-sonarscanner" Version="[5.13.0]" />
+    <PackageDownload Include="NuGet.CommandLine" Version="[6.5.0]" />
   </ItemGroup>
 
 </Project>
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 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
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists