Skip to content

Commit 1c970c5

Browse files
patjackson52patjackson52
authored
Merge pull request #62 from reduxkotlin/feature/59-add-platforms
[#59] add missing platforms & remove spek & atrium
2 parents 9d68e53 + 3fd07aa commit 1c970c5

File tree

19 files changed

+639
-732
lines changed

19 files changed

+639
-732
lines changed

‎.github/workflows/test.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ on:
88

99
jobs:
1010
test:
11-
runs-on: ubuntu-latest
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
os: [macos-latest, windows-latest, ubuntu-latest]
1215
steps:
1316
- uses: actions/checkout@v2
1417

1518
- name: Test
16-
run: ./gradlew jvmTest
19+
run: ./gradlew allTest
1720

1821
- name: Archive redux-kotlin Test Reports
1922
uses: actions/upload-artifact@v1

‎build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ allprojects {
2626
jcenter()
2727
maven("https://kotlin.bintray.com/kotlinx")
2828
maven("https://oss.sonatype.org/content/repositories/snapshots")
29-
maven("https://dl.bintray.com/spekframework/spek-dev")
3029
mavenCentral()
3130
}
3231

‎buildSrc/src/main/kotlin/Libs.kt

+41-50
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,20 @@ import kotlin.String
88
*/
99
object Libs {
1010
/**
11-
* http://developer.android.com/tools/extras/support-library.html
11+
* https://developer.android.com/jetpack/androidx
1212
*/
1313
const val appcompat: String = "androidx.appcompat:appcompat:" + Versions.appcompat
1414

1515
/**
16-
* https://developer.android.com/reference/android/support/constraint/ConstraintLayout
16+
* http://tools.android.com
1717
*/
18-
const val constraintLayout = "androidx.constraintlayout:constraintlayout:" + Versions.constraint_layout
18+
const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:" +
19+
Versions.constraintlayout
1920

2021
/**
21-
* https://developer.android.com/guide/topics/ui/layout/recyclerview
22+
* https://developer.android.com/jetpack/androidx
2223
*/
23-
const val recyclerView = "androidx.recyclerview:recyclerview:" + Versions.recycler_view
24-
25-
/**
26-
* https://developer.android.com/testing
27-
*/
28-
const val espresso_core: String = "androidx.test.espresso:espresso-core:" + Versions.espresso_core
29-
30-
/**
31-
* https://developer.android.com/testing
32-
*/
33-
const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner
34-
35-
/**
36-
* https://github.com/robstoll/atrium
37-
*/
38-
const val atrium_cc_en_gb_robstoll_common: String =
39-
"ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:" + Versions.atrium
40-
41-
/**
42-
* https://github.com/robstoll/atrium
43-
*/
44-
const val atrium_cc_en_gb_robstoll: String = "ch.tutteli.atrium:atrium-cc-en_GB-robstoll:" +
45-
Versions.atrium
24+
const val recyclerview: String = "androidx.recyclerview:recyclerview:" + Versions.recyclerview
4625

4726
/**
4827
* https://developer.android.com/studio
@@ -67,17 +46,12 @@ object Libs {
6746
/**
6847
* http://mockk.io
6948
*/
70-
const val mockk_common: String = "io.mockk:mockk-common:" + Versions.mockk
49+
const val mockk_common: String = "io.mockk:mockk-common:" + Versions.io_mockk
7150

7251
/**
7352
* http://mockk.io
7453
*/
75-
const val mockk: String = "io.mockk:mockk:" + Versions.mockk
76-
77-
/**
78-
* http://junit.org
79-
*/
80-
const val junit: String = "junit:junit:" + Versions.junit
54+
const val mockk: String = "io.mockk:mockk:" + Versions.io_mockk
8155

8256
const val dokka_gradle_plugin: String = "org.jetbrains.dokka:dokka-gradle-plugin:" +
8357
Versions.dokka_gradle_plugin
@@ -100,12 +74,18 @@ object Libs {
10074
const val kotlin_annotation_processing_gradle: String =
10175
"org.jetbrains.kotlin:kotlin-annotation-processing-gradle:" + Versions.org_jetbrains_kotlin
10276

77+
const val kotlin_compiler_embeddable: String =
78+
"org.jetbrains.kotlin:kotlin-compiler-embeddable:" + Versions.org_jetbrains_kotlin
79+
10380
/**
10481
* https://kotlinlang.org/
10582
*/
10683
const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
10784
Versions.org_jetbrains_kotlin
10885

86+
const val kotlin_klib_commonizer_embeddable: String =
87+
"org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:" + Versions.org_jetbrains_kotlin
88+
10989
/**
11090
* https://kotlinlang.org/
11191
*/
@@ -119,7 +99,7 @@ object Libs {
11999
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin
120100

121101
/**
122-
* https://kotlinlang.org/
102+
* 1.3.72
123103
*/
124104
const val kotlin_stdlib_common: String = "org.jetbrains.kotlin:kotlin-stdlib-common:" +
125105
Versions.org_jetbrains_kotlin
@@ -131,13 +111,13 @@ object Libs {
131111
Versions.org_jetbrains_kotlin
132112

133113
/**
134-
* https://kotlinlang.org/
114+
* 1.3.72
135115
*/
136116
const val kotlin_stdlib_js: String = "org.jetbrains.kotlin:kotlin-stdlib-js:" +
137117
Versions.org_jetbrains_kotlin
138118

139119
/**
140-
* https://kotlinlang.org/
120+
* 1.3.72
141121
*/
142122
const val kotlin_stdlib: String = "org.jetbrains.kotlin:kotlin-stdlib:" +
143123
Versions.org_jetbrains_kotlin
@@ -172,21 +152,32 @@ object Libs {
172152
const val kotlin_test: String = "org.jetbrains.kotlin:kotlin-test:" +
173153
Versions.org_jetbrains_kotlin
174154

175-
const val spek_dsl_jvm: String = "org.spekframework.spek2:spek-dsl-jvm:" +
176-
Versions.spek
177-
178-
const val spek_dsl_metadata: String = "org.spekframework.spek2:spek-dsl-metadata:" +
179-
Versions.spek
155+
/**
156+
* https://github.com/Kotlin/atomicfu
157+
*/
158+
const val atomicfu_gradle_plugin: String = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:" +
159+
Versions.atomicfu_gradle_plugin
180160

181-
const val spek_runner_junit5: String = "org.spekframework.spek2:spek-runner-junit5:" +
182-
Versions.spek
161+
/**
162+
* https://github.com/Kotlin/atomicfu
163+
*/
164+
const val atomicfu: String = "org.jetbrains.kotlinx:atomicfu:" + Versions.atomicfu
183165

184-
const val kotlin_coroutines: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
185-
Versions.coroutines
166+
/**
167+
* https://github.com/Kotlin/kotlinx.coroutines
168+
*/
169+
const val kotlinx_coroutines_core_jvm: String =
170+
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" + Versions.kotlinx_coroutines_core_jvm
186171

187-
const val kotlin_coroutines_jvm: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" +
188-
Versions.coroutines
172+
/**
173+
* https://github.com/Kotlin/kotlinx.coroutines
174+
*/
175+
const val kotlinx_coroutines_core: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
176+
Versions.kotlinx_coroutines_core
189177

190-
const val kotlin_coroutines_test: String = "org.jetbrains.kotlinx:kotlinx-coroutines-test:" +
191-
Versions.coroutines
178+
/**
179+
* https://github.com/Kotlin/kotlinx.coroutines
180+
*/
181+
const val kotlinx_coroutines_test: String = "org.jetbrains.kotlinx:kotlinx-coroutines-test:" +
182+
Versions.kotlinx_coroutines_test
192183
}

‎buildSrc/src/main/kotlin/Plugins.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ object Plugins {
22
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
33
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
44
const val android = "com.android.tools.build:gradle:${Versions.com_android_tools_build_gradle}"
5-
const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Versions.atomicFu}"
5+
const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Versions.atomicfu}"
66
}

‎buildSrc/src/main/kotlin/Versions.kt

+16-21
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,44 @@ import org.gradle.plugin.use.PluginDependencySpec
1212
* YOU are responsible for updating manually the dependency version.
1313
*/
1414
object Versions {
15-
const val appcompat: String = "1.1.0-rc01"
15+
const val appcompat: String = "1.1.0-rc01" // available: "1.1.0"
1616

17-
const val espresso_core: String = "3.2.0"
17+
const val constraintlayout: String = "1.1.3"
1818

19-
const val androidx_test_runner: String = "1.2.0"
19+
const val recyclerview: String = "1.0.0" // available: "1.1.0"
2020

21-
const val atrium: String = "0.9.2"
21+
const val aapt2: String = "3.6.0-6040484" // available: "4.0.1-6197926"
2222

23-
const val aapt2: String = "3.5.0-5435860"
23+
const val com_android_tools_build_gradle: String = "3.6.0" // available: "4.0.1"
2424

25-
const val com_android_tools_build_gradle: String = "3.6.0"
25+
const val lint_gradle: String = "26.6.0" // available: "27.0.1"
2626

27-
const val lint_gradle: String = "26.5.0"
27+
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2" // available: "0.7.0"
2828

29-
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2"
29+
const val io_mockk: String = "1.9.3" // available: "1.10.0"
3030

31-
const val mockk: String = "1.9.3"
32-
33-
const val junit: String = "4.12"
34-
35-
const val dokka_gradle_plugin: String = "0.9.17" // available: "0.9.18"
31+
const val dokka_gradle_plugin: String = "0.9.17" // available: "0.11.0-dev-59"
3632

3733
const val org_jetbrains_kotlin: String = "1.4.0-rc"
3834

39-
const val spek: String = "2.1.0-alpha.0.11+d97ef33"
40-
// available: "2.1.0-alpha.0.24+0fdeb6e"
35+
const val atomicfu_gradle_plugin: String = "0.14.3-1.4.0-rc"
4136

42-
const val constraint_layout = "1.1.3"
37+
const val atomicfu: String = "0.14.3-1.4.0-rc"
4338

44-
const val recycler_view = "1.0.0"
39+
const val kotlinx_coroutines_core_jvm: String = "1.3.8-1.4.0-rc"
4540

46-
const val coroutines = "1.3.8-1.4.0-rc"
41+
const val kotlinx_coroutines_core: String = "1.3.8-1.4.0-rc"
4742

48-
const val atomicFu = "0.14.3-1.4.0-rc"
43+
const val kotlinx_coroutines_test: String = "1.3.8-1.4.0-rc"
4944

5045
/**
5146
*
5247
* See issue 19: How to update Gradle itself?
5348
* https://github.com/jmfayard/buildSrcVersions/issues/19
5449
*/
55-
const val gradleLatestVersion: String = "5.6.1"
50+
const val gradleLatestVersion: String = "6.5.1"
5651

57-
const val gradleCurrentVersion: String = "5.6.1"
52+
const val gradleCurrentVersion: String = "6.5"
5853
}
5954

6055
/**

‎examples/counter/android/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ android {
3434
}
3535
}
3636

37-
3837
dependencies {
3938
implementation(Libs.kotlin_stdlib_jdk8)
4039
implementation(Libs.appcompat)

‎examples/counter/common/build.gradle.kts

+3-35
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ plugins {
33
kotlin("multiplatform")
44
}
55

6-
repositories {
7-
maven("https://dl.bintray.com/spekframework/spek-dev")
8-
}
9-
106
kotlin {
117
jvm()
128
js(IR) {
@@ -23,15 +19,8 @@ kotlin {
2319
}
2420
}
2521

26-
iosArm64("ios")
27-
iosX64("iosSim")
28-
macosX64("macos")
29-
mingwX64("win")
30-
wasm32("wasm")
31-
linuxArm32Hfp("linArm32")
32-
linuxMips32("linMips32")
33-
linuxMipsel32("linMipsel32")
34-
linuxX64("lin64")
22+
iosArm64()
23+
iosX64()
3524

3625
sourceSets {
3726
commonMain {
@@ -40,24 +29,16 @@ kotlin {
4029
}
4130
}
4231
commonTest {
43-
kotlin.srcDir("src/test/kotlin")
4432
dependencies {
4533
implementation(kotlin("test-common"))
4634
implementation(kotlin("test-annotations-common"))
47-
implementation("org.spekframework.spek2:spek-dsl-metadata:${Versions.spek}")
48-
implementation("ch.tutteli.atrium:atrium-cc-en_GB-robstoll-common:${Versions.atrium}")
49-
implementation("io.mockk:mockk-common:${Versions.mockk}")
35+
implementation("io.mockk:mockk-common:${Versions.io_mockk}")
5036
}
5137
}
5238
val jvmTest by getting {
5339
dependencies {
5440
implementation(kotlin("test"))
5541
implementation(kotlin("test-junit"))
56-
implementation("org.spekframework.spek2:spek-dsl-jvm:${Versions.spek}")
57-
implementation("ch.tutteli.atrium:atrium-cc-en_GB-robstoll:${Versions.atrium}")
58-
implementation("io.mockk:mockk:${Versions.mockk}")
59-
60-
runtimeOnly("org.spekframework.spek2:spek-runner-junit5:${Versions.spek}")
6142
runtimeOnly("org.jetbrains.kotlin:kotlin-reflect")
6243
}
6344
}
@@ -67,18 +48,5 @@ kotlin {
6748
implementation(kotlin("stdlib-js"))
6849
}
6950
}
70-
71-
val iosMain by getting
72-
val iosTest by getting
73-
val iosSimMain by getting { dependsOn(iosMain) }
74-
val iosSimTest by getting { dependsOn(iosTest) }
75-
}
76-
}
77-
78-
tasks {
79-
val jvmTest by getting(Test::class) {
80-
useJUnitPlatform {
81-
includeEngines("spek2")
82-
}
8351
}
8452
}

‎examples/counter/common/src/test/kotlin/org/reduxkotlin/examples/counter/ReducerTest.kt

+15-19
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,22 @@
11
package org.reduxkotlin.examples.counter
22

3-
import ch.tutteli.atrium.api.cc.en_GB.toBe
4-
import org.spekframework.spek2.Spek
5-
import org.spekframework.spek2.style.specification.describe
6-
import ch.tutteli.atrium.verbs.expect
3+
import kotlin.test.Test
4+
import kotlin.test.expect
75

6+
class CounterTest {
87

9-
object CounterSpek : Spek({
10-
11-
describe("reducers") {
12-
describe("counter") {
13-
it("should handle INCREMENT action") {
14-
expect(reducer(1, Increment())).toBe(2)
15-
}
8+
@Test
9+
fun shouldHandleINCREMENTAction() {
10+
expect(2) { reducer(1, Increment()) }
11+
}
1612

17-
it("should handle DECREMENT action") {
18-
expect(reducer(1, Decrement())).toBe(0)
19-
}
13+
@Test
14+
fun shouldHandleDECREMENTAction() {
15+
expect(0) { reducer(1, Decrement()) }
16+
}
2017

21-
it("should ignore unknown actions") {
22-
expect(reducer(1, Any())).toBe(1)
23-
}
24-
}
18+
@Test
19+
fun shouldIgnoreUnknownActions() {
20+
expect(1) { reducer(1, Any()) }
2521
}
26-
})
22+
}

‎examples/todos/android/build.gradle.kts

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ android {
3535
}
3636
}
3737

38-
3938
dependencies {
4039
implementation(Libs.kotlin_stdlib_jdk8)
4140
implementation(Libs.appcompat)
42-
implementation(Libs.constraintLayout)
43-
implementation(Libs.recyclerView)
41+
implementation(Libs.constraintlayout)
42+
implementation(Libs.recyclerview)
4443

4544
implementation(project(":examples:todos:common"))
4645
implementation(project(":redux-kotlin-threadsafe"))

0 commit comments

Comments
 (0)