devol
/
smalltalk-matrix
mirror of https://github.com/ouchadam/small-talk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:ouchadam/helium

This commit is contained in:
Adam Brown 2022-05-23 20:41:54 +01:00
parent 30453e695d ea58acf627
commit 142e85e073
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -126,7 +126,7 @@ ext.kotlinTest = { dependencies ->
dependencies.testImplementation Dependencies.mavenCentral.kluent dependencies.testImplementation Dependencies.mavenCentral.kluent
dependencies.testImplementation Dependencies.mavenCentral.kotlinTest dependencies.testImplementation Dependencies.mavenCentral.kotlinTest
dependencies.testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.6.10" dependencies.testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.6.10"
dependencies.testImplementation 'io.mockk:mockk:1.12.3' dependencies.testImplementation 'io.mockk:mockk:1.12.4'
dependencies.testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1' dependencies.testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
dependencies.testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' dependencies.testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
@ -134,7 +134,7 @@ ext.kotlinTest = { dependencies ->
} }
ext.kotlinFixtures = { dependencies -> ext.kotlinFixtures = { dependencies ->
dependencies.testFixturesImplementation 'io.mockk:mockk:1.12.2' dependencies.testFixturesImplementation 'io.mockk:mockk:1.12.4'
dependencies.testFixturesImplementation Dependencies.mavenCentral.kluent dependencies.testFixturesImplementation Dependencies.mavenCentral.kluent
dependencies.testFixturesImplementation Dependencies.mavenCentral.kotlinCoroutinesCore dependencies.testFixturesImplementation Dependencies.mavenCentral.kotlinCoroutinesCore
} }

4
dependencies.gradle
View File

@ -109,7 +109,7 @@ ext.Dependencies.with {
mavenCentral.with { mavenCentral.with {
kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVer}" kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVer}"
kotlinSerializationGradlePlugin = "org.jetbrains.kotlin:kotlin-serialization:${kotlinVer}" kotlinSerializationGradlePlugin = "org.jetbrains.kotlin:kotlin-serialization:${kotlinVer}"
kotlinSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2" kotlinSerializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.3"
kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1" kotlinCoroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1"
kotlinCoroutinesTest = 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1' kotlinCoroutinesTest = 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVer}" kotlinTest = "org.jetbrains.kotlin:kotlin-test-junit:${kotlinVer}"
@ -131,7 +131,7 @@ ext.Dependencies.with {
junit = "junit:junit:4.13.2" junit = "junit:junit:4.13.2"
kluent = "org.amshove.kluent:kluent:1.68" kluent = "org.amshove.kluent:kluent:1.68"
mockk = 'io.mockk:mockk:1.12.3' mockk = 'io.mockk:mockk:1.12.4'
matrixOlm = "org.matrix.android:olm-sdk:3.2.11" matrixOlm = "org.matrix.android:olm-sdk:3.2.11"
} }