[Build scripts] be more strict about what we download from jcenter (#2758)

martinbonnin · web-flow · commit 12d3283154aa · 2020-11-17T14:12:30.000+01:00
* be more strict about what we download from jcenter only download org.jetbrains.trove4j:trove4j:20160824 * looks like we don't need jcenter in the main repositories * Revert "looks like we don't need jcenter in the main repositories" We need it for apollo-android-support This reverts commit f3b10f8. * revert to AGP 3.6.2 * fix java sample
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ plugins {
 }
 
 repositories {
-  jcenter()
+  mavenCentral()
 }
 
 dependencies {
diff --git a/apollo-gradle-plugin/src/test/files/gradle/build.gradle.kts.template b/apollo-gradle-plugin/src/test/files/gradle/build.gradle.kts.template
@@ -20,7 +20,11 @@ buildscript {
     }
     google()
     mavenCentral()
-    jcenter()
+    jcenter {
+      content {
+        includeGroup("org.jetbrains.trove4j")
+      }
+    }
   }
   dependencies {
     // ADD BUILDSCRIPT DEPENDENCIES HERE
@@ -47,8 +51,12 @@ repositories {
     url = uri("../../../build/localMaven")
   }
   google() // for aapt2
-  mavenCentral() // for jetbrainsAnnotations, depended on by apolloApi
-  jcenter() // for org.jetbrains.trove4j, depended on by lint
+  mavenCentral()
+  jcenter {
+    content {
+      includeGroup("org.jetbrains.trove4j")
+    }
+  }
 }
 
 dependencies {
diff --git a/apollo-gradle-plugin/src/test/files/gradle/build.gradle.template b/apollo-gradle-plugin/src/test/files/gradle/build.gradle.template
@@ -7,7 +7,11 @@ buildscript {
     }
     google()
     mavenCentral()
-    jcenter()
+    jcenter {
+      content {
+        includeGroup("org.jetbrains.trove4j")
+      }
+    }
   }
   dependencies {
     // ADD BUILDSCRIPT DEPENDENCIES HERE
@@ -26,7 +30,11 @@ repositories {
   }
   google() // for aapt2
   mavenCentral() // for jetbrainsAnnotations, depended on by apolloApi
-  jcenter() // for org.jetbrains.trove4j, depended on by lint
+  jcenter {
+    content {
+      includeGroup("org.jetbrains.trove4j")
+    }
+  }
 }
 
 dependencies {
diff --git a/apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts b/apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts
@@ -2,10 +2,10 @@ buildscript {
     apply(from = "../../../../gradle/dependencies.gradle")
 
     repositories {
-        jcenter()
         maven {
             url = uri("../../../../build/localMaven")
         }
+        mavenCentral()
     }
     dependencies {
         classpath(groovy.util.Eval.x(project, "x.dep.apollo.plugin"))
diff --git a/apollo-gradle-plugin/testProjects/compilationUnitAndroid/build.gradle b/apollo-gradle-plugin/testProjects/compilationUnitAndroid/build.gradle
@@ -7,7 +7,11 @@ buildscript {
     }
     google()
     mavenCentral()
-    jcenter()
+    jcenter {
+      content {
+        includeGroup("org.jetbrains.trove4j")
+      }
+    }
   }
   dependencies {
     classpath(dep.android.plugin)
@@ -19,7 +23,11 @@ repositories {
   maven {
     url = uri("../../../build/localMaven")
   }
-  google() // for aapt2
-  mavenCentral() // for jetbrainsAnnotations, depended on by apolloApi
-  jcenter() // for org.jetbrains.trove4j, depended on by lint
+  google()
+  mavenCentral()
+  jcenter {
+    content {
+      includeGroup("org.jetbrains.trove4j")
+    }
+  }
 }
diff --git a/apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts b/apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
   apply(from = "../../../gradle/dependencies.gradle")
 
   repositories {
-    jcenter()
+    mavenCentral()
     maven {
       url = uri("../../../build/localMaven")
     }
diff --git a/apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts b/apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts
@@ -3,7 +3,7 @@ buildscript {
     apply(from = "../../../gradle/dependencies.gradle")
 
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             url = uri("../../../build/localMaven")
         }
@@ -16,6 +16,6 @@ buildscript {
 
 subprojects {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 }
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-diamond/build.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-diamond/build.gradle.kts
@@ -2,10 +2,10 @@ buildscript {
   apply(from = "../../../gradle/dependencies.gradle")
 
   repositories {
-    jcenter()
     maven {
       url = uri("../../../build/localMaven")
     }
+    mavenCentral()
   }
   dependencies {
     classpath(groovy.util.Eval.x(project, "x.dep.apollo.plugin"))
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-duplicates/build.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-duplicates/build.gradle.kts
@@ -2,10 +2,10 @@ buildscript {
   apply(from = "../../../gradle/dependencies.gradle")
 
   repositories {
-    jcenter()
     maven {
       url = uri("../../../build/localMaven")
     }
+    mavenCentral()
   }
   dependencies {
     classpath(groovy.util.Eval.x(project, "x.dep.apollo.plugin"))
diff --git a/apollo-gradle-plugin/testProjects/multi-modules-transitive/build.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules-transitive/build.gradle.kts
@@ -2,10 +2,10 @@ buildscript {
   apply(from = "../../../gradle/dependencies.gradle")
 
   repositories {
-    jcenter()
     maven {
       url = uri("../../../build/localMaven")
     }
+    mavenCentral()
   }
   dependencies {
     classpath(groovy.util.Eval.x(project, "x.dep.apollo.plugin"))
diff --git a/apollo-gradle-plugin/testProjects/multi-modules/build.gradle.kts b/apollo-gradle-plugin/testProjects/multi-modules/build.gradle.kts
@@ -2,10 +2,10 @@ buildscript {
   apply(from = "../../../gradle/dependencies.gradle")
 
   repositories {
-    jcenter()
     maven {
       url = uri("../../../build/localMaven")
     }
+    mavenCentral()
   }
   dependencies {
     classpath(groovy.util.Eval.x(project, "x.dep.apollo.plugin"))
diff --git a/apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts b/apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts
@@ -8,9 +8,7 @@ buildscript {
         maven {
             url = uri("../../../build/localMaven")
         }
-        google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         classpath(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))
@@ -25,7 +23,6 @@ repositories {
     maven {
         url = uri("../../../build/localMaven")
     }
-    jcenter()
     mavenCentral()
 }
 
diff --git a/apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts b/apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts
@@ -10,9 +10,7 @@ buildscript {
     maven {
       url = uri("../../../build/localMaven")
     }
-    google()
     mavenCentral()
-    jcenter()
   }
   dependencies {
     classpath(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))
@@ -27,7 +25,6 @@ repositories {
   maven {
     url = uri("../../../build/localMaven")
   }
-  jcenter()
   mavenCentral()
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -54,7 +54,11 @@ subprojects {
   repositories {
     google()
     mavenCentral()
-    jcenter() // for trove4j
+    jcenter {
+      content {
+        includeGroup("org.jetbrains.trove4j")
+      }
+    }
   }
 
   group = property("GROUP")!!
@@ -101,7 +105,7 @@ fun Project.configurePublishing() {
     // create the Android javadoc if needed
     javadocTask = tasks.create("javadoc", Javadoc::class.java) {
       source = android.sourceSets["main"].java.sourceFiles
-      classpath += project.files(android.getBootClasspath().joinToString(File.pathSeparator))
+      classpath += project.files(android.bootClasspath.joinToString(File.pathSeparator))
 
       (android as? com.android.build.gradle.LibraryExtension)?.libraryVariants?.configureEach {
         if (name != "release") {
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,7 +9,6 @@ project.apply {
 repositories {
   gradlePluginPortal()
   google()
-  jcenter()
   mavenCentral()
 }
 
diff --git a/composite/build.gradle.kts b/composite/build.gradle.kts
@@ -20,6 +20,10 @@ subprojects {
   repositories {
     google()
     mavenCentral()
-    jcenter()
+    jcenter {
+      content {
+        includeGroup("org.jetbrains.trove4j")
+      }
+    }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ plugins {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`repositories {`
`60`		`- jcenter()`
	`60`	`+ mavenCentral()`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,11 @@ buildscript {`
`7`	`7`	`}`
`8`	`8`	`google()`
`9`	`9`	`mavenCentral()`
`10`		`- jcenter()`
	`10`	`+ jcenter {`
	`11`	`+ content {`
	`12`	`+ includeGroup("org.jetbrains.trove4j")`
	`13`	`+ }`
	`14`	`+ }`
`11`	`15`	`}`
`12`	`16`	`dependencies {`
`13`	`17`	`// ADD BUILDSCRIPT DEPENDENCIES HERE`
`@@ -26,7 +30,11 @@ repositories {`
`26`	`30`	`}`
`27`	`31`	`google() // for aapt2`
`28`	`32`	`mavenCentral() // for jetbrainsAnnotations, depended on by apolloApi`
`29`		`- jcenter() // for org.jetbrains.trove4j, depended on by lint`
	`33`	`+ jcenter {`
	`34`	`+ content {`
	`35`	`+ includeGroup("org.jetbrains.trove4j")`
	`36`	`+ }`
	`37`	`+ }`
`30`	`38`	`}`
`31`	`39`
`32`	`40`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ buildscript {`
`2`	`2`	`apply(from = "../../../../gradle/dependencies.gradle")`
`3`	`3`
`4`	`4`	`repositories {`
`5`		`- jcenter()`
`6`	`5`	`maven {`
`7`	`6`	`url = uri("../../../../build/localMaven")`
`8`	`7`	`}`
	`8`	`+ mavenCentral()`
`9`	`9`	`}`
`10`	`10`	`dependencies {`
`11`	`11`	`classpath(groovy.util.Eval.x(project, "x.dep.apollo.plugin"))`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`apply(from = "../../../gradle/dependencies.gradle")`
`5`	`5`
`6`	`6`	`repositories {`
`7`		`- jcenter()`
	`7`	`+ mavenCentral()`
`8`	`8`	`maven {`
`9`	`9`	`url = uri("../../../build/localMaven")`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ buildscript {`
`3`	`3`	`apply(from = "../../../gradle/dependencies.gradle")`
`4`	`4`
`5`	`5`	`repositories {`
`6`		`- jcenter()`
	`6`	`+ mavenCentral()`
`7`	`7`	`maven {`
`8`	`8`	`url = uri("../../../build/localMaven")`
`9`	`9`	`}`
`@@ -16,6 +16,6 @@ buildscript {`
`16`	`16`
`17`	`17`	`subprojects {`
`18`	`18`	`repositories {`
`19`		`- jcenter()`
	`19`	`+ mavenCentral()`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,7 @@ buildscript {`
`8`	`8`	`maven {`
`9`	`9`	`url = uri("../../../build/localMaven")`
`10`	`10`	`}`
`11`		`- google()`
`12`	`11`	`mavenCentral()`
`13`		`- jcenter()`
`14`	`12`	`}`
`15`	`13`	`dependencies {`
`16`	`14`	`classpath(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))`
`@@ -25,7 +23,6 @@ repositories {`
`25`	`23`	`maven {`
`26`	`24`	`url = uri("../../../build/localMaven")`
`27`	`25`	`}`
`28`		`- jcenter()`
`29`	`26`	`mavenCentral()`
`30`	`27`	`}`
`31`	`28`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,7 @@ buildscript {`
`10`	`10`	`maven {`
`11`	`11`	`url = uri("../../../build/localMaven")`
`12`	`12`	`}`
`13`		`- google()`
`14`	`13`	`mavenCentral()`
`15`		`- jcenter()`
`16`	`14`	`}`
`17`	`15`	`dependencies {`
`18`	`16`	`classpath(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))`
`@@ -27,7 +25,6 @@ repositories {`
`27`	`25`	`maven {`
`28`	`26`	`url = uri("../../../build/localMaven")`
`29`	`27`	`}`
`30`		`- jcenter()`
`31`	`28`	`mavenCentral()`
`32`	`29`	`}`
`33`	`30`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ project.apply {`
`9`	`9`	`repositories {`
`10`	`10`	`gradlePluginPortal()`
`11`	`11`	`google()`
`12`		`- jcenter()`
`13`	`12`	`mavenCentral()`
`14`	`13`	`}`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,10 @@ subprojects {`
`20`	`20`	`repositories {`
`21`	`21`	`google()`
`22`	`22`	`mavenCentral()`
`23`		`- jcenter()`
	`23`	`+ jcenter {`
	`24`	`+ content {`
	`25`	`+ includeGroup("org.jetbrains.trove4j")`
	`26`	`+ }`
	`27`	`+ }`
`24`	`28`	`}`
`25`	`29`	`}`