diff options
author | bingran <bingran@google.com> | 2023-02-23 11:22:00 -0800 |
---|---|---|
committer | bingran <bingran@google.com> | 2023-02-23 11:22:00 -0800 |
commit | 21b14f9f278ecf3f0e0bb7ecd191a56f4d16610a (patch) | |
tree | 27174e12b1aece2742c10bcc38e872d336f7a9b1 | |
parent | f3e3f32c07651c0e61a0874f9bb1a0ea70dbda9f (diff) | |
download | data-binding-21b14f9f278ecf3f0e0bb7ecd191a56f4d16610a.tar.gz |
Set up repos of dependencies in settings
Bug: 270584807
Test: existing
Change-Id: Ia1d4d25a77d3d3e95d91dcdf62c9bd1457017e6f
19 files changed, 11 insertions, 46 deletions
diff --git a/integration-tests-support/AppWithDataBindingInTests/build.gradle b/integration-tests-support/AppWithDataBindingInTests/build.gradle index 3bb56801..b3396d2e 100644 --- a/integration-tests-support/AppWithDataBindingInTests/build.gradle +++ b/integration-tests-support/AppWithDataBindingInTests/build.gradle @@ -28,6 +28,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests-support/DynamicApp/build.gradle b/integration-tests-support/DynamicApp/build.gradle index 9431377e..7570afb4 100644 --- a/integration-tests-support/DynamicApp/build.gradle +++ b/integration-tests-support/DynamicApp/build.gradle @@ -33,6 +33,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests-support/IndependentLibrary/build.gradle b/integration-tests-support/IndependentLibrary/build.gradle index 86ad4181..2a98d106 100644 --- a/integration-tests-support/IndependentLibrary/build.gradle +++ b/integration-tests-support/IndependentLibrary/build.gradle @@ -12,6 +12,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests-support/MultiModuleTestApp/app/build.gradle b/integration-tests-support/MultiModuleTestApp/app/build.gradle index ac78b666..c80ce12b 100644 --- a/integration-tests-support/MultiModuleTestApp/app/build.gradle +++ b/integration-tests-support/MultiModuleTestApp/app/build.gradle @@ -46,14 +46,6 @@ android { } } -if(project.hasProperty('maven_repo')) { - repositories { - maven { - url "file://${project.getProperty("maven_repo")}" - } - } -} - dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':testlibrary1') diff --git a/integration-tests-support/MultiModuleTestApp/build.gradle b/integration-tests-support/MultiModuleTestApp/build.gradle index 86ad4181..2a98d106 100644 --- a/integration-tests-support/MultiModuleTestApp/build.gradle +++ b/integration-tests-support/MultiModuleTestApp/build.gradle @@ -12,6 +12,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests-support/ProguardedAppWithTest/build.gradle b/integration-tests-support/ProguardedAppWithTest/build.gradle index 86ad4181..2a98d106 100644 --- a/integration-tests-support/ProguardedAppWithTest/build.gradle +++ b/integration-tests-support/ProguardedAppWithTest/build.gradle @@ -12,6 +12,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests-support/TestApp/build.gradle b/integration-tests-support/TestApp/build.gradle index 1eff0475..34549998 100644 --- a/integration-tests-support/TestApp/build.gradle +++ b/integration-tests-support/TestApp/build.gradle @@ -12,7 +12,6 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } @@ -20,4 +19,4 @@ gradle.projectsEvaluated { tasks.withType(JavaCompile) { options.compilerArgs << "-Xmaxerrs" << "500" // or whatever number you want } -}
\ No newline at end of file +} diff --git a/integration-tests-support/ViewBindingTestApp/build.gradle b/integration-tests-support/ViewBindingTestApp/build.gradle index 310ae536..f8fe88e0 100644 --- a/integration-tests-support/ViewBindingTestApp/build.gradle +++ b/integration-tests-support/ViewBindingTestApp/build.gradle @@ -12,7 +12,6 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/AppWithDataBindingInTests/build.gradle b/integration-tests/AppWithDataBindingInTests/build.gradle index 3bb56801..b3396d2e 100644 --- a/integration-tests/AppWithDataBindingInTests/build.gradle +++ b/integration-tests/AppWithDataBindingInTests/build.gradle @@ -28,6 +28,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/DynamicApp/build.gradle b/integration-tests/DynamicApp/build.gradle index 9431377e..7570afb4 100644 --- a/integration-tests/DynamicApp/build.gradle +++ b/integration-tests/DynamicApp/build.gradle @@ -33,6 +33,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/IndependentLibrary/build.gradle b/integration-tests/IndependentLibrary/build.gradle index 86ad4181..2a98d106 100644 --- a/integration-tests/IndependentLibrary/build.gradle +++ b/integration-tests/IndependentLibrary/build.gradle @@ -12,6 +12,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/KotlinTestApp/build.gradle b/integration-tests/KotlinTestApp/build.gradle index d499539e..7a483ba0 100644 --- a/integration-tests/KotlinTestApp/build.gradle +++ b/integration-tests/KotlinTestApp/build.gradle @@ -31,6 +31,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/MultiModuleTestApp/app/build.gradle b/integration-tests/MultiModuleTestApp/app/build.gradle index f2da799d..cd900aa3 100644 --- a/integration-tests/MultiModuleTestApp/app/build.gradle +++ b/integration-tests/MultiModuleTestApp/app/build.gradle @@ -46,14 +46,6 @@ android { } } -if(project.hasProperty('maven_repo')) { - repositories { - maven { - url "file://${project.getProperty("maven_repo")}" - } - } -} - dependencies { implementation fileTree(dir: 'libs', include: ['*.aar']) implementation "androidx.cardview:cardview:1.0.0" diff --git a/integration-tests/MultiModuleTestApp/build.gradle b/integration-tests/MultiModuleTestApp/build.gradle index eb9a4c05..d245b070 100644 --- a/integration-tests/MultiModuleTestApp/build.gradle +++ b/integration-tests/MultiModuleTestApp/build.gradle @@ -12,15 +12,6 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" - } -} - -allprojects { - repositories { - maven { - url "file://${rootProject.projectDir}/testlibrary1/repo" - } } } diff --git a/integration-tests/MultiModuleTestApp/settings.gradle b/integration-tests/MultiModuleTestApp/settings.gradle index bca0c5ca..66c9c793 100644 --- a/integration-tests/MultiModuleTestApp/settings.gradle +++ b/integration-tests/MultiModuleTestApp/settings.gradle @@ -15,3 +15,11 @@ */ include ':app', ':testlibrary1', ':testlibrary2', ':inheritedmodule' + +dependencyResolutionManagement { + repositories { + maven { + url "testlibrary1/repo" + } + } +} diff --git a/integration-tests/ProguardedAppWithTest/build.gradle b/integration-tests/ProguardedAppWithTest/build.gradle index 86ad4181..2a98d106 100644 --- a/integration-tests/ProguardedAppWithTest/build.gradle +++ b/integration-tests/ProguardedAppWithTest/build.gradle @@ -12,6 +12,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/TestApp/build.gradle b/integration-tests/TestApp/build.gradle index 1eff0475..e3f9bb1f 100644 --- a/integration-tests/TestApp/build.gradle +++ b/integration-tests/TestApp/build.gradle @@ -10,14 +10,10 @@ buildscript { } if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" - subprojects { - project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" - } } gradle.projectsEvaluated { tasks.withType(JavaCompile) { options.compilerArgs << "-Xmaxerrs" << "500" // or whatever number you want } -}
\ No newline at end of file +} diff --git a/integration-tests/ViewBindingTestApp/build.gradle b/integration-tests/ViewBindingTestApp/build.gradle index 86ad4181..2a98d106 100644 --- a/integration-tests/ViewBindingTestApp/build.gradle +++ b/integration-tests/ViewBindingTestApp/build.gradle @@ -12,6 +12,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } } diff --git a/integration-tests/ViewBindingWithDataBindingTestApp/build.gradle b/integration-tests/ViewBindingWithDataBindingTestApp/build.gradle index 3594abd4..46e5efd3 100644 --- a/integration-tests/ViewBindingWithDataBindingTestApp/build.gradle +++ b/integration-tests/ViewBindingWithDataBindingTestApp/build.gradle @@ -31,6 +31,5 @@ if (!rootProject.ext.runningInIde) { apply from: "../commonHeader.gradle" subprojects { project.apply from: "../../commonHeader.gradle" - project.apply from: "../../commonLocalRepo.gradle" } -}
\ No newline at end of file +} |