🤪 Various improvements

This commit is contained in:
2018-06-13 19:19:30 +02:00
parent 2bc6abf42c
commit 701282099a
9 changed files with 98 additions and 44 deletions

View File

@@ -1,6 +1,6 @@
buildscript {
ext.kotlin_version = '1.2.0'
ext {
kotlin_version = '1.2.41'
springBootVersion = '2.0.0.M7'
}
repositories {
@@ -9,17 +9,16 @@ buildscript {
jcenter()
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
classpath("org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion")
classpath('se.transmode.gradle:gradle-docker:1.2')
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
classpath("org.jetbrains.kotlin:kotlin-allopen:$kotlin_version")
classpath('com.github.ben-manes:gradle-versions-plugin:0.17.0')
}
}
group = 'dissem'
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'kotlin-spring'
apply plugin: 'eclipse'
@@ -51,23 +50,24 @@ dependencies {
compile("org.springframework.boot:spring-boot-starter-web")
compile("io.springfox:springfox-swagger2:2.7.0")
compile("io.springfox:springfox-swagger-ui:2.7.0")
compile("com.fasterxml.jackson.module:jackson-module-kotlin:")
compile "ch.dissem.jabit:jabit-core:$jabitVersion"
compile "ch.dissem.jabit:jabit-networking:$jabitVersion"
compile "ch.dissem.jabit:jabit-repositories:$jabitVersion"
compile "ch.dissem.jabit:jabit-cryptography-bouncy:$jabitVersion"
compile "ch.dissem.jabit:jabit-extensions:$jabitVersion"
compile("ch.dissem.jabit:jabit-core:$jabitVersion")
compile("ch.dissem.jabit:jabit-networking:$jabitVersion")
compile("ch.dissem.jabit:jabit-repositories:$jabitVersion")
compile("ch.dissem.jabit:jabit-cryptography-bouncy:$jabitVersion")
compile("ch.dissem.jabit:jabit-extensions:$jabitVersion")
compile 'com.h2database:h2:1.4.194'
compile('com.h2database:h2:1.4.194')
compile 'com.google.zxing:core:3.3.1'
compile('com.google.zxing:core:3.3.1')
providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
testCompile("org.springframework.boot:spring-boot-starter-test")
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version")
compile("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version")
compile("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version")
compile("org.jetbrains.kotlin:kotlin-reflect:$kotlin_version")
}
@@ -92,25 +92,24 @@ task buildDocker(type: Docker, dependsOn: build) {
jar {
baseName = 'jabit-server'
}
//frontend:build will be run before processResources
processResources {
dependsOn('frontend:build')
from('frontend/dist') {
//Public is a default supported Spring Boot resources directory.
into 'public'
}
}
//frontend:build will be run before the processResources
processResources.dependsOn('frontend:build')
task wrapper(type: Wrapper) {
gradleVersion = '2.3'
}
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
kotlinOptions.jvmTarget = "1.8"
}
compileTestKotlin {
kotlinOptions {
jvmTarget = "1.8"
}
kotlinOptions.jvmTarget = "1.8"
}