Merge remote-tracking branch 'open/master' into cburlinchon-os-merge-041018

This commit is contained in:
Chris Burlinchon 2018-10-04 12:02:20 +01:00
commit 6f9d4323ef
2 changed files with 1 additions and 7 deletions

View File

@ -79,6 +79,7 @@ dependencies {
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
runtime "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"

View File

@ -11,13 +11,6 @@ processResources {
from file("$rootDir/config/dev/log4j2.xml")
}
configurations {
compile {
// We don't need Hibernate just for its @Type annotation.
exclude group: 'org.hibernate', module: 'hibernate-core'
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"