Merge branch 'main' into feat/fix-ci

nedtwigg · web-flow · commit af33fda7c664 · 2021-11-08T22:00:20.000-08:00
diff --git a/settings.gradle b/settings.gradle
@@ -9,7 +9,9 @@ pluginManagement {
 		id 'com.github.spotbugs'                   version '4.7.8'
 		// https://github.com/diffplug/spotless-changelog
 		id 'com.diffplug.spotless-changelog'       version '2.2.0'
-		// https://github.com/gradle/test-retry-gradle-plugin/releases
+		// https://github.com/diffplug/goomph/blob/main/CHANGES.md
+		id 'com.diffplug.p2.asmaven'               version '3.33.2'
+    // https://github.com/gradle/test-retry-gradle-plugin/releases
 		id 'org.gradle.test-retry'                 version '1.3.1'
 	}
 }
@@ -19,6 +21,7 @@ plugins {
 	id 'io.github.gradle-nexus.publish-plugin' apply false
 	id 'com.github.spotbugs'                   apply false
 	id 'com.diffplug.spotless-changelog'       apply false
+	id 'com.diffplug.p2.asmaven'               apply false
 	id 'org.gradle.test-retry'                 apply false
 }
 if (System.env['CI'] != null) {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ pluginManagement {`
`9`	`9`	`id 'com.github.spotbugs' version '4.7.8'`
`10`	`10`	`// https://github.com/diffplug/spotless-changelog`
`11`	`11`	`id 'com.diffplug.spotless-changelog' version '2.2.0'`
`12`		`- // https://github.com/gradle/test-retry-gradle-plugin/releases`
	`12`	`+ // https://github.com/diffplug/goomph/blob/main/CHANGES.md`
	`13`	`+ id 'com.diffplug.p2.asmaven' version '3.33.2'`
	`14`	`+ // https://github.com/gradle/test-retry-gradle-plugin/releases`
`13`	`15`	`id 'org.gradle.test-retry' version '1.3.1'`
`14`	`16`	`}`
`15`	`17`	`}`
`@@ -19,6 +21,7 @@ plugins {`
`19`	`21`	`id 'io.github.gradle-nexus.publish-plugin' apply false`
`20`	`22`	`id 'com.github.spotbugs' apply false`
`21`	`23`	`id 'com.diffplug.spotless-changelog' apply false`
	`24`	`+ id 'com.diffplug.p2.asmaven' apply false`
`22`	`25`	`id 'org.gradle.test-retry' apply false`
`23`	`26`	`}`
`24`	`27`	`if (System.env['CI'] != null) {`