Skip to content

Commit

Permalink
Bump build and all deps to latest.
Browse files Browse the repository at this point in the history
  • Loading branch information
nedtwigg committed Jun 12, 2021
1 parent c56dc1e commit 4a21db4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
18 changes: 8 additions & 10 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ spotlessChangelog {
ifFoundBumpAdded '### Added', '### Changed'
}
apply from: 干.file('base/changelog.gradle')
apply from: 干.file('spotless/freshmark.gradle')

apply from: 干.file('base/java8.gradle')
apply from: 干.file('spotless/java.gradle')

apply from: 干.file('base/gradle-plugin.gradle')
apply from: 干.file('base/maven.gradle')
apply from: 干.file('base/bintray.gradle')
apply from: 干.file('base/sonatype.gradle')
apply from: 干.file('spotless/freshmark.gradle')
apply from: 干.file('spotless/java.gradle')

test.testLogging.exceptionFormat = 'full'

Expand All @@ -26,12 +24,12 @@ dependencies {
implementation 'com.diffplug.durian:durian-collect:1.2.0'
implementation 'com.diffplug.durian:durian-io:1.2.0'
// svg
implementation 'org.apache.xmlgraphics:batik-rasterizer:1.12'
implementation 'org.apache.xmlgraphics:batik-codec:1.12'
implementation 'org.apache.xmlgraphics:batik-rasterizer:1.14'
implementation 'org.apache.xmlgraphics:batik-codec:1.14'
// testing
testImplementation 'junit:junit:4.13'
testImplementation 'org.assertj:assertj-core:3.14.0'
testImplementation 'org.assertj:assertj-swing-junit:3.9.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.assertj:assertj-core:3.19.0'
testImplementation 'org.assertj:assertj-swing-junit:3.17.1'
// we'll want the findbugs annotations (they don't have a 3.0.1 version)
compileOnly 'com.google.code.findbugs:annotations:3.0.1'
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
Expand Down
28 changes: 15 additions & 13 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
pluginManagement {
plugins {
id 'com.diffplug.blowdryer' version '1.0.0'
id 'com.diffplug.blowdryerSetup' version '1.0.0'
id 'com.diffplug.eclipse.mavencentral' version '3.21.0'
id 'com.diffplug.gradle.spotless' version '3.27.1'
id 'com.diffplug.spotless-changelog' version '1.0.0'
id 'com.gradle.plugin-publish' version '0.10.1'
id 'com.jfrog.bintray' version '1.8.4'
id 'com.diffplug.blowdryer' version '1.1.1'
id 'com.diffplug.blowdryerSetup' version '1.1.1'
id 'com.diffplug.osgi.bndmanifest' version '3.29.1'
id 'com.diffplug.spotless-changelog' version '2.2.0'
id 'com.diffplug.spotless' version '5.13.0'
id 'com.gradle.plugin-publish' version '0.15.0'
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
id 'org.jdrupes.mdoclet' version '1.0.10'
}
}
plugins {
id 'com.diffplug.blowdryerSetup'
id 'com.diffplug.eclipse.mavencentral' apply false
id 'com.diffplug.gradle.spotless' apply false
id 'com.diffplug.spotless-changelog' apply false
id 'com.gradle.plugin-publish' apply false
id 'com.jfrog.bintray' apply false
id 'com.diffplug.osgi.bndmanifest' apply false
id 'com.diffplug.spotless-changelog' apply false
id 'com.diffplug.spotless' apply false
id 'com.gradle.plugin-publish' apply false
id 'io.github.gradle-nexus.publish-plugin' apply false
id 'org.jdrupes.mdoclet' apply false
}
blowdryerSetup {
github 'diffplug/blowdryer-diffplug', 'tag', '3.1.0'
github 'diffplug/blowdryer-diffplug', 'tag', '5.0.2'
//devLocal '../blowdryer-diffplug'
}
rootProject.name = 'image-grinder'

0 comments on commit 4a21db4

Please sign in to comment.