Skip to content

Commit

Permalink
(chore) More plugin updates and a few config changes to satisfy Gradl…
Browse files Browse the repository at this point in the history
…e 5 in the future.
  • Loading branch information
John Engelman committed Sep 16, 2018
1 parent 275382c commit d7af1d3
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 2 deletions.
16 changes: 15 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.2"
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5"
classpath "com.gradle.publish:plugin-publish-plugin:0.10.0"
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.11'
Expand Down Expand Up @@ -97,3 +97,17 @@ task downloadDependencies(type: Exec) {
}

tasks.build.dependsOn tasks.shadowJar

project.tasks.withType(JavaCompile) {
// This will be the default in Gradle 5.0
if (!options.compilerArgs.contains("-processor")) {
options.compilerArgs << '-proc:none'
}
}

project.tasks.withType(GroovyCompile) {
// This will be the default in Gradle 5.0
if (!options.compilerArgs.contains("-processor")) {
options.compilerArgs << '-proc:none'
}
}
14 changes: 14 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,17 @@ sourceSets {
resources.srcDirs = ['../src/main/resources']
}
}

project.tasks.withType(JavaCompile) {
// This will be the default in Gradle 5.0
if (!options.compilerArgs.contains("-processor")) {
options.compilerArgs << '-proc:none'
}
}

project.tasks.withType(GroovyCompile) {
// This will be the default in Gradle 5.0
if (!options.compilerArgs.contains("-processor")) {
options.compilerArgs << '-proc:none'
}
}
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dependencies {

shadow localGroovy()
shadow gradleApi()
shadow 'org.codehaus.groovy:groovy-backports-compat23:2.4.4'
shadow 'org.codehaus.groovy:groovy-backports-compat23:2.4.15'

compile 'org.jdom:jdom2:2.0.6'
compile 'org.ow2.asm:asm:6.2.1'
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
rootProject.name = 'shadow'
enableFeaturePreview('STABLE_PUBLISHING')

0 comments on commit d7af1d3

Please sign in to comment.