Skip to content

Commit ecc0bb7

Browse files
author
Martynas Petuška
committed
Kotlin 1.4.0-rc JS flavours fixed
1 parent af8df5b commit ecc0bb7

File tree

7 files changed

+53
-51
lines changed

7 files changed

+53
-51
lines changed

build.gradle

Lines changed: 0 additions & 43 deletions
This file was deleted.

build.gradle.kts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
buildscript {
2+
repositories {
3+
google()
4+
mavenCentral()
5+
maven("https://dl.bintray.com/jetbrains/kotlin-native-dependencies")
6+
maven("https://plugins.gradle.org/m2/")
7+
maven("https://oss.sonatype.org/content/repositories/snapshots")
8+
jcenter()
9+
}
10+
11+
dependencies {
12+
classpath(Plugins.kotlin)
13+
classpath(Plugins.dokka)
14+
classpath(Plugins.android)
15+
classpath(Plugins.atomicFu)
16+
}
17+
}
18+
19+
plugins {
20+
id("de.fayard.buildSrcVersions") version "0.4.2"
21+
}
22+
23+
allprojects {
24+
repositories {
25+
google()
26+
jcenter()
27+
maven("https://kotlin.bintray.com/kotlinx")
28+
maven("https://oss.sonatype.org/content/repositories/snapshots")
29+
maven("https://dl.bintray.com/spekframework/spek-dev")
30+
mavenCentral()
31+
}
32+
33+
group = project.properties["GROUP"]!!
34+
version = project.properties["VERSION_NAME"]!!
35+
if (hasProperty("SNAPSHOT") || System.getenv("SNAPSHOT") != null) {
36+
version = "$version-SNAPSHOT"
37+
}
38+
}

examples/counter/common/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ repositories {
1010
kotlin {
1111
jvm()
1212
js(IR) {
13+
browser()
1314
binaries.executable()
1415

1516
listOf(compilations["main"], compilations["test"]).forEach {

examples/todos/common/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ kotlin {
1111
jvm()
1212
js(IR) {
1313
binaries.executable()
14+
browser()
1415

1516
listOf(compilations["main"], compilations["test"]).forEach {
1617
with(it.kotlinOptions) {

redux-kotlin-threadsafe/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ repositories {
1010
kotlin {
1111
jvm()
1212
js(BOTH) {
13+
browser()
14+
nodejs()
1315

1416
listOf(compilations["main"], compilations["test"]).forEach {
1517
with(it.kotlinOptions) {

redux-kotlin/build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
plugins {
22
java
33
kotlin("multiplatform")
4-
`maven-publish`
54
}
65

76
repositories {
87
maven("https://dl.bintray.com/spekframework/spek-dev")
98
}
109

10+
1111
kotlin {
1212
jvm()
1313
js(BOTH) {
14+
browser()
15+
nodejs()
16+
1417
listOf(compilations["main"], compilations["test"]).forEach {
1518
with(it.kotlinOptions) {
1619
moduleKind = "umd"

settings.gradle renamed to settings.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ pluginManagement {
99
}
1010

1111
include(
12-
':redux-kotlin',
13-
':redux-kotlin-threadsafe',
14-
':examples:counter:common',
15-
':examples:counter:android',
16-
':examples:todos:common',
17-
':examples:todos:android'
12+
":redux-kotlin",
13+
":redux-kotlin-threadsafe",
14+
":examples:counter:common",
15+
":examples:counter:android",
16+
":examples:todos:common",
17+
":examples:todos:android"
1818
)
1919

20-
rootProject.name = 'Redux-Kotlin'
20+
rootProject.name = "Redux-Kotlin"

0 commit comments

Comments
 (0)