Skip to content

Commit

Permalink
gradle build refactoring, the platformInterface module now uses kotli…
Browse files Browse the repository at this point in the history
…n-dsl instead of groovy for better version management
  • Loading branch information
Hotzkow committed Jul 24, 2019
1 parent ec4095a commit b31d985
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
13 changes: 11 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,30 @@ dependencies {
compile ("com.github.hotzkow:platformInterfaceLib") {
// in theory it should be 'api', but for some reason that does not work for transitive classpath dependencies
version {
require("[2.4.1,2.5[")
require("[2.4.1, 2.5[")
}
}

implementation ("com.natpryce:konfig:1.6.6.0") // configuration library
implementation ("org.slf4j:slf4j-api:1.7.25")

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

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

// compile bytecode to java 8 (default is java 6)
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
}

tasks.withType<Wrapper> {
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)
}
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

pluginManagement {
val kotlinVersion = "1.3.31" // need at least 1.3.20 to avoid error 'command line is too long'
val kotlinVersion = "1.3.41" // need at least 1.3.20 to avoid error 'command line is too long'
repositories {
gradlePluginPortal()
jcenter()
Expand Down
1 change: 0 additions & 1 deletion src/main/kotlin/org/droidmate/explorationModel/Actor.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ package org.droidmate.explorationModel
import kotlinx.coroutines.*
import kotlinx.coroutines.channels.*
import kotlin.coroutines.CoroutineContext
import kotlin.coroutines.coroutineContext

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

0 comments on commit b31d985

Please sign in to comment.