Improve gradle scripts (exclude :modules project from Java-based ones)
This commit is contained in:
@@ -2,7 +2,7 @@ plugins {
|
||||
id 'org.jetbrains.kotlin.jvm' version '1.3.61' apply false
|
||||
}
|
||||
|
||||
allprojects {
|
||||
configure(subprojects - project(':modules')) {
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'org.jetbrains.kotlin.jvm'
|
||||
|
||||
@@ -30,13 +30,13 @@ repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
clean {
|
||||
task clean {
|
||||
dependsOn ':app:clean'
|
||||
dependsOn ':api:clean'
|
||||
dependsOn ':modules:clean'
|
||||
}
|
||||
|
||||
build {
|
||||
task build {
|
||||
dependsOn ':app:jar'
|
||||
dependsOn ':api:build'
|
||||
dependsOn ':modules:build'
|
||||
|
||||
@@ -1,6 +1,25 @@
|
||||
subprojects {
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'org.jetbrains.kotlin.jvm'
|
||||
apply plugin: 'kotlin-kapt'
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
group 'io.bartek'
|
||||
version '1.0-SNAPSHOT'
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
|
||||
compileKotlin {
|
||||
kotlinOptions.jvmTarget = "1.8"
|
||||
}
|
||||
compileTestKotlin {
|
||||
kotlinOptions.jvmTarget = "1.8"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// compileOnly important!!! We do not want to put the api into the zip file since the main program has it already!
|
||||
compileOnly project(':api')
|
||||
@@ -40,7 +59,7 @@ subprojects {
|
||||
}
|
||||
}
|
||||
|
||||
clean {
|
||||
task clean {
|
||||
dependsOn subprojects.clean
|
||||
}
|
||||
|
||||
@@ -48,4 +67,6 @@ task assemblePlugins(type: Copy) {
|
||||
dependsOn subprojects.assemblePlugin
|
||||
}
|
||||
|
||||
build.dependsOn assemblePlugins
|
||||
task build {
|
||||
dependsOn assemblePlugins
|
||||
}
|
||||
Reference in New Issue
Block a user