Bump Gradle version

Reviewed By: oprisnik

Differential Revision: D20386710

fbshipit-source-id: a87337aa55d92ea61f3056332b5145cdb5d39fd3

.circleci/config.yml

@@ -32,10 +32,9 @@ executors:
     environment:
       - TERM: dumb
       - ADB_INSTALL_TIMEOUT: 10
-      - _JAVA_OPTIONS: -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
-      - GRADLE_OPTS: -Xmx1536m -Dkotlin.incremental=false -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.caching=true -Dkotlin.compiler.execution.strategy=in-process
+      - _JAVA_OPTIONS: -Xmx4g -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
+      - GRADLE_OPTS: -Dkotlin.incremental=false -Dorg.gradle.daemon=true -Dorg.gradle.jvmargs="-XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.caching=true -Dkotlin.compiler.execution.strategy=in-process
       - BUILD_THREADS: 2
-      - JVM_OPTS: -Xmx2048m
 
 commands:
   setup-emulator:

gradle.properties

@@ -22,16 +22,13 @@ target=10
 VERSION_NAME=2.2.0
 GROUP=com.facebook.fresco
 
-# Robolectric 4.x
-android.enableUnitTestBinaryResources=true
-
 # AndroidX support
 android.useAndroidX=true
 android.enableJetifier=true
 
 # Deps for Gradle
 BUILD_TOOLS_VERSION=28.0.3
-ANDROID_GRADLE_PLUGIN_VERSION=3.5.3
+ANDROID_GRADLE_PLUGIN_VERSION=3.6.1
 
 # SDK versions
 MIN_SDK_VERSION=9

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Fri Jan 31 11:48:05 GMT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

gradlew

@@ -7,7 +7,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#      https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -125,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -5,7 +5,7 @@
 @rem you may not use this file except in compliance with the License.
 @rem You may obtain a copy of the License at
 @rem
-@rem      http://www.apache.org/licenses/LICENSE-2.0
+@rem      https://www.apache.org/licenses/LICENSE-2.0
 @rem
 @rem Unless required by applicable law or agreed to in writing, software
 @rem distributed under the License is distributed on an "AS IS" BASIS,