From 51bb46a45caec3fe20d4469d47f092d6439391d5 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Fri, 5 Apr 2024 22:28:04 +0300
Subject: [PATCH] 2.0.0-beta5

---
 gradle.properties                                         | 2 +-
 gradle/wrapper/gradle-wrapper.properties                  | 2 +-
 .../space/kscience/visionforge/solid/transform/UnRef.kt   | 2 +-
 .../src/jsMain/kotlin/tabulator/Tabulator.kt              | 7 +------
 .../kotlin/space/kscience/visionforge/solid/three/csg.kt  | 8 --------
 .../kotlin/three/external/controls/TrackballControls.kt   | 8 --------
 .../src/jsMain/kotlin/three/geometries/ExtrudeGeometry.kt | 7 -------
 7 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b0efb732..d4b08331 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,6 @@ org.gradle.jvmargs=-Xmx4G
 
 org.jetbrains.compose.experimental.jscanvas.enabled=true
 
-toolsVersion=0.15.2-kotlin-2.0.0-Beta3
+toolsVersion=0.15.2-kotlin-2.0.0-Beta5
 #kotlin.experimental.tryK2=true
 #kscience.wasm.disabled=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a5952066..17655d0e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
index 72fa1a76..9371acad 100644
--- a/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
+++ b/visionforge-solid/src/commonMain/kotlin/space/kscience/visionforge/solid/transform/UnRef.kt
@@ -26,7 +26,7 @@ internal object UnRef : VisualTreeTransform<SolidGroup>() {
     }
 
     private fun SolidGroup.unref(name: Name) {
-        (this as? SolidGroup)?.prototypes{
+        prototypes{
             setChild(name, null)
         }
         items.filter { (it.value as? SolidReference)?.prototypeName == name }.forEach { (key, value) ->
diff --git a/visionforge-tables/src/jsMain/kotlin/tabulator/Tabulator.kt b/visionforge-tables/src/jsMain/kotlin/tabulator/Tabulator.kt
index 8908ee89..9bf3b1f1 100644
--- a/visionforge-tables/src/jsMain/kotlin/tabulator/Tabulator.kt
+++ b/visionforge-tables/src/jsMain/kotlin/tabulator/Tabulator.kt
@@ -1,10 +1,5 @@
-@file:Suppress("INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING")
-
 @file:JsModule("tabulator-tables")
+@file:Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE_WARNING")
 @file:JsNonModule
 
 package tabulator
diff --git a/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/csg.kt b/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/csg.kt
index 0d7f774d..ba4cd216 100644
--- a/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/csg.kt
+++ b/visionforge-threejs/src/jsMain/kotlin/space/kscience/visionforge/solid/three/csg.kt
@@ -1,11 +1,3 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION"
-)
-
 @file:JsModule("three-csg-ts")
 @file:JsNonModule
 
diff --git a/visionforge-threejs/src/jsMain/kotlin/three/external/controls/TrackballControls.kt b/visionforge-threejs/src/jsMain/kotlin/three/external/controls/TrackballControls.kt
index 64998dc2..3a1ed13a 100644
--- a/visionforge-threejs/src/jsMain/kotlin/three/external/controls/TrackballControls.kt
+++ b/visionforge-threejs/src/jsMain/kotlin/three/external/controls/TrackballControls.kt
@@ -1,11 +1,3 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION",
-    "NESTED_CLASS_IN_EXTERNAL_INTERFACE"
-)
 @file:JsModule("three/examples/jsm/controls/TrackballControls.js")
 @file:JsNonModule
 
diff --git a/visionforge-threejs/src/jsMain/kotlin/three/geometries/ExtrudeGeometry.kt b/visionforge-threejs/src/jsMain/kotlin/three/geometries/ExtrudeGeometry.kt
index 5c256878..28aef766 100644
--- a/visionforge-threejs/src/jsMain/kotlin/three/geometries/ExtrudeGeometry.kt
+++ b/visionforge-threejs/src/jsMain/kotlin/three/geometries/ExtrudeGeometry.kt
@@ -1,10 +1,3 @@
-@file:Suppress(
-    "INTERFACE_WITH_SUPERCLASS",
-    "OVERRIDING_FINAL_MEMBER",
-    "RETURN_TYPE_MISMATCH_ON_OVERRIDE",
-    "CONFLICTING_OVERLOADS",
-    "EXTERNAL_DELEGATION"
-)
 @file:JsModule("three")
 @file:JsNonModule