Build: Remove configureJvmProject helper for groovy script
It duplicates allprojects configuration done in root project
This commit is contained in:
@@ -1,29 +1,3 @@
|
|||||||
ext.configureJvmProject = { Project project ->
|
|
||||||
project.configure(project) {
|
|
||||||
configurations {
|
|
||||||
sources
|
|
||||||
}
|
|
||||||
|
|
||||||
task sourcesJar(type: Jar, dependsOn: classes) {
|
|
||||||
classifier = 'sources'
|
|
||||||
from sourceSets.main.kotlin
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(JavaCompile) {
|
|
||||||
options.fork = true
|
|
||||||
options.forkOptions.javaHome = file(JDK_18)
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.withType(project.compileKotlin.class) {
|
|
||||||
kotlinOptions.jdkHome = JDK_18
|
|
||||||
}
|
|
||||||
|
|
||||||
test {
|
|
||||||
executable = "$JDK_16/bin/java"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ext.configureJavaOnlyJvm6Project = { Project project ->
|
ext.configureJavaOnlyJvm6Project = { Project project ->
|
||||||
project.tasks.withType(JavaCompile) {
|
project.tasks.withType(JavaCompile) {
|
||||||
sourceCompatibility = 1.6
|
sourceCompatibility = 1.6
|
||||||
@@ -207,6 +181,10 @@ ext.configurePublishing = { Project project ->
|
|||||||
}
|
}
|
||||||
|
|
||||||
allprojects { project ->
|
allprojects { project ->
|
||||||
|
project.ext.configureSourcesJar = { lambda = {} ->
|
||||||
|
ArtifactsKt.sourcesJar(project, lambda)
|
||||||
|
}
|
||||||
|
|
||||||
project.ext.configureJavadocJar = { lambda = {} ->
|
project.ext.configureJavadocJar = { lambda = {} ->
|
||||||
ArtifactsKt.javadocJar(project, lambda)
|
ArtifactsKt.javadocJar(project, lambda)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
apply plugin: 'jps-compatible'
|
apply plugin: 'jps-compatible'
|
||||||
|
|
||||||
configureJvmProject(project)
|
|
||||||
configurePublishing(project)
|
configurePublishing(project)
|
||||||
|
|
||||||
pill {
|
pill {
|
||||||
@@ -35,11 +34,7 @@ jar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
|
configureSourcesJar()
|
||||||
artifacts {
|
|
||||||
archives sourcesJar
|
|
||||||
}
|
|
||||||
|
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|
||||||
pluginBundle {
|
pluginBundle {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
apply plugin: 'jps-compatible'
|
apply plugin: 'jps-compatible'
|
||||||
|
|
||||||
configureJvmProject(project)
|
|
||||||
configurePublishing(project)
|
configurePublishing(project)
|
||||||
|
|
||||||
compileJava {
|
compileJava {
|
||||||
@@ -41,11 +40,7 @@ jar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
|
configureSourcesJar()
|
||||||
artifacts {
|
|
||||||
archives sourcesJar
|
|
||||||
}
|
|
||||||
|
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|
||||||
pluginBundle {
|
pluginBundle {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
apply plugin: 'jps-compatible'
|
apply plugin: 'jps-compatible'
|
||||||
|
|
||||||
configureJvmProject(project)
|
|
||||||
configurePublishing(project)
|
configurePublishing(project)
|
||||||
|
|
||||||
compileJava {
|
compileJava {
|
||||||
@@ -41,11 +40,7 @@ jar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
|
configureSourcesJar()
|
||||||
artifacts {
|
|
||||||
archives sourcesJar
|
|
||||||
}
|
|
||||||
|
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|
||||||
test.executable = "${JDK_18}/bin/java"
|
test.executable = "${JDK_18}/bin/java"
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
|
|
||||||
configureJvmProject(project)
|
|
||||||
configurePublishing(project)
|
configurePublishing(project)
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -19,9 +18,5 @@ jar.configure {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ArtifactsKt.runtimeJar(project, jar, {})
|
ArtifactsKt.runtimeJar(project, jar, {})
|
||||||
|
configureSourcesJar()
|
||||||
artifacts {
|
|
||||||
archives sourcesJar
|
|
||||||
}
|
|
||||||
|
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
apply plugin: 'kotlin'
|
apply plugin: 'kotlin'
|
||||||
apply plugin: 'jps-compatible'
|
apply plugin: 'jps-compatible'
|
||||||
|
|
||||||
configureJvmProject(project)
|
|
||||||
configurePublishing(project)
|
configurePublishing(project)
|
||||||
|
|
||||||
pill {
|
pill {
|
||||||
@@ -29,11 +28,7 @@ jar {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||||
|
configureSourcesJar()
|
||||||
artifacts {
|
|
||||||
archives sourcesJar
|
|
||||||
}
|
|
||||||
|
|
||||||
configureJavadocJar()
|
configureJavadocJar()
|
||||||
|
|
||||||
pluginBundle {
|
pluginBundle {
|
||||||
|
|||||||
Reference in New Issue
Block a user