Skip to content
This repository has been archived by the owner on Nov 19, 2022. It is now read-only.

[update]Update kotlin-wrappers -> pre.104 #23

Merged
merged 1 commit into from
May 4, 2020
+12 −31
Merged

[update]Update kotlin-wrappers -> pre.104 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions buildSrc/src/main/java/Libraries.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ object Libraries {

object Kotlin {
const val version = "1.3.72"
const val wrappersBuild = "pre.100-kotlin-$version"
const val wrappersBuild = "pre.104-kotlin-$version"

const val js = "org.jetbrains.kotlin:kotlin-stdlib-js:$version"
const val jsTest = "org.jetbrains.kotlin:kotlin-test-js:$version"
Expand All @@ -31,14 +31,13 @@ object Libraries {
}

object Npm {
const val coreJs = "~3.1.4"
const val styledComponent = "^4.3.2"
const val inlineStyledPrefixer = "^5.1.0"
const val styledComponent = "^4.4.1"
const val inlineStyledPrefixer = "^5.1.2"
const val react = "16.13.1"

object MaterialUi {
const val core = "4.9.8"
const val lab = "4.0.0-alpha.47"
const val core = "4.9.12"
const val lab = "4.0.0-alpha.51"
}
}
}
12 changes: 5 additions & 7 deletions core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ kotlin {
val main by getting {
dependencies {
implementation(Libraries.Kotlin.js)
implementation(Libraries.Kotlin.html)
implementation(Libraries.Kotlin.react)
implementation(Libraries.Kotlin.reactDom)
implementation(Libraries.Kotlin.css)
api(Libraries.Kotlin.html)
api(Libraries.Kotlin.react)
api(Libraries.Kotlin.reactDom)
api(Libraries.Kotlin.css)
implementation(Libraries.Kotlin.extensions)
implementation(npm("react", Libraries.Npm.react))
implementation(npm("react-dom", Libraries.Npm.react))
implementation(npm("@material-ui/core", Libraries.Npm.MaterialUi.core))
api(npm("@material-ui/core", Libraries.Npm.MaterialUi.core))
}
}

Expand Down
11 changes: 2 additions & 9 deletions lab/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,10 @@ kotlin {
sourceSets {
val main by getting {
dependencies {
implementation(project(":core"))
api(project(":core"))
implementation(Libraries.Kotlin.js)
implementation(Libraries.Kotlin.html)
implementation(Libraries.Kotlin.react)
implementation(Libraries.Kotlin.reactDom)
implementation(Libraries.Kotlin.css)
implementation(Libraries.Kotlin.extensions)
implementation(npm("react", Libraries.Npm.react))
implementation(npm("react-dom", Libraries.Npm.react))
implementation(npm("@material-ui/core", Libraries.Npm.MaterialUi.core))
implementation(npm("@material-ui/lab", Libraries.Npm.MaterialUi.lab))
api(npm("@material-ui/lab", Libraries.Npm.MaterialUi.lab))
}
}

Expand Down
9 changes: 0 additions & 9 deletions sample/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,7 @@ kotlin {
implementation(project(":core"))
implementation(project(":lab"))
implementation(Libraries.Kotlin.js)
implementation(Libraries.Kotlin.html)
implementation(Libraries.Kotlin.react)
implementation(Libraries.Kotlin.reactDom)
implementation(Libraries.Kotlin.css)
implementation(Libraries.Kotlin.styled)
implementation(Libraries.Kotlin.extensions)
implementation(npm("react", Libraries.Npm.react))
implementation(npm("react-dom", Libraries.Npm.react))
implementation(npm("styled-components", Libraries.Npm.styledComponent))
implementation(npm("inline-style-prefixer", Libraries.Npm.inlineStyledPrefixer))
}
}

Expand Down