Merge pull request #469 from baaahs/kotlin-1.7.0

Bump to Kotlin 1.7.10.

Author: merge-when-green[bot]

build.gradle.kts

@@ -55,14 +55,17 @@ repositories {
 group = "org.baaahs"
 version = "0.0.1"
 
+fun kotlinw(target: String): String =
+    "org.jetbrains.kotlin-wrappers:kotlin-$target"
+
 kotlin {
     jvm()
     js {
         browser {
             useCommonJs()
 
             webpackTask {
-                report = true
+//                report = true // Broken in Kotlin 1.7? Cannot find module 'webpack-bundle-analyzer'.
                 sourceMaps = true
             }
 
@@ -165,13 +168,13 @@ kotlin {
                 implementation("com.danielgergely.kgl:kgl-js:${Versions.kgl}")
 
                 // kotlin react:
-//                implementation(enforcedPlatform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${Versions.kotlinWrappers}"))
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react:${Versions.kotlinReact}")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-react-dom:${Versions.kotlinReact}")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-styled:${Versions.kotlinStyled}")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-mui:${Versions.kotlinMui}")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-mui-icons:${Versions.kotlinMuiIcons}")
-                implementation("org.jetbrains.kotlin-wrappers:kotlin-emotion:${Versions.kotlinEmotion}")
+                implementation(project.dependencies.enforcedPlatform(kotlinw("wrappers-bom:${Versions.kotlinWrappers}")))
+                implementation(kotlinw("react"))
+                implementation(kotlinw("react-dom"))
+                implementation(kotlinw("styled"))
+                implementation(kotlinw("mui"))
+                implementation(kotlinw("mui-icons"))
+                implementation(kotlinw("emotion"))
 
                 implementation(npm("camera-controls", "^1.35.0"))
 

buildSrc/src/main/kotlin/Versions.kt

@@ -1,8 +1,8 @@
 object Versions {
-    const val kotlin = "1.6.21"
-    const val kotlinGradlePlugin = "1.6.21"
-    const val coroutines = "1.6.1"
-    const val serializationRuntime = "1.3.2"
+    const val kotlin = "1.7.10"
+    const val kotlinGradlePlugin = "1.7.10"
+    const val coroutines = "1.6.3"
+    const val serializationRuntime = "1.3.3"
     const val koin = "3.1.3"
     const val dokka = "1.6.10"
 
@@ -16,12 +16,7 @@ object Versions {
 
     // JS:
     const val kotlinxHtml = "0.7.5"
-    const val wrappersBuild = "pre.336"
-    const val kotlinReact = "18.1.0-$wrappersBuild"
-    const val kotlinStyled = "5.3.5-$wrappersBuild"
-    const val kotlinMui = "5.7.0-$wrappersBuild"
-    const val kotlinMuiIcons = "5.6.2-$wrappersBuild"
-    const val kotlinEmotion = "11.9.0-$wrappersBuild"
+    const val kotlinWrappers = "1.0.0-pre.390"
 
     // Test:
     const val junit = "5.8.1"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kotlin-js-store/yarn.lock

@@ -33,6 +33,7 @@ interface ShowPlayer {
 
 abstract class BaseShowPlayer(
     final override val toolchain: Toolchain,
+    @Deprecated("Get it some other way", level = DeprecationLevel.WARNING)
     final override val sceneProvider: SceneProvider
 ) : ShowPlayer {
     private val feeds = mutableMapOf<DataSource, Feed>()

src/commonMain/kotlin/baaahs/ShowPlayer.kt

@@ -177,7 +177,7 @@ object IsfShaderDialectSpec : Spek({
                 it("fails to validate") {
                     expect(shaderAnalysis.isValid).toBe(false)
                     expect(shaderAnalysis.errors).containsExactly(
-                        GlslError("Unexpected JSON token at offset 2: Expected quotation mark '\"', but had '\"' instead\n" +
+                        GlslError("Unexpected JSON token at offset 2: Expected quotation mark '\"', but had '\"' instead at path: \$\n" +
                                 "JSON input: { \"DESC }", 1)
                     )
                 }

src/commonTest/kotlin/baaahs/gl/shader/dialect/IsfShaderDialectSpec.kt

@@ -17,6 +17,7 @@ import baaahs.show.live.OpenShow
 import baaahs.show.live.ShowOpener
 
 class FakeShowPlayer(
+    @Deprecated("Get it some other way", level = DeprecationLevel.WARNING)
     override val sceneProvider: SceneProvider = SceneMonitor(ModelInfo.EmptyScene),
     override val toolchain: Toolchain = testToolchain
 ) : ShowPlayer {

src/commonTest/kotlin/baaahs/shows/FakeShowPlayer.kt

@@ -24,7 +24,7 @@ val ShaderDiagnostics = xComponent<ShaderDiagnosticsProps>("ShaderDiagnostics")
     Popover {
         attrs.classes = jso { this.paper = -ShaderPreviewStyles.errorPopup }
         attrs.open = props.anchor != null
-        props.anchor?.let { anchor -> attrs.anchorEl = { anchor } }
+        props.anchor?.let { anchor -> attrs.anchorEl = anchor }
         attrs.onClose = { event, _ ->
             props.onClose()
             event.stopPropagation()

src/jsMain/kotlin/baaahs/app/ui/ShaderDiagnostics.kt

@@ -10,10 +10,10 @@ import baaahs.ui.xComponent
 import external.DraggableProvided
 import external.copyFrom
 import kotlinx.html.js.onClickFunction
+import kotlinx.html.org.w3c.dom.events.Event
 import kotlinx.js.jso
 import materialui.icon
 import mui.material.Card
-import org.w3c.dom.events.Event
 import react.Props
 import react.RBuilder
 import react.RHandler

src/jsMain/kotlin/baaahs/app/ui/controls/ControlWrapperView.kt

@@ -17,11 +17,11 @@ import external.copyFrom
 import external.draggable
 import external.droppable
 import kotlinx.html.js.onClickFunction
+import kotlinx.html.org.w3c.dom.events.Event
 import kotlinx.js.jso
 import materialui.icon
 import mui.material.*
 import org.w3c.dom.HTMLElement
-import org.w3c.dom.events.Event
 import react.*
 import react.dom.div
 import react.dom.events.MouseEvent

src/jsMain/kotlin/baaahs/app/ui/controls/LegacyButtonGroupControlView.kt

@@ -12,13 +12,13 @@ import baaahs.ui.withMouseEvent
 import baaahs.ui.xComponent
 import baaahs.util.useResizeListener
 import kotlinx.html.js.onClickFunction
+import kotlinx.html.org.w3c.dom.events.Event
 import kotlinx.js.jso
 import materialui.icon
 import mui.icons.material.Settings
 import mui.material.*
 import org.w3c.dom.Element
 import org.w3c.dom.HTMLDivElement
-import org.w3c.dom.events.Event
 import react.Props
 import react.RBuilder
 import react.RHandler

src/jsMain/kotlin/baaahs/app/ui/controls/VisualizerControlView.kt

@@ -26,7 +26,7 @@ object DialogStyles : StyleSheet("app-ui-dialog-Dialog", isStatic = true) {
     }
 
     val tabsListCol by css {
-        flex(1.0, flexBasis = FlexBasis.zero)
+        flex(1.0, 1.0, FlexBasis.zero)
     }
     val tabsList by css {
         important(::paddingLeft, 1.em)
@@ -42,7 +42,7 @@ object DialogStyles : StyleSheet("app-ui-dialog-Dialog", isStatic = true) {
     }
 
     val panelCol by css {
-        flex(4.0, flexBasis = FlexBasis.zero)
+        flex(4.0, 1.0, FlexBasis.zero)
         display = Display.flex
         flexDirection = FlexDirection.column
         marginLeft = 2.em

src/jsMain/kotlin/baaahs/app/ui/dialog/DialogStyles.kt

@@ -6,12 +6,12 @@ import baaahs.app.ui.dialog.dialogPanels
 import baaahs.ui.*
 import external.ErrorBoundary
 import kotlinx.html.js.onSubmitFunction
+import kotlinx.html.org.w3c.dom.events.Event
 import kotlinx.js.jso
 import mui.base.Portal
 import mui.icons.material.Redo
 import mui.icons.material.Undo
 import mui.material.*
-import org.w3c.dom.events.Event
 import react.*
 import react.dom.div
 import react.dom.form

src/jsMain/kotlin/baaahs/app/ui/editor/EditableManagerUiView.kt

@@ -18,7 +18,7 @@ import kotlinx.js.jso
 import materialui.icon
 import mui.material.*
 import org.w3c.dom.Element
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.*
 import react.dom.div
 

src/jsMain/kotlin/baaahs/app/ui/editor/PatchEditorView.kt

@@ -18,7 +18,7 @@ import mui.icons.material.AddCircleOutline
 import mui.icons.material.CloudDownload
 import mui.material.*
 import org.w3c.dom.Element
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.Props
 import react.RBuilder
 import react.RHandler

src/jsMain/kotlin/baaahs/app/ui/editor/PatchesOverviewView.kt

@@ -19,7 +19,7 @@ import mui.material.ListItemText
 import mui.material.Menu
 import mui.material.MenuItem
 import org.w3c.dom.Element
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.Props
 import react.RBuilder
 import react.RHandler

src/jsMain/kotlin/baaahs/app/ui/editor/ShaderEditorView.kt

@@ -19,7 +19,7 @@ import kotlinx.js.jso
 import materialui.icon
 import mui.icons.material.Search
 import mui.material.*
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.*
 import react.dom.div
 import react.dom.events.FocusEvent

src/jsMain/kotlin/baaahs/app/ui/editor/ShaderLibraryDialogView.kt

@@ -13,7 +13,7 @@ import materialui.icon
 import mui.material.*
 import mui.system.sx
 import org.w3c.dom.HTMLDivElement
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.*
 import react.dom.b
 import react.dom.br

src/jsMain/kotlin/baaahs/app/ui/editor/ShaderPropertiesEditorView.kt

@@ -15,7 +15,7 @@ import kotlinx.js.jso
 import mui.material.Button
 import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.HTMLElement
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.Props
 import react.RBuilder
 import react.RHandler

src/jsMain/kotlin/baaahs/app/ui/gadgets/color/ColorWheelView.kt

@@ -11,7 +11,7 @@ import baaahs.ui.unaryPlus
 import baaahs.ui.xComponent
 import kotlinx.html.js.onClickFunction
 import materialui.icon
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.*
 import react.dom.div
 import react.dom.events.MouseEvent

src/jsMain/kotlin/baaahs/app/ui/layout/GridItemView.kt

@@ -7,7 +7,7 @@ import styled.StyleSheet
 
 object SettingsStyles : StyleSheet("app-ui-Settings", isStatic = true) {
     val tabsListCol by css {
-        flex(1.0, flexBasis = FlexBasis.zero)
+        flex(1.0, 1.0, FlexBasis.zero)
     }
     val tabsList by css {
         important(::paddingLeft, 1.em)

src/jsMain/kotlin/baaahs/app/ui/settings/SettingsStyles.kt

@@ -4,9 +4,10 @@ import baaahs.visualizer.Visualizer
 import org.w3c.dom.HTMLDivElement
 import react.RBuilder
 import react.RComponent
+import react.State
 import react.dom.div
 
-class MonitorPage(props: Props) : RComponent<MonitorPage.Props, MonitorPage.State>(props) {
+class MonitorPage(props: MonitorPageProps) : RComponent<MonitorPageProps, State>(props) {
     private val container = react.createRef<HTMLDivElement>()
 
     override fun componentDidMount() {
@@ -21,11 +22,9 @@ class MonitorPage(props: Props) : RComponent<MonitorPage.Props, MonitorPage.Stat
     override fun RBuilder.render() {
         div { ref = container }
     }
+}
 
-    class Props(
-        var containerDiv: HTMLDivElement,
-        var visualizer: Visualizer
-    ) : react.Props
-
-    class State : react.State
-}
+external interface MonitorPageProps : react.Props {
+    var containerDiv: HTMLDivElement
+    var visualizer: Visualizer
+}

src/jsMain/kotlin/baaahs/monitor/MonitorPage.kt

@@ -2,7 +2,7 @@ package baaahs.ui
 
 import baaahs.util.Logger
 import baaahs.window
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import react.ComponentType
 import react.MutableRefObject
 import react.Props

src/jsMain/kotlin/baaahs/ui/XBuilder.kt

@@ -18,7 +18,7 @@ import org.w3c.dom.Element
 import org.w3c.dom.HTMLCanvasElement
 import org.w3c.dom.HTMLElement
 import org.w3c.dom.HTMLInputElement
-import org.w3c.dom.events.Event
+import kotlinx.html.org.w3c.dom.events.Event
 import org.w3c.dom.events.EventTarget
 import react.*
 import react.dom.RDOMBuilder
@@ -231,7 +231,7 @@ fun renderWrapper(block: RBuilder.() -> Unit): View {
 fun buildElements(handler: Render): ReactNode =
     react.buildElements(RBuilder(), handler)
 
-val preventDefault: (Event) -> Unit = { event -> event.preventDefault() }
+val preventDefault: (org.w3c.dom.events.Event) -> Unit = { event -> event.preventDefault() }
 val disableScroll = {
     baaahs.document.body?.addEventListener("touchmove", preventDefault, js("{ passive: false }"))
 }