diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt index 538d87147da..26a5eb07eb7 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt @@ -67,7 +67,7 @@ class ReactPlugin : Plugin { val versionString = versionAndGroupStrings.first val groupString = versionAndGroupStrings.second configureDependencies(project, versionString, groupString) - configureRepositories(project, reactNativeDir) + configureRepositories(project) } configureReactNativeNdk(project, extension) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt index 0f71d0c2b53..d9cc0f7be27 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt @@ -27,7 +27,7 @@ internal object DependencyUtils { * This method takes care of configuring the repositories{} block for both the app and all the 3rd * party libraries which are auto-linked. */ - fun configureRepositories(project: Project, reactNativeDir: File) { + fun configureRepositories(project: Project) { project.rootProject.allprojects { eachProject -> with(eachProject) { if (hasProperty(INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO)) { diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt index a75eb412072..155f18b44e0 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt @@ -34,7 +34,7 @@ class DependencyUtilsTest { val project = createProject() project.extensions.extraProperties.set("react.internal.mavenLocalRepo", localMaven.absolutePath) - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -48,7 +48,7 @@ class DependencyUtilsTest { val repositoryURI = URI.create("https://oss.sonatype.org/content/repositories/snapshots/") val project = createProject() - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -62,7 +62,7 @@ class DependencyUtilsTest { val repositoryURI = URI.create("https://repo.maven.apache.org/maven2/") val project = createProject() - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -76,7 +76,7 @@ class DependencyUtilsTest { val repositoryURI = URI.create("https://dl.google.com/dl/android/maven2/") val project = createProject() - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -90,7 +90,7 @@ class DependencyUtilsTest { val repositoryURI = URI.create("https://www.jitpack.io") val project = createProject() - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -105,7 +105,7 @@ class DependencyUtilsTest { var project = createProject() project.extensions.extraProperties.set("includeJitpackRepository", "false") - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -117,7 +117,7 @@ class DependencyUtilsTest { project = createProject() project.extensions.extraProperties.set("react.includeJitpackRepository", "false") - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -132,7 +132,7 @@ class DependencyUtilsTest { var project = createProject() project.extensions.extraProperties.set("includeJitpackRepository", "true") - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -144,7 +144,7 @@ class DependencyUtilsTest { project = createProject() project.extensions.extraProperties.set("react.includeJitpackRepository", "true") - configureRepositories(project, tempFolder.root) + configureRepositories(project) assertThat( project.repositories.firstOrNull { @@ -161,7 +161,7 @@ class DependencyUtilsTest { val project = createProject() project.extensions.extraProperties.set("react.internal.mavenLocalRepo", localMaven.absolutePath) - configureRepositories(project, tempFolder.root) + configureRepositories(project) val indexOfLocalRepo = project.repositories.indexOfFirst { @@ -180,7 +180,7 @@ class DependencyUtilsTest { val mavenCentralURI = URI.create("https://repo.maven.apache.org/maven2/") val project = createProject() - configureRepositories(project, tempFolder.root) + configureRepositories(project) val indexOfSnapshotRepo = project.repositories.indexOfFirst { @@ -200,7 +200,7 @@ class DependencyUtilsTest { val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build() val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build() - configureRepositories(appProject, tempFolder.root) + configureRepositories(appProject) assertThat( appProject.repositories.firstOrNull { @@ -226,7 +226,7 @@ class DependencyUtilsTest { repo.content { content -> content.excludeGroup("com.facebook.react") } } - configureRepositories(appProject, tempFolder.root) + configureRepositories(appProject) // We need to make sure we have Maven Central defined twice, one by the library, // and another is the override by RNGP.