Kotlin 1.9.10, Gradle 8.3 (#40)

illarionov · Sep 2, 2023 · 146d122 · 146d122
1 parent 6cccc1f
commit 146d122
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 24 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -12,7 +12,7 @@ junit-platform-launcher = "1.10.0"
 gradle-maven-publish-plugin = "0.25.3"
 kermit = "1.2.2"
 kotest = "5.6.2"
-kotlin = "1.9.0"
+kotlin = "1.9.10"
 kotlinx-binary-compatibility-validator = "0.13.2"
 kotlinx-coroutines = "1.7.3"
 kotlinx-serialization = "1.6.0"

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -16,8 +16,10 @@
          <trust group="^androidx($|([.].*))" regex="true" reason="not signed yet"/>
          <trust group="^com[.]android($|([.].*))" regex="true" reason="not signed yet"/>
          <trust group="com.google.testing.platform" regex="true" reason="not signed"/>
+         <trust group="" name="^kotlin-native-prebuilt-.+" regex="true" reason="not signed"/>
       </trusted-artifacts>
       <trusted-keys>
+         <trusted-key id="015479e1055341431b4545ab72475fd306b9cab7" group="com.googlecode.javaewah" name="JavaEWAH"/>
          <trusted-key id="04543577d6a9cc626239c50c7ecbd740ff06aeb5">
             <trusting group="org.glassfish.jaxb"/>
             <trusting group="^com[.]sun($|([.].*))" regex="true"/>
@@ -26,7 +28,6 @@
             <trusting group="org.apache.httpcomponents"/>
             <trusting group="^org[.]apache[.]httpcomponents($|([.].*))" regex="true"/>
          </trusted-key>
-         <trusted-key id="015479e1055341431b4545ab72475fd306b9cab7" group="com.googlecode.javaewah" name = "JavaEWAH"/>
          <trusted-key id="08f0aab4d0c1a4bdde340765b341ddb020fcb6ab" group="org.bouncycastle"/>
          <trusted-key id="0d35d3f60078655126908e8af3d1600878e85a3d" group="io.netty"/>
          <trusted-key id="120d6f34e627ed3a772ebbfe55c7e5e701832382" group="org.snakeyaml" name="snakeyaml-engine"/>
@@ -83,26 +84,6 @@
       </trusted-keys>
    </configuration>
    <components>
-      <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.8.22">
-         <artifact name="kotlin-native-prebuilt-linux-x86_64-1.8.22.tar.gz">
-            <sha256 value="43106db0ad8fb292facae924c97591529de15b69a0426d0474ac3811820a05b5" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="" name="kotlin-native-prebuilt-linux-x86_64" version="1.9.0">
-         <artifact name="kotlin-native-prebuilt-linux-x86_64-1.9.0.tar.gz">
-            <sha256 value="31737a9739fc37208e1f532b7472c3fbbf0d753f3621c9dfc1d72a69d5bc35c0" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.8.22">
-         <artifact name="kotlin-native-prebuilt-macos-x86_64-1.8.22.tar.gz">
-            <sha256 value="5d924f4278028352cb2bdbaa4b3fab967ab81c3fbea845bdb91cd583af5c9bcc" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
-      <component group="" name="kotlin-native-prebuilt-macos-x86_64" version="1.9.0">
-         <artifact name="kotlin-native-prebuilt-macos-x86_64-1.9.0.tar.gz">
-            <sha256 value="ab02e67bc82d986875941036e147179e2812502bd2d6a8d8b3c511a93a8dbd1d" origin="Generated by Gradle" reason="Artifact is not signed"/>
-         </artifact>
-      </component>
       <component group="com.beust" name="jcommander" version="1.82">
          <artifact name="jcommander-1.82.jar">
             <pgp value="c70b844f002f21f6d2b9c87522e44ac0622b91c3"/>

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.3-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum