From e0eb79831eb2109315010f230bc34df7873fd43d Mon Sep 17 00:00:00 2001 From: Bernhard Frauendienst Date: Mon, 4 May 2020 02:10:17 +0200 Subject: [PATCH] [update]Update kotlin-wrappers -> pre.104 kotlin-wrappers now exports all its npm dependencies as api. Export @material-ui dependencies as well, and export all kotlin dependencies that are part of the libraries' public API. Remove superfluous dependency declarations where applicable. --- buildSrc/src/main/java/Libraries.kt | 11 +++++------ core/build.gradle.kts | 12 +++++------- lab/build.gradle.kts | 11 ++--------- sample/build.gradle.kts | 9 --------- 4 files changed, 12 insertions(+), 31 deletions(-) diff --git a/buildSrc/src/main/java/Libraries.kt b/buildSrc/src/main/java/Libraries.kt index 9aaed347..7e9976ea 100644 --- a/buildSrc/src/main/java/Libraries.kt +++ b/buildSrc/src/main/java/Libraries.kt @@ -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" @@ -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" } } } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 4e2ccf66..d882d757 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -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)) } } diff --git a/lab/build.gradle.kts b/lab/build.gradle.kts index 4073c126..14b8ca9e 100644 --- a/lab/build.gradle.kts +++ b/lab/build.gradle.kts @@ -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)) } } diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 3e6b6d16..d7b0838e 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -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)) } }