Skip to content

Commit b457402

Browse files
author
samgarasx
committed
Update Kotlin version to v1.5.21
1 parent fe7021c commit b457402

File tree

717 files changed

+6520
-5110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

717 files changed

+6520
-5110
lines changed

‎build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ subprojects {
1414

1515
repositories {
1616
mavenCentral()
17-
maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
18-
maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
1917
}
2018

2119
plugins.withType<KotlinJsPluginWrapper> {

‎buildSrc/src/main/kotlin/Dependencies.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependency
44
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmDependencyExtension
55

66
fun Project.kotlinWrapperDependency(name: String) =
7-
"org.jetbrains:kotlin-$name:${wrapperVersion(name)}-kotlin-${kotlinVersion()}"
7+
"org.jetbrains.kotlin-wrappers:kotlin-$name:${wrapperVersion(name)}-kotlin-${kotlinVersion()}"
88

99
fun Project.npmPackage(name: String): NpmDependency {
1010
val npm = dependencies.the<NpmDependencyExtension>()

‎gradle.properties‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
kotlin.code.style=official
22

3-
kotlin.version=1.5.0
3+
kotlin.version=1.5.21
44

5-
kotlin-react.version=17.0.2-pre.154
6-
kotlin-react-dom.version=17.0.2-pre.154
7-
kotlin-styled.version=5.2.3-pre.154
5+
kotlin-react.version=17.0.2-pre.222
6+
kotlin-react-dom.version=17.0.2-pre.222
7+
kotlin-styled.version=5.3.0-pre.222
88

9-
kotlin-antd.version=4.8.6-pre.13
10-
kotlin-moment.version=2.27.0-pre.11
11-
kotlin-react-intl.version=5.8.1-pre.11
12-
kotlin-react-responsive.version=8.1.0-pre.11
13-
kotlin-uikit.version=3.5.7-pre.10
9+
kotlin-antd.version=4.8.6-pre.14
10+
kotlin-moment.version=2.27.0-pre.12
11+
kotlin-react-intl.version=5.8.1-pre.12
12+
kotlin-react-responsive.version=8.1.0-pre.12
13+
kotlin-uikit.version=3.5.7-pre.11

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎kotlin-antd/antd-samples/src/main/kotlin/samples/App.kt‎

Lines changed: 68 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,78 @@
11
package samples
22

33
import kotlinx.css.*
4-
import react.*
5-
import react.dom.*
6-
import samples.affix.*
7-
import samples.alert.*
8-
import samples.anchor.*
9-
import samples.autocomplete.*
4+
import react.RBuilder
5+
import react.RComponent
6+
import react.RProps
7+
import react.State
8+
import react.dom.h1
9+
import samples.affix.affixApp
10+
import samples.alert.alertApp
11+
import samples.anchor.anchorApp
12+
import samples.autocomplete.autoCompleteApp
1013
import samples.avatar.avatarApp
11-
import samples.backtop.*
12-
import samples.badge.*
13-
import samples.breadcrumb.*
14-
import samples.button.*
14+
import samples.backtop.backTopApp
15+
import samples.badge.badgeApp
16+
import samples.breadcrumb.breadcrumbApp
17+
import samples.button.buttonApp
1518
import samples.calendar.calendarApp
16-
import samples.card.*
17-
import samples.carousel.*
18-
import samples.cascader.*
19-
import samples.checkbox.*
20-
import samples.collapse.*
21-
import samples.comment.*
22-
import samples.configprovider.*
23-
import samples.datepicker.*
24-
import samples.descriptions.*
25-
import samples.divider.*
26-
import samples.drawer.*
27-
import samples.dropdown.*
28-
import samples.empty.*
29-
import samples.form.*
30-
import samples.grid.*
31-
import samples.icon.*
19+
import samples.card.cardApp
20+
import samples.carousel.carouselApp
21+
import samples.cascader.cascaderApp
22+
import samples.checkbox.checkboxApp
23+
import samples.collapse.collapseApp
24+
import samples.comment.commentApp
25+
import samples.configprovider.configProviderApp
26+
import samples.datepicker.datePickerApp
27+
import samples.descriptions.descriptionsApp
28+
import samples.divider.dividerApp
29+
import samples.drawer.drawerApp
30+
import samples.dropdown.dropdownApp
31+
import samples.empty.emptyApp
32+
import samples.form.formApp
33+
import samples.grid.gridApp
34+
import samples.icon.iconApp
3235
import samples.image.imageApp
33-
import samples.input.*
34-
import samples.inputnumber.*
35-
import samples.layout.*
36+
import samples.input.inputApp
37+
import samples.inputnumber.inputNumberApp
38+
import samples.layout.layoutApp
3639
import samples.list.listApp
37-
import samples.localeprovider.*
38-
import samples.mentions.*
39-
import samples.menu.*
40-
import samples.message.*
41-
import samples.modal.*
42-
import samples.notification.*
43-
import samples.pageheader.*
44-
import samples.pagination.*
45-
import samples.popconfirm.*
46-
import samples.popover.*
47-
import samples.progress.*
48-
import samples.radio.*
49-
import samples.rate.*
50-
import samples.result.*
51-
import samples.select.*
52-
import samples.skeleton.*
53-
import samples.slider.*
40+
import samples.localeprovider.localeProviderApp
41+
import samples.mentions.mentionsApp
42+
import samples.menu.menuApp
43+
import samples.message.messageApp
44+
import samples.modal.modalApp
45+
import samples.notification.notificationApp
46+
import samples.pageheader.pageHeaderApp
47+
import samples.pagination.paginationApp
48+
import samples.popconfirm.popconfirmApp
49+
import samples.popover.popoverApp
50+
import samples.progress.progressApp
51+
import samples.radio.radioApp
52+
import samples.rate.rateApp
53+
import samples.result.resultApp
54+
import samples.select.selectApp
55+
import samples.skeleton.skeletonApp
56+
import samples.slider.sliderApp
5457
import samples.space.spaceApp
55-
import samples.spin.*
56-
import samples.statistic.*
57-
import samples.steps.*
58-
import samples.switch.*
59-
import samples.table.*
60-
import samples.tabs.*
61-
import samples.tag.*
62-
import samples.timeline.*
63-
import samples.timepicker.*
64-
import samples.tooltip.*
65-
import samples.transfer.*
66-
import samples.tree.*
67-
import samples.treeselect.*
68-
import samples.typography.*
69-
import samples.upload.*
70-
import styled.*
58+
import samples.spin.spinApp
59+
import samples.statistic.statisticApp
60+
import samples.steps.stepsApp
61+
import samples.switch.switchApp
62+
import samples.table.tableApp
63+
import samples.tabs.tabsApp
64+
import samples.tag.tagApp
65+
import samples.timeline.timelineApp
66+
import samples.timepicker.timePickerApp
67+
import samples.tooltip.tooltipApp
68+
import samples.transfer.transferApp
69+
import samples.tree.treeApp
70+
import samples.treeselect.treeSelectApp
71+
import samples.typography.typographyApp
72+
import samples.upload.uploadApp
73+
import styled.StyleSheet
74+
import styled.css
75+
import styled.styledDiv
7176

7277
object AppStyles : StyleSheet("app", isStatic = true) {
7378
val header by css {
@@ -91,7 +96,7 @@ object AppStyles : StyleSheet("app", isStatic = true) {
9196
}
9297
}
9398

94-
class App : RComponent<RProps, RState>() {
99+
class App : RComponent<RProps, State>() {
95100
override fun RBuilder.render() {
96101
styledDiv {
97102
css { +AppStyles.header }

‎kotlin-antd/antd-samples/src/main/kotlin/samples/Main.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package samples
22

3-
import kotlinext.js.*
4-
import kotlinx.browser.*
5-
import react.dom.*
3+
import kotlinext.js.require
4+
import kotlinx.browser.document
5+
import react.dom.render
66

77
fun main() {
88
require("antd/dist/antd.css")

‎kotlin-antd/antd-samples/src/main/kotlin/samples/affix/App.kt‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package samples.affix
22

33
import kotlinx.css.*
4-
import react.*
5-
import react.dom.*
6-
import styled.*
4+
import react.RBuilder
5+
import react.RComponent
6+
import react.RProps
7+
import react.State
8+
import react.dom.h2
9+
import styled.StyleSheet
10+
import styled.css
11+
import styled.styledDiv
712

813
object AffixStyles : StyleSheet("affix", isStatic = true) {
914
val container by css {}
@@ -22,7 +27,7 @@ object AffixStyles : StyleSheet("affix", isStatic = true) {
2227
}
2328
}
2429

25-
class AffixApp : RComponent<RProps, RState>() {
30+
class AffixApp : RComponent<RProps, State>() {
2631
override fun RBuilder.render() {
2732
h2 { +"Affix" }
2833
styledDiv {

‎kotlin-antd/antd-samples/src/main/kotlin/samples/affix/Basic.kt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package samples.affix
22

3-
import antd.affix.*
3+
import antd.affix.affix
44
import antd.button.button
55
import react.*
6-
import react.dom.*
7-
import styled.*
6+
import react.dom.br
7+
import react.dom.div
8+
import styled.css
9+
import styled.styledDiv
810

9-
external interface BasicDemoState : RState {
11+
external interface BasicDemoState : State {
1012
var top: Number
1113
var bottom: Number
1214
}

‎kotlin-antd/antd-samples/src/main/kotlin/samples/affix/OnChange.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package samples.affix
22

3-
import antd.affix.*
4-
import antd.button.*
5-
import react.*
6-
import styled.*
3+
import antd.affix.affix
4+
import antd.button.button
5+
import react.RBuilder
6+
import styled.css
7+
import styled.styledDiv
78

89
fun RBuilder.onChange() {
910
styledDiv {

‎kotlin-antd/antd-samples/src/main/kotlin/samples/affix/Target.kt‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
package samples.affix
22

3-
import antd.affix.*
3+
import antd.affix.affix
44
import antd.button.button
5-
import kotlinx.html.*
6-
import react.*
7-
import react.dom.*
8-
import styled.*
5+
import kotlinx.html.classes
6+
import react.RBuilder
7+
import react.RComponent
8+
import react.RProps
9+
import react.State
10+
import react.dom.div
11+
import styled.css
12+
import styled.styledDiv
913

10-
class TargetDemo : RComponent<RProps, RState>() {
14+
class TargetDemo : RComponent<RProps, State>() {
1115
private var container: dynamic = null
1216

1317
override fun RBuilder.render() {
1418
div {
1519
attrs.classes = setOf("scrollable-container")
16-
ref { node -> container = node }
20+
ref = container
1721
div {
1822
attrs.classes = setOf("background")
1923
affix {

0 commit comments

Comments
 (0)