Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26e2fe7
be more strict about what we download from jcenter
martinbonnin Nov 16, 2020
f3b10f8
looks like we don't need jcenter in the main repositories
martinbonnin Nov 16, 2020
ed8ae90
Revert "looks like we don't need jcenter in the main repositories"
martinbonnin Nov 16, 2020
42a2ad0
revert to AGP 3.6.2
martinbonnin Nov 16, 2020
b323d2d
fix java sample
martinbonnin Nov 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ plugins {
}

repositories {
jcenter()
mavenCentral()
}

dependencies {
Expand Down
14 changes: 11 additions & 3 deletions apollo-gradle-plugin/src/test/files/gradle/build.gradle.kts.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ buildscript {
}
google()
mavenCentral()
jcenter()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
dependencies {
// ADD BUILDSCRIPT DEPENDENCIES HERE
Expand All @@ -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 {
Expand Down
12 changes: 10 additions & 2 deletions apollo-gradle-plugin/src/test/files/gradle/build.gradle.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ buildscript {
}
google()
mavenCentral()
jcenter()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
dependencies {
// ADD BUILDSCRIPT DEPENDENCIES HERE
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion apollo-gradle-plugin/testProjects/buildCache/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
16 changes: 12 additions & 4 deletions apollo-gradle-plugin/testProjects/compilationUnitAndroid/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ buildscript {
}
google()
mavenCentral()
jcenter()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
dependencies {
classpath(dep.android.plugin)
Expand All @@ -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")
}
}
}
2 changes: 1 addition & 1 deletion apollo-gradle-plugin/testProjects/deprecationWarnings/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
apply(from = "../../../gradle/dependencies.gradle")

repositories {
jcenter()
mavenCentral()
maven {
url = uri("../../../build/localMaven")
}
Expand Down
4 changes: 2 additions & 2 deletions apollo-gradle-plugin/testProjects/mismatchedVersions/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ buildscript {
apply(from = "../../../gradle/dependencies.gradle")

repositories {
jcenter()
mavenCentral()
maven {
url = uri("../../../build/localMaven")
}
Expand All @@ -16,6 +16,6 @@ buildscript {

subprojects {
repositories {
jcenter()
mavenCentral()
}
}
2 changes: 1 addition & 1 deletion apollo-gradle-plugin/testProjects/multi-modules-diamond/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion apollo-gradle-plugin/testProjects/multi-modules-duplicates/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion apollo-gradle-plugin/testProjects/multi-modules-transitive/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion apollo-gradle-plugin/testProjects/multi-modules/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
3 changes: 0 additions & 3 deletions apollo-gradle-plugin/testProjects/multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ buildscript {
maven {
url = uri("../../../build/localMaven")
}
google()
mavenCentral()
jcenter()
}
dependencies {
classpath(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))
Expand All @@ -25,7 +23,6 @@ repositories {
maven {
url = uri("../../../build/localMaven")
}
jcenter()
mavenCentral()
}

Expand Down
3 changes: 0 additions & 3 deletions apollo-gradle-plugin/testProjects/operationIds/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ buildscript {
maven {
url = uri("../../../build/localMaven")
}
google()
mavenCentral()
jcenter()
}
dependencies {
classpath(groovy.util.Eval.x(project, "x.dep.kotlin.plugin"))
Expand All @@ -27,7 +25,6 @@ repositories {
maven {
url = uri("../../../build/localMaven")
}
jcenter()
mavenCentral()
}

Expand Down
8 changes: 6 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ subprojects {
repositories {
google()
mavenCentral()
jcenter() // for trove4j
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}

group = property("GROUP")!!
Expand Down Expand Up @@ -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") {
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ project.apply {
repositories {
gradlePluginPortal()
google()
jcenter()
mavenCentral()
}

Expand Down
6 changes: 5 additions & 1 deletion composite/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ subprojects {
repositories {
google()
mavenCentral()
jcenter()
jcenter {
content {
includeGroup("org.jetbrains.trove4j")
}
}
}
}