Removed deprecated jcenter. Added mavenLocal before mavenCentral in some missing cases. Fixed deprecated reports html enabled to required.

mperry · mperry · commit 93c0403576be · 2022-02-17T23:25:47.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ apply plugin: "com.github.ben-manes.versions"
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
         mavenCentral()
+        gradlePluginPortal()
     }
 
     dependencies {
@@ -83,9 +83,8 @@ allprojects {
     }
 
     repositories {
-        jcenter()
-        mavenCentral()
         mavenLocal()
+        mavenCentral()
     }
 
 	version = fjVersion
@@ -98,6 +97,7 @@ subprojects {
 
     buildscript {
         repositories {
+            mavenLocal()
             mavenCentral()
         }
     }
@@ -108,7 +108,6 @@ subprojects {
 
 	repositories {
         mavenLocal()
-        jcenter()
 		mavenCentral()
 		maven {
 			url sonatypeRepositoryUrl
@@ -124,8 +123,8 @@ subprojects {
     tasks.withType(Test).configureEach {
         maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
         if (!generateTestReports) {
-            reports.html.enabled = false
-            reports.junitXml.enabled = false
+            reports.html.required = false
+            reports.junitXml.required = false
         }
     }
 
@@ -141,8 +140,8 @@ task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {
     getSourceDirectories().from(files(subprojects.findAll {subproject -> subproject.name in projectForFoverage} .sourceSets.main.allSource.srcDirs))
 
     reports {
-        html.enabled = true
-        xml.enabled = true
+        html.required = true
+        xml.required = true
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ apply plugin: "com.github.ben-manes.versions"`
`6`	`6`	`buildscript {`
`7`	`7`	`repositories {`
`8`	`8`	`mavenLocal()`
`9`		`- jcenter()`
`10`	`9`	`mavenCentral()`
	`10`	`+ gradlePluginPortal()`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`dependencies {`
`@@ -83,9 +83,8 @@ allprojects {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`repositories {`
`86`		`- jcenter()`
`87`		`- mavenCentral()`
`88`	`86`	`mavenLocal()`
	`87`	`+ mavenCentral()`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`version = fjVersion`
`@@ -98,6 +97,7 @@ subprojects {`
`98`	`97`
`99`	`98`	`buildscript {`
`100`	`99`	`repositories {`
	`100`	`+ mavenLocal()`
`101`	`101`	`mavenCentral()`
`102`	`102`	`}`
`103`	`103`	`}`
`@@ -108,7 +108,6 @@ subprojects {`
`108`	`108`
`109`	`109`	`repositories {`
`110`	`110`	`mavenLocal()`
`111`		`- jcenter()`
`112`	`111`	`mavenCentral()`
`113`	`112`	`maven {`
`114`	`113`	`url sonatypeRepositoryUrl`
`@@ -124,8 +123,8 @@ subprojects {`
`124`	`123`	`tasks.withType(Test).configureEach {`
`125`	`124`	`maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1`
`126`	`125`	`if (!generateTestReports) {`
`127`		`- reports.html.enabled = false`
`128`		`- reports.junitXml.enabled = false`
	`126`	`+ reports.html.required = false`
	`127`	`+ reports.junitXml.required = false`
`129`	`128`	`}`
`130`	`129`	`}`
`131`	`130`
`@@ -141,8 +140,8 @@ task coverage(type: org.gradle.testing.jacoco.tasks.JacocoReport) {`
`141`	`140`	`getSourceDirectories().from(files(subprojects.findAll {subproject -> subproject.name in projectForFoverage} .sourceSets.main.allSource.srcDirs))`
`142`	`141`
`143`	`142`	`reports {`
`144`		`- html.enabled = true`
`145`		`- xml.enabled = true`
	`143`	`+ html.required = true`
	`144`	`+ xml.required = true`
`146`	`145`	`}`
`147`	`146`	`}`
`148`	`147`