Skip to content

Commit b31d985

Browse files
committed
gradle build refactoring, the platformInterface module now uses kotlin-dsl instead of groovy for better version management
1 parent ec4095a commit b31d985

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

build.gradle.kts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,30 @@ dependencies {
3636
compile ("com.github.hotzkow:platformInterfaceLib") {
3737
// in theory it should be 'api', but for some reason that does not work for transitive classpath dependencies
3838
version {
39-
require("[2.4.1,2.5[")
39+
require("[2.4.1, 2.5[")
4040
}
4141
}
42+
4243
implementation ("com.natpryce:konfig:1.6.6.0") // configuration library
4344
implementation ("org.slf4j:slf4j-api:1.7.25")
4445

4546
// we need the jdk dependency instead of stdlib to have enhanced java features like tue 'use' function for try-with-resources
4647
implementation (group= "org.jetbrains.kotlin", name= "kotlin-stdlib-jdk8")
4748
implementation ("org.jetbrains.kotlin:kotlin-reflect") // because we need reflection to get annotated property values
48-
implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1")
49+
implementation ("org.jetbrains.kotlinx:kotlinx-coroutines-core") {
50+
version{
51+
require("[1.1.0, 1.2[") // FIXME incompatible with newer version
52+
}
53+
}
4954

5055
testImplementation (group= "junit", name= "junit", version= "4.12")
5156
}
5257

5358
// compile bytecode to java 8 (default is java 6)
5459
tasks.withType<KotlinCompile> {
5560
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
61+
}
62+
63+
tasks.withType<Wrapper> {
64+
gradleVersion = "5.3" //define what gradle wrapper version is to be used on wrapper initialization (only if there is no wrapper yet or "gradlew wrapper" is called)
5665
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
pluginManagement {
3-
val kotlinVersion = "1.3.31" // need at least 1.3.20 to avoid error 'command line is too long'
3+
val kotlinVersion = "1.3.41" // need at least 1.3.20 to avoid error 'command line is too long'
44
repositories {
55
gradlePluginPortal()
66
jcenter()

src/main/kotlin/org/droidmate/explorationModel/Actor.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ package org.droidmate.explorationModel
2323
import kotlinx.coroutines.*
2424
import kotlinx.coroutines.channels.*
2525
import kotlin.coroutines.CoroutineContext
26-
import kotlin.coroutines.coroutineContext
2726

2827
// we have exactly one thread who is going to handle our model actors
2928
// (we use an own thread to avoid blocking issues for mono/duo-cores, where the default thread-pool only has size 1)

0 commit comments

Comments
 (0)