From 0a90d2e8c9164cd84d3e6d1f1d2b80ae815d422d Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Thu, 25 Jul 2024 10:09:26 +0300
Subject: [PATCH] Kotlin 2.0.20-Beta2

---
 benchmarks/build.gradle.kts                                | 7 ++++---
 gradle.properties                                          | 2 +-
 .../kotlin/space/kscience/kmath/internal/base64/base64.kt  | 1 -
 .../space/kscience/kmath/functions/testUtils/Rational.kt   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 24471a9e4..f0ff7c044 100644
--- a/benchmarks/build.gradle.kts
+++ b/benchmarks/build.gradle.kts
@@ -1,5 +1,6 @@
 @file:Suppress("UNUSED_VARIABLE")
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 import space.kscience.kmath.benchmarks.addBenchmarkProperties
 
@@ -161,9 +162,9 @@ kotlin.sourceSets.all {
 }
 
 tasks.withType<KotlinJvmCompile> {
-    kotlinOptions {
-        jvmTarget = "11"
-        freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" + "-Xlambdas=indy"
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_11)
+        freeCompilerArgs.addAll("-Xjvm-default=all", "-Xlambdas=indy")
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 4f87d4bc9..ab7e6c8d4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,6 @@ org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx4096m
 org.gradle.parallel=true
 org.gradle.workers.max=4
-toolsVersion=0.15.4-kotlin-2.0.20-Beta1
+toolsVersion=0.15.5-kotlin-2.0.20-Beta2
 #kotlin.experimental.tryK2=true
 #kscience.wasm.disabled=true
\ No newline at end of file
diff --git a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
index cb4da44fe..fef3da1b1 100644
--- a/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
+++ b/kmath-ast/src/jsMain/kotlin/space/kscience/kmath/internal/base64/base64.kt
@@ -8,7 +8,6 @@
     "OVERRIDING_FINAL_MEMBER",
     "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
     "CONFLICTING_OVERLOADS",
-    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING",
     "ObjectPropertyName",
     "ClassName",
 )
diff --git a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
index 0160b2c97..df7dfec79 100644
--- a/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
+++ b/kmath-functions/src/commonTest/kotlin/space/kscience/kmath/functions/testUtils/Rational.kt
@@ -159,7 +159,7 @@ class Rational {
     override fun equals(other: Any?): Boolean =
         when (other) {
             is Rational -> numerator == other.numerator && denominator == other.denominator
-            is Int -> numerator == other && denominator == 1L
+            is Int -> numerator == other.toLong() && denominator == 1L
             is Long -> numerator == other && denominator == 1L
             else -> false
         }