chore: kotlin 2.0.20-Beta2 update

sureshg · Jul 15, 2024 · 437bbca · 437bbca
1 parent 54cf49f
commit 437bbca
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 10 deletions.
diff --git a/gradle/build-logic/common-plugins/build.gradle.kts b/gradle/build-logic/common-plugins/build.gradle.kts
@@ -31,7 +31,6 @@ kotlin {
       optIn("kotlin.io.path.ExperimentalPathApi")
       optIn("kotlin.time.ExperimentalTime")
       optIn("org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi")
-      optIn("org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl")
       optIn("org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDistributionDsl")
       optIn("org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalDceDsl")
     }

diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.jvm.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/plugins/kotlin.jvm.gradle.kts
@@ -9,7 +9,7 @@ plugins {
   id("com.google.devtools.ksp")
   kotlin("jvm")
   kotlin("plugin.serialization")
-  id("kotlinx-atomicfu")
+  id("org.jetbrains.kotlinx.atomicfu")
   id("dev.zacsweers.redacted")
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlinx.kover")

diff --git a/gradle/build-logic/common-plugins/src/main/kotlin/settings/repos.settings.gradle.kts b/gradle/build-logic/common-plugins/src/main/kotlin/settings/repos.settings.gradle.kts
@@ -13,8 +13,6 @@ pluginManagement {
   resolutionStrategy {
     eachPlugin {
       when (requested.id.id) {
-        "kotlinx-atomicfu" ->
-            useModule("org.jetbrains.kotlinx:atomicfu-gradle-plugin:${requested.version}")
         "app.cash.licensee" ->
             useModule("app.cash.licensee:licensee-gradle-plugin:${requested.version}")
       }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
 java                           = "24"
-kotlin                         = "2.0.20-Beta1"
-kotlin-ksp                     = "2.0.20-Beta1-1.0.22"
+kotlin                         = "2.0.20-Beta2"
+kotlin-ksp                     = "2.0.20-Beta2-1.0.23"
 kotlin-jvmtarget               = "22"
 kotlin-dsl-jvmtarget           = "21"
 kotlin-api-version             = "1.9"
 kotlin-lang-version            = "2.0"
-gradle                         = "8.9-rc-1"
+gradle                         = "8.9"
 java-vendor                    = "GraalVM Community"
 java-jvmArguments              = "--enable-preview"
 java-addModules                = "jdk.incubator.vector"
@@ -33,7 +33,7 @@ kotlinx-benchmark              = "0.4.8"
 kotlinx-reflect-lite           = "1.1.0"
 zip-prefixer                   = "0.3.1"
 ajalt-clikt                    = "4.4.0"
-ajalt-mordant                  = "2.7.0"
+ajalt-mordant                  = "2.7.1"
 ajalt-colormath                = "3.6.0"
 dokka                          = "1.9.20"
 helidon                        = "4.0.10"

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,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################