Skip to content

Commit 1e95c86

Browse files
cortinicofacebook-github-bot
authored andcommitted
Update project to build on Gradle 7.0.2 (#32073)
Summary: Pull Request resolved: #32073 This Diff bumps the version of Gradle used to build the project to 7.0.2. Ideally we could bump to 7.2.x directly, but I'll do one minor version at a time to exclude potential build problems. This diff is addressing all the extra build warnings that got raised by the new version. Changelog: [Android][Changed] - Bumped Gradle project version to 7.0.2 Reviewed By: ShikaSD Differential Revision: D30486612 fbshipit-source-id: 78391600fcd13adf7922d44565a4938aa8249625
1 parent 2e8893f commit 1e95c86

File tree

8 files changed

+191
-185
lines changed

8 files changed

+191
-185
lines changed

ReactAndroid/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
5656

5757
task prepareBoost(dependsOn: boostPath ? [] : [downloadBoost], type: Copy) {
5858
from(boostPath ?: tarTree(resources.gzip(downloadBoost.dest)))
59-
from("src/main/jni/third-party/boost/Android.mk")
6059
from("src/main/jni/third-party/boost")
6160
include("Android.mk", "boost_${BOOST_VERSION}/boost/**/*.hpp", "boost/boost/**/*.hpp", "asm/**/*.S")
6261
includeEmptyDirs = false
@@ -171,6 +170,7 @@ task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
171170
// Prepare glog sources to be compiled, this task will perform steps that normally should've been
172171
// executed by automake. This way we can avoid dependencies on make/automake
173172
task prepareGlog(dependsOn: dependenciesPath ? [] : [downloadGlog], type: Copy) {
173+
duplicatesStrategy("warn")
174174
from(dependenciesPath ?: tarTree(downloadGlog.dest))
175175
from("src/main/jni/third-party/glog/")
176176
include("glog-${GLOG_VERSION}/src/**/*", "Android.mk", "config.h")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew.bat

Lines changed: 89 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

packages/react-native-codegen/android/gradlew.bat

Lines changed: 89 additions & 89 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)