This repository was archived by the owner on May 16, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +33
-14
lines changed Expand file tree Collapse file tree 4 files changed +33
-14
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ buildscript {
10
10
classpath(" org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions .kotlin} " )
11
11
classpath(" com.android.tools.build:gradle:${Versions .agp} " )
12
12
classpath(" com.bugsnag:bugsnag-android-gradle-plugin:${Versions .bugsnagPlugin} " )
13
- classpath(" org.jetbrains.kotlin:kotlin-frontend-plugin:0.0.37 " )
13
+ classpath(" org.jetbrains.kotlin:kotlin-frontend-plugin:${ Versions .kotlinFrontentPlugin} " )
14
14
}
15
15
}
16
16
@@ -23,4 +23,18 @@ allprojects {
23
23
maven(" https://dl.bintray.com/kotlin/kotlin-js-wrappers" )
24
24
maven(" https://kotlin.bintray.com/kotlinx" )
25
25
}
26
+
27
+ // TODO remove once https://github.com/Kotlin/kotlin-frontend-plugin/issues/141 is fixed
28
+ plugins.whenPluginAdded {
29
+ if (this .javaClass.name == " org.jetbrains.kotlin.gradle.frontend.FrontendPlugin" ) {
30
+ val fixTask = tasks.register(" webpack-config-fix" ) {
31
+ this .doLast { file(" webpack.config.d" ).mkdir() }
32
+ }
33
+ afterEvaluate {
34
+ tasks.named(" webpack-config" ).configure {
35
+ this .dependsOn(fixTask)
36
+ }
37
+ }
38
+ }
39
+ }
26
40
}
Original file line number Diff line number Diff line change 1
1
object Versions {
2
- val kotlin = " 1.3.20"
3
- val agp = " 3.2.1"
2
+ val kotlin = " 1.3.41"
3
+ val kotlinxHtml = " 0.6.12"
4
+ val kotlinReact = " 16.9.0-pre.82-kotlin-1.3.41"
5
+ val nodeJs = " 12.9.0"
6
+ val agp = " 3.4.2"
4
7
val androidx = " 1.0.0"
5
8
val bugsnagAndroid = " 4.11.0"
6
9
val bugsnagPlugin = " 4.0.0"
7
10
val bugsnagJvm = " 3.4.4"
8
- val springBoot = " 2.1.1.RELEASE"
9
- val depManagement = " 1.0.6.RELEASE"
10
- }
11
+ val kotlinFrontentPlugin = " 0.0.45"
12
+ val springBoot = " 2.1.7.RELEASE"
13
+ val depManagement = " 1.0.8.RELEASE"
14
+ }
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3
3
distributionPath =wrapper/dists
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
6
- distributionUrl =https\://services.gradle.org/distributions/gradle-4.10.2 -all.zip
6
+ distributionUrl =https\://services.gradle.org/distributions/gradle-5.6 -all.zip
Original file line number Diff line number Diff line change 1
1
plugins {
2
- id(" org.jetbrains.kotlin.frontend" )
3
- id(" kotlin-dce-js" )
4
2
id(" kotlin2js" )
5
3
}
4
+ apply {
5
+ plugin(" org.jetbrains.kotlin.frontend" )
6
+ plugin(" kotlin-dce-js" )
7
+ }
6
8
7
9
dependencies {
8
10
compile(" org.jetbrains.kotlin:kotlin-stdlib-js:$Versions . kotlin " )
9
- compile(" org.jetbrains.kotlinx:kotlinx-html-js:0.6.11 " )
11
+ compile(" org.jetbrains.kotlinx:kotlinx-html: $V ersions . kotlinxHtml " )
10
12
11
- compile(" org.jetbrains:kotlin-react:16.6.0-pre.62-kotlin-1.3.0 " )
12
- compile(" org.jetbrains:kotlin-react-dom:16.6.0-pre.62-kotlin-1.3.0 " )
13
+ compile(" org.jetbrains:kotlin-react:$V ersions . kotlinReact " )
14
+ compile(" org.jetbrains:kotlin-react-dom:$V ersions . kotlinReact " )
13
15
compile(project(" :common" ))
14
16
}
15
17
@@ -20,10 +22,9 @@ compileKotlin2Js {
20
22
}
21
23
22
24
kotlinFrontend {
23
- downloadNodeJsVersion = " latest "
25
+ downloadNodeJsVersion = Versions . nodeJs
24
26
25
27
npm {
26
- dependency(" kotlinx-html-js" )
27
28
dependency(" react" )
28
29
dependency(" react-dom" )
29
30
dependency(" material-components-web" )
You can’t perform that action at this time.
0 commit comments