dep v bump

mvysny · Jun 7, 2023 · 40614df · 40614df
1 parent 13fb5cd
commit 40614df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 61 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ vaadin24next_version=24.1.0
 
 # rest of the dependencies
 dynatest_version=0.24
-karibudsl11_version=2.0.0
+karibudsl11_version=2.0.1
 slf4j_version=2.0.6
 junit5_version=5.9.2
 karibu_tools_version=0.14
diff --git a/...testing-v23/kt23-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/SideNavTest.kt b/...testing-v23/kt23-tests/src/main/kotlin/com/github/mvysny/kaributesting/v10/SideNavTest.kt
@@ -2,19 +2,17 @@ package com.github.mvysny.kaributesting.v10
 
 import com.github.mvysny.dynatest.DynaNodeGroup
 import com.github.mvysny.dynatest.DynaTestDsl
-import com.github.mvysny.karibudsl.v10.VaadinDsl
-import com.github.mvysny.karibudsl.v10.init
+import com.github.mvysny.karibudsl.v23.item
+import com.github.mvysny.karibudsl.v23.route
+import com.github.mvysny.karibudsl.v23.sideNav
 import com.github.mvysny.kaributesting.v23._click
-import com.vaadin.flow.component.Component
-import com.vaadin.flow.component.HasComponents
 import com.vaadin.flow.component.UI
 import com.vaadin.flow.component.icon.VaadinIcon
 import com.vaadin.flow.component.sidenav.SideNav
 import com.vaadin.flow.component.sidenav.SideNavItem
 import org.myapp.AdminView
 import org.myapp.LoginView
 import org.myapp.routes
-import kotlin.reflect.KClass
 import kotlin.test.expect
 
 @DynaTestDsl
@@ -62,58 +60,3 @@ fun DynaNodeGroup.sideNavTests() {
         expect("SideNavItem[@path='admin', label='bar']") { SideNavItem("bar", "admin").toPrettyString() }
     }
 }
-
-@VaadinDsl
-public fun (@VaadinDsl HasComponents).sideNav(
-    label: String? = null,
-    block: (@VaadinDsl SideNav).() -> Unit = {}
-): SideNav =
-    init(SideNav(label), block)
-
-@VaadinDsl
-public fun (@VaadinDsl SideNav).route(
-    routeClass: KClass<out Component>,
-    icon: VaadinIcon? = null,
-    block: (@VaadinDsl SideNavItem).() -> Unit = {}
-): SideNavItem {
-    val item = SideNavItem(routeClass.java.simpleName, routeClass.java, icon?.create())
-    block(item)
-    addItem(item)
-    return item
-}
-
-@VaadinDsl
-public fun (@VaadinDsl SideNav).item(
-    title: String,
-    path: String? = null,
-    block: (@VaadinDsl SideNavItem).() -> Unit = {}
-): SideNavItem {
-    val item = SideNavItem(title, path)
-    block(item)
-    addItem(item)
-    return item
-}
-
-@VaadinDsl
-public fun (@VaadinDsl SideNavItem).route(
-    routeClass: KClass<out Component>,
-    icon: VaadinIcon? = null,
-    block: (@VaadinDsl SideNavItem).() -> Unit = {}
-): SideNavItem {
-    val item = SideNavItem(routeClass.java.simpleName, routeClass.java, icon?.create())
-    block(item)
-    addItem(item)
-    return item
-}
-
-@VaadinDsl
-public fun (@VaadinDsl SideNavItem).item(
-    title: String,
-    path: String? = null,
-    block: (@VaadinDsl SideNavItem).() -> Unit = {}
-): SideNavItem {
-    val item = SideNavItem(title, path)
-    block(item)
-    addItem(item)
-    return item
-}