Skip to content
This repository was archived by the owner on May 16, 2025. It is now read-only.

Commit 49b89f7

Browse files
committed
Update libraries and fix building
1 parent 02585c1 commit 49b89f7

File tree

4 files changed

+33
-14
lines changed

4 files changed

+33
-14
lines changed

build.gradle.kts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
1111
classpath("com.android.tools.build:gradle:${Versions.agp}")
1212
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}")
1414
}
1515
}
1616

@@ -23,4 +23,18 @@ allprojects {
2323
maven("https://dl.bintray.com/kotlin/kotlin-js-wrappers")
2424
maven("https://kotlin.bintray.com/kotlinx")
2525
}
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+
}
2640
}

buildSrc/src/main/java/Versions.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
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"
47
val androidx = "1.0.0"
58
val bugsnagAndroid = "4.11.0"
69
val bugsnagPlugin = "4.0.0"
710
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+
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
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

js-app/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
plugins {
2-
id("org.jetbrains.kotlin.frontend")
3-
id("kotlin-dce-js")
42
id("kotlin2js")
53
}
4+
apply {
5+
plugin("org.jetbrains.kotlin.frontend")
6+
plugin("kotlin-dce-js")
7+
}
68

79
dependencies {
810
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:$Versions.kotlinxHtml")
1012

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:$Versions.kotlinReact")
14+
compile("org.jetbrains:kotlin-react-dom:$Versions.kotlinReact")
1315
compile(project(":common"))
1416
}
1517

@@ -20,10 +22,9 @@ compileKotlin2Js {
2022
}
2123

2224
kotlinFrontend {
23-
downloadNodeJsVersion = "latest"
25+
downloadNodeJsVersion = Versions.nodeJs
2426

2527
npm {
26-
dependency("kotlinx-html-js")
2728
dependency("react")
2829
dependency("react-dom")
2930
dependency("material-components-web")

0 commit comments

Comments
 (0)