Update Kotlin version to v1.6.10

oxiadenine · Dec 29, 2021 · 56e5550 · 56e5550
1 parent ad3db88
commit 56e5550
Show file tree

Hide file tree

Showing 82 changed files with 96 additions and 106 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 kotlin.code.style=official
 
-kotlin.version=1.5.31
+kotlin.version=1.6.10
 
-kotlin-react.version=17.0.2-pre.258
-kotlin-react-dom.version=17.0.2-pre.258
-kotlin-styled.version=5.3.1-pre.258
+kotlin-react-legacy.version=17.0.2-pre.284
+kotlin-react-dom-legacy.version=17.0.2-pre.284
+kotlin-styled.version=5.3.3-pre.284
 
-kotlin-antd.version=4.8.6-pre.15
-kotlin-moment.version=2.29.1-pre.14
-kotlin-react-intl.version=5.21.0-pre.15
-kotlin-react-responsive.version=8.2.0-pre.14
-kotlin-uikit.version=3.7.6-pre.13
+kotlin-antd.version=4.8.6-pre.16
+kotlin-moment.version=2.29.1-pre.15
+kotlin-react-intl.version=5.21.0-pre.16
+kotlin-react-responsive.version=8.2.0-pre.15
+kotlin-uikit.version=3.7.6-pre.14
diff --git a/kotlin-antd/antd-samples/src/main/kotlin/samples/Main.kt b/kotlin-antd/antd-samples/src/main/kotlin/samples/Main.kt
@@ -7,7 +7,7 @@ import react.dom.render
 fun main() {
     require("antd/dist/antd.css")
 
-    render(document.getElementById("root")) {
+    render(document.getElementById("root")!!) {
         app()
     }
 }
diff --git a/kotlin-antd/build.gradle.kts b/kotlin-antd/build.gradle.kts
@@ -6,8 +6,8 @@ plugins {
 dependencies {
     api(project(":kotlin-moment"))
 
-    api(kotlinWrapperDependency("react"))
-    api(kotlinWrapperDependency("react-dom"))
+    api(kotlinWrapperDependency("react-legacy"))
+    api(kotlinWrapperDependency("react-dom-legacy"))
 
     api(npmPackage("antd"))
 }
@@ -25,7 +25,7 @@ tasks.register("generateIconFiles") {
             import react.*
 
             external interface AntdIconClass : ComponentClass<AntdIconProps> {
-                var default: ComponentType<AntdIconProps>
+                var default: ComponentClass<AntdIconProps>
             }
 
             external interface AntdIconProps : IconBaseProps, Props {

diff --git a/kotlin-antd/src/main/kotlin/antd/alert/ErrorBoundary.kt b/kotlin-antd/src/main/kotlin/antd/alert/ErrorBoundary.kt
@@ -2,7 +2,7 @@ package antd.alert
 
 import react.*
 
-external interface ErrorBoundaryComponent : ComponentType<ErrorBoundaryProps>
+external interface ErrorBoundaryComponent : ComponentClass<ErrorBoundaryProps>
 
 external interface ErrorBoundaryProps : Props {
     var message: ReactNode?

diff --git a/kotlin-antd/src/main/kotlin/antd/anchor/AnchorLink.kt b/kotlin-antd/src/main/kotlin/antd/anchor/AnchorLink.kt
@@ -3,7 +3,7 @@ package antd.anchor
 import antd.ReactNode
 import react.*
 
-external interface AnchorLinkComponent : ComponentType<AnchorLinkProps>
+external interface AnchorLinkComponent : ComponentClass<AnchorLinkProps>
 
 external interface AnchorLinkProps : Props {
     var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/avatar/Group.kt b/kotlin-antd/src/main/kotlin/antd/avatar/Group.kt
@@ -3,7 +3,7 @@ package antd.avatar
 import antd.ReactNode
 import react.*
 
-external interface GroupComponent : ComponentType<GroupProps>
+external interface GroupComponent : ComponentClass<GroupProps>
 
 external interface GroupProps : Props {
     var className: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/badge/Ribbon.kt b/kotlin-antd/src/main/kotlin/antd/badge/Ribbon.kt
@@ -3,7 +3,7 @@ package antd.badge
 import antd.ReactNode
 import react.*
 
-external interface RibbonComponent : ComponentType<RibbonProps>
+external interface RibbonComponent : ComponentClass<RibbonProps>
 
 external interface RibbonProps : Props {
     var className: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/breadcrumb/BreadcrumbItem.kt b/kotlin-antd/src/main/kotlin/antd/breadcrumb/BreadcrumbItem.kt
@@ -5,7 +5,7 @@ import antd.ReactNode
 import antd.dropdown.DropdownProps
 import react.*
 
-external interface BreadcrumbItemComponent : ComponentType<BreadcrumbItemProps>
+external interface BreadcrumbItemComponent : ComponentClass<BreadcrumbItemProps>
 
 external interface BreadcrumbItemProps : Props {
     var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/breadcrumb/BreadcrumbSeparator.kt b/kotlin-antd/src/main/kotlin/antd/breadcrumb/BreadcrumbSeparator.kt
@@ -2,6 +2,6 @@ package antd.breadcrumb
 
 import react.*
 
-external interface BreadcrumbSeparatorComponent : ComponentType<BreadcrumbSeparatorProps>
+external interface BreadcrumbSeparatorComponent : ComponentClass<BreadcrumbSeparatorProps>
 
 external interface BreadcrumbSeparatorProps : Props
diff --git a/kotlin-antd/src/main/kotlin/antd/button/ButtonGroup.kt b/kotlin-antd/src/main/kotlin/antd/button/ButtonGroup.kt
@@ -3,7 +3,7 @@ package antd.button
 import antd.configprovider.SizeType
 import react.*
 
-external interface ButtonGroupComponent : ComponentType<ButtonGroupProps>
+external interface ButtonGroupComponent : ComponentClass<ButtonGroupProps>
 
 external interface ButtonGroupProps : Props {
     var size: SizeType?

diff --git a/kotlin-antd/src/main/kotlin/antd/card/Grid.kt b/kotlin-antd/src/main/kotlin/antd/card/Grid.kt
@@ -2,7 +2,7 @@ package antd.card
 
 import react.*
 
-external interface CardGridComponent : ComponentType<CardGridProps>
+external interface CardGridComponent : ComponentClass<CardGridProps>
 
 external interface CardGridProps : Props {
     var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/card/Meta.kt b/kotlin-antd/src/main/kotlin/antd/card/Meta.kt
@@ -3,7 +3,7 @@ package antd.card
 import antd.ReactNode
 import react.*
 
-external interface CardMetaComponent : ComponentType<CardMetaProps>
+external interface CardMetaComponent : ComponentClass<CardMetaProps>
 
 external interface CardMetaProps : Props {
     var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/checkbox/Group.kt b/kotlin-antd/src/main/kotlin/antd/checkbox/Group.kt
@@ -3,7 +3,7 @@ package antd.checkbox
 import antd.ReactNode
 import react.*
 
-external interface CheckboxGroupComponent : ComponentType<CheckboxGroupProps>
+external interface CheckboxGroupComponent : ComponentClass<CheckboxGroupProps>
 
 external interface CheckboxGroupProps : AbstractCheckboxGroupProps, Props {
     var name: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/collapse/CollapsePanel.kt b/kotlin-antd/src/main/kotlin/antd/collapse/CollapsePanel.kt
@@ -3,7 +3,7 @@ package antd.collapse
 import antd.ReactNode
 import react.*
 
-external interface CollapsePanelComponent : ComponentType<CollapsePanelProps>
+external interface CollapsePanelComponent : ComponentClass<CollapsePanelProps>
 
 external interface CollapsePanelProps : Props {
     var key: Any /* String | Number */

diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/MonthPicker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/MonthPicker.kt
@@ -3,6 +3,6 @@ package antd.datepicker
 import moment.Moment
 import react.*
 
-external interface MonthPickerComponent : ComponentType<MonthPickerProps>
+external interface MonthPickerComponent : ComponentClass<MonthPickerProps>
 
 external interface MonthPickerProps : PickerDateProps<Moment>, Props
diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/Picker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/Picker.kt
@@ -11,9 +11,9 @@ import org.w3c.dom.HTMLElement
 import org.w3c.dom.HTMLInputElement
 import react.*
 
-external interface PickerButtonComponent : ComponentType<ButtonProps>
+external interface PickerButtonComponent : ComponentClass<ButtonProps>
 
-external interface PickerTagComponent : ComponentType<TagProps>
+external interface PickerTagComponent : ComponentClass<TagProps>
 
 external interface RcPickerBaseProps<DateType> : RcPickerSharedProps<DateType>, RcPickerPanelBaseProps<DateType>
 

diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/QuarterPicker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/QuarterPicker.kt
@@ -3,6 +3,6 @@ package antd.datepicker
 import moment.Moment
 import react.*
 
-external interface QuarterPickerComponent : ComponentType<QuarterPickerProps>
+external interface QuarterPickerComponent : ComponentClass<QuarterPickerProps>
 
 external interface QuarterPickerProps : PickerTimeProps<Moment>, Props
diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/RangePicker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/RangePicker.kt
@@ -8,7 +8,7 @@ import moment.Moment
 import org.w3c.dom.*
 import react.*
 
-external interface RangePickerComponent : ComponentType<RangePickerProps>
+external interface RangePickerComponent : ComponentClass<RangePickerProps>
 
 external interface RangePickerProps : RangePickerBaseProps<Moment>, RangePickerDateProps<Moment>, RangePickerTimeProps<Moment>, Props
 

diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/TimePicker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/TimePicker.kt
@@ -3,6 +3,6 @@ package antd.datepicker
 import moment.Moment
 import react.*
 
-external interface TimePickerComponent : ComponentType<TimePickerProps>
+external interface TimePickerComponent : ComponentClass<TimePickerProps>
 
 external interface TimePickerProps : PickerTimeProps<Moment>, Props
diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/WeekPicker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/WeekPicker.kt
@@ -3,6 +3,6 @@ package antd.datepicker
 import moment.Moment
 import react.*
 
-external interface WeekPickerComponent : ComponentType<WeekPickerProps>
+external interface WeekPickerComponent : ComponentClass<WeekPickerProps>
 
 external interface WeekPickerProps : PickerDateProps<Moment>, Props
diff --git a/kotlin-antd/src/main/kotlin/antd/datepicker/YearPicker.kt b/kotlin-antd/src/main/kotlin/antd/datepicker/YearPicker.kt
@@ -3,6 +3,6 @@ package antd.datepicker
 import moment.Moment
 import react.*
 
-external interface YearPickerComponent : ComponentType<YearPickerProps>
+external interface YearPickerComponent : ComponentClass<YearPickerProps>
 
 external interface YearPickerProps : PickerDateProps<Moment>, Props
diff --git a/kotlin-antd/src/main/kotlin/antd/descriptions/Item.kt b/kotlin-antd/src/main/kotlin/antd/descriptions/Item.kt
@@ -3,7 +3,7 @@ package antd.descriptions
 import antd.ReactNode
 import react.*
 
-external interface DescriptionsItemComponent : ComponentType<DescriptionsItemProps>
+external interface DescriptionsItemComponent : ComponentClass<DescriptionsItemProps>
 
 external interface DescriptionsItemProps : Props {
     var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/dropdown/DropdownButton.kt b/kotlin-antd/src/main/kotlin/antd/dropdown/DropdownButton.kt
@@ -6,7 +6,7 @@ import antd.button.*
 import org.w3c.dom.*
 import react.*
 
-external interface DropdownButtonComponent : ComponentType<DropdownButtonProps>
+external interface DropdownButtonComponent : ComponentClass<DropdownButtonProps>
 
 external interface DropdownButtonProps : ButtonGroupProps, DropdownProps {
     var type: DropdownButtonType?

diff --git a/kotlin-antd/src/main/kotlin/antd/form/FormErrorList.kt b/kotlin-antd/src/main/kotlin/antd/form/FormErrorList.kt
@@ -3,7 +3,7 @@ package antd.form
 import antd.ReactNode
 import react.*
 
-external interface FormErrorListComponent : ComponentType<FormErrorListProps>
+external interface FormErrorListComponent : ComponentClass<FormErrorListProps>
 
 external interface FormErrorListProps : Props {
     var errors: Array<ReactNode>?

diff --git a/kotlin-antd/src/main/kotlin/antd/form/FormItem.kt b/kotlin-antd/src/main/kotlin/antd/form/FormItem.kt
@@ -3,7 +3,7 @@ package antd.form
 import kotlinext.js.Record
 import react.*
 
-external interface FormItemComponent : ComponentType<FormItemProps<Any>>
+external interface FormItemComponent : ComponentClass<FormItemProps<Any>>
 
 external interface FormItemProps<Values> : FormItemLabelProps, FormItemInputProps, RcFieldProps<Values> {
     override var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/form/FormItemInput.kt b/kotlin-antd/src/main/kotlin/antd/form/FormItemInput.kt
@@ -4,7 +4,7 @@ import antd.grid.*
 import antd.ReactNode
 import react.*
 
-external interface FormItemInputComponent : ComponentType<FormItemInputProps>
+external interface FormItemInputComponent : ComponentClass<FormItemInputProps>
 
 external interface FormItemInputProps : FormItemInputBaseProps, FormItemInputMiscProps, Props
 

diff --git a/kotlin-antd/src/main/kotlin/antd/form/FormItemLabel.kt b/kotlin-antd/src/main/kotlin/antd/form/FormItemLabel.kt
@@ -5,7 +5,7 @@ import antd.ReactNode
 import antd.tooltip.*
 import react.*
 
-external interface FormItemLabelComponent : ComponentType<FormItemLabelProps>
+external interface FormItemLabelComponent : ComponentClass<FormItemLabelProps>
 
 external interface FormItemLabelProps : FormItemLabelBaseProps, FormItemLabelMiscProps, Props
 

diff --git a/kotlin-antd/src/main/kotlin/antd/form/FormList.kt b/kotlin-antd/src/main/kotlin/antd/form/FormList.kt
@@ -3,7 +3,7 @@ package antd.form
 import antd.ReactNode
 import react.*
 
-external interface FormListComponent : ComponentType<FormListProps>
+external interface FormListComponent : ComponentClass<FormListProps>
 
 external interface FormListProps : Props {
     var prefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/icon/IconFont.kt b/kotlin-antd/src/main/kotlin/antd/icon/IconFont.kt
@@ -6,7 +6,7 @@ package antd.icon
 import react.*
 
 @JsName("createFromIconfontCN")
-external fun createFromIconfontCN(options: CustomIconOptions? = definedExternally): ComponentType<IconFontProps>
+external fun createFromIconfontCN(options: CustomIconOptions? = definedExternally): ComponentClass<IconFontProps>
 
 external interface CustomIconOptions {
     var scriptUrl: Any /* String | Array<String> */

diff --git a/kotlin-antd/src/main/kotlin/antd/icon/Icons.kt b/kotlin-antd/src/main/kotlin/antd/icon/Icons.kt
@@ -3,7 +3,7 @@ package antd.icon
 import react.*
 
 external interface AntdIconClass : ComponentClass<AntdIconProps> {
-    var default: ComponentType<AntdIconProps>
+    var default: ComponentClass<AntdIconProps>
 }
 
 external interface AntdIconProps : IconBaseProps, Props {

diff --git a/kotlin-antd/src/main/kotlin/antd/input/Group.kt b/kotlin-antd/src/main/kotlin/antd/input/Group.kt
@@ -5,7 +5,7 @@ import antd.ReactNode
 import org.w3c.dom.*
 import react.*
 
-external interface GroupComponent : ComponentType<GroupProps>
+external interface GroupComponent : ComponentClass<GroupProps>
 
 external interface GroupProps : Props {
     var className: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/input/Password.kt b/kotlin-antd/src/main/kotlin/antd/input/Password.kt
@@ -4,7 +4,7 @@ import antd.RefAttributes
 import antd.ReactNode
 import react.*
 
-external interface PasswordComponent : ComponentType<PasswordProps>
+external interface PasswordComponent : ComponentClass<PasswordProps>
 
 external interface PasswordProps : InputProps, RefAttributes<dynamic> {
     val inputPrefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/input/Search.kt b/kotlin-antd/src/main/kotlin/antd/input/Search.kt
@@ -4,7 +4,7 @@ import antd.RefAttributes
 import antd.ReactNode
 import react.*
 
-external interface SearchComponent : ComponentType<SearchProps>
+external interface SearchComponent : ComponentClass<SearchProps>
 
 external interface SearchProps : InputProps, RefAttributes<InputComponent> {
     var inputPrefixCls: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/input/TextArea.kt b/kotlin-antd/src/main/kotlin/antd/input/TextArea.kt
@@ -5,7 +5,7 @@ import antd.configprovider.SizeType
 import org.w3c.dom.*
 import react.*
 
-external interface TextAreaComponent : ComponentType<TextAreaProps>
+external interface TextAreaComponent : ComponentClass<TextAreaProps>
 
 external interface TextAreaProps : RcTextAreaProps, RefAttributes<TextAreaRef>, Props {
     var allowClear: Boolean?

diff --git a/kotlin-antd/src/main/kotlin/antd/layout/Layout.kt b/kotlin-antd/src/main/kotlin/antd/layout/Layout.kt
@@ -17,11 +17,11 @@ external object LayoutComponent : Component<LayoutProps, State> {
     override fun render(): ReactElement?
 }
 
-external interface HeaderComponent : ComponentType<LayoutProps>
+external interface HeaderComponent : ComponentClass<LayoutProps>
 
-external interface FooterComponent : ComponentType<LayoutProps>
+external interface FooterComponent : ComponentClass<LayoutProps>
 
-external interface ContentComponent : ComponentType<LayoutProps>
+external interface ContentComponent : ComponentClass<LayoutProps>
 
 external val layoutContext: Context<LayoutContextProps>
 

diff --git a/kotlin-antd/src/main/kotlin/antd/layout/Sider.kt b/kotlin-antd/src/main/kotlin/antd/layout/Sider.kt
@@ -5,7 +5,7 @@ import antd.ReactNode
 import org.w3c.dom.*
 import react.*
 
-external interface SiderComponent : ComponentType<SiderProps>
+external interface SiderComponent : ComponentClass<SiderProps>
 
 external val sderContext: Context<SiderContextProps>
 

diff --git a/kotlin-antd/src/main/kotlin/antd/list/ListItem.kt b/kotlin-antd/src/main/kotlin/antd/list/ListItem.kt
@@ -5,11 +5,11 @@ import antd.ReactNode
 import org.w3c.dom.*
 import react.*
 
-external interface ItemComponent : ComponentType<ListItemProps> {
+external interface ItemComponent : ComponentClass<ListItemProps> {
     val Meta: MetaComponent
 }
 
-external interface MetaComponent : ComponentType<ListItemMetaProps>
+external interface MetaComponent : ComponentClass<ListItemMetaProps>
 
 external interface ListItemProps : HTMLAttributes<HTMLDivElement>, Props {
     override var className: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/mentions/Option.kt b/kotlin-antd/src/main/kotlin/antd/mentions/Option.kt
@@ -3,7 +3,7 @@ package antd.mentions
 import antd.ReactNode
 import react.*
 
-external interface OptionComponent : ComponentType<OptionProps>
+external interface OptionComponent : ComponentClass<OptionProps>
 
 external interface OptionProps : RcOptionProps, Props {
     override var value: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/menu/Divider.kt b/kotlin-antd/src/main/kotlin/antd/menu/Divider.kt
@@ -2,7 +2,7 @@ package antd.menu
 
 import react.*
 
-external interface DividerComponent : ComponentType<DividerProps>
+external interface DividerComponent : ComponentClass<DividerProps>
 
 external interface DividerProps : Props {
     var className: String?

diff --git a/kotlin-antd/src/main/kotlin/antd/menu/MenuItem.kt b/kotlin-antd/src/main/kotlin/antd/menu/MenuItem.kt
@@ -4,7 +4,7 @@ import antd.HTMLAttributes
 import org.w3c.dom.HTMLLIElement
 import react.*
 
-external interface MenuItemComponent : ComponentType<MenuItemProps>
+external interface MenuItemComponent : ComponentClass<MenuItemProps>
 
 external interface MenuItemProps : RcMenuItemProps, Props {
     var icon: Any? /* ReactElement | String */