Added FrescoConfig for build setup to buildSrc and use for build tools

oprisnik · facebook-github-bot · commit 4d59ffe552a3 · 2020-03-27T08:34:25.000-07:00
Summary: We want to move to buildSrc, so I've added a FrescoConfig for SDK / build tools setup.

Reviewed By: passy

Differential Revision: D20675749

fbshipit-source-id: ba03abd3b41c48fe1fc617c6a094e6f2eca05020
diff --git a/animated-base-test/build.gradle b/animated-base-test/build.gradle
@@ -32,7 +32,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/animated-base/build.gradle b/animated-base/build.gradle
@@ -43,7 +43,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/animated-drawable/build.gradle b/animated-drawable/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/animated-gif-lite/build.gradle b/animated-gif-lite/build.gradle
@@ -19,7 +19,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/animated-gif/build.gradle b/animated-gif/build.gradle
@@ -43,7 +43,7 @@ task fetchNativeDeps(dependsOn: [copyGiflib]) {
 android {
     def ndkLibs = [['gifimage', [copyGiflib]]]
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/animated-webp/build.gradle b/animated-webp/build.gradle
@@ -36,7 +36,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/build.gradle b/build.gradle
@@ -53,7 +53,6 @@ plugins {
 }
 
 project.ext {
-    buildToolsVersion = "${BUILD_TOOLS_VERSION}"
     compileSdkVersion = COMPILE_SDK_VERSION.toInteger()
     minSdkVersion = MIN_SDK_VERSION
     samplesMinSdkVersion = SAMPLES_MIN_SDK_VERSION
diff --git a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/FrescoConfig.kt b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/FrescoConfig.kt
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+object FrescoConfig {
+    const val buildToolsVersion = "28.0.3"
+}
diff --git a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt
@@ -8,7 +8,7 @@
 package com.facebook.fresco.buildsrc
 
 object GradleDeps {
-
+    
     object Android {
         private const val version = "3.5.3"
 
diff --git a/drawee-backends/drawee-pipeline/build.gradle b/drawee-backends/drawee-pipeline/build.gradle
@@ -33,7 +33,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/drawee-backends/drawee-volley/build.gradle b/drawee-backends/drawee-volley/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/drawee-span/build.gradle b/drawee-span/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/drawee/build.gradle b/drawee/build.gradle
@@ -36,7 +36,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/fbcore/build.gradle b/fbcore/build.gradle
@@ -35,7 +35,7 @@ apply from: rootProject.file('release.gradle')
 
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     useLibrary 'org.apache.http.legacy'
diff --git a/gradle.properties b/gradle.properties
@@ -26,9 +26,6 @@ GROUP=com.facebook.fresco
 android.useAndroidX=true
 android.enableJetifier=true
 
-# Deps for Gradle
-BUILD_TOOLS_VERSION=28.0.3
-
 # SDK versions
 MIN_SDK_VERSION=9
 SAMPLES_MIN_SDK_VERSION=15
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Fri Mar 27 12:36:43 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
diff --git a/imagepipeline-backends/imagepipeline-okhttp/build.gradle b/imagepipeline-backends/imagepipeline-okhttp/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline-backends/imagepipeline-okhttp3/build.gradle b/imagepipeline-backends/imagepipeline-okhttp3/build.gradle
@@ -24,7 +24,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline-backends/imagepipeline-volley/build.gradle b/imagepipeline-backends/imagepipeline-volley/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline-base-test/build.gradle b/imagepipeline-base-test/build.gradle
@@ -23,7 +23,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline-base/build.gradle b/imagepipeline-base/build.gradle
@@ -40,7 +40,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline-native/build.gradle b/imagepipeline-native/build.gradle
@@ -42,7 +42,7 @@ android {
             ['imagepipeline', []],
             ['memchunk', []]]
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline-test/build.gradle b/imagepipeline-test/build.gradle
@@ -36,7 +36,7 @@ apply from: rootProject.file('release.gradle')
 
 android {
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/imagepipeline/build.gradle b/imagepipeline/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/memory-types/ashmem/build.gradle b/memory-types/ashmem/build.gradle
@@ -29,7 +29,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/memory-types/nativememory/build.gradle b/memory-types/nativememory/build.gradle
@@ -34,7 +34,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/memory-types/simple/build.gradle b/memory-types/simple/build.gradle
@@ -30,7 +30,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/native-filters/build.gradle b/native-filters/build.gradle
@@ -52,7 +52,7 @@ android {
             ['filters', []],
             ['native-filters', []]]
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/native-imagetranscoder/build.gradle b/native-imagetranscoder/build.gradle
@@ -53,7 +53,7 @@ android {
     def ndkLibs = [
             ['native-imagetranscoder', [copyLibjpeg]]]
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/samples/animation2/build.gradle b/samples/animation2/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/samples/comparison/build.gradle b/samples/comparison/build.gradle
@@ -40,7 +40,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     useLibrary 'org.apache.http.legacy'
diff --git a/samples/gestures/build.gradle b/samples/gestures/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/samples/kotlin/build.gradle b/samples/kotlin/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/samples/scrollperf/build.gradle b/samples/scrollperf/build.gradle
@@ -9,7 +9,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
 
     defaultConfig {
         applicationId "com.facebook.samples.scrollperf"
diff --git a/samples/showcase/build.gradle b/samples/showcase/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     dexOptions {
diff --git a/samples/zoomable/build.gradle b/samples/zoomable/build.gradle
@@ -20,7 +20,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/samples/zoomableapp/build.gradle b/samples/zoomableapp/build.gradle
@@ -8,7 +8,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/soloader/build.gradle b/soloader/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/static-webp/build.gradle b/static-webp/build.gradle
@@ -37,7 +37,7 @@ android {
 
     def ndkLibs = [['static-webp', [copyLibjpeg, copyLibpng, copyLibwebp]]]
 
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/tools/flipper/build.gradle b/tools/flipper/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/tools/stetho/build.gradle b/tools/stetho/build.gradle
@@ -28,7 +28,7 @@ dependencies {
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/ui-common/build.gradle b/ui-common/build.gradle
@@ -11,7 +11,7 @@ apply plugin: 'maven'
 apply from: rootProject.file('release.gradle')
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/vito/core/build.gradle b/vito/core/build.gradle
@@ -40,7 +40,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/vito/drawee-support/build.gradle b/vito/drawee-support/build.gradle
@@ -25,7 +25,7 @@ dependencies {
 }
 
 android {
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    buildToolsVersion FrescoConfig.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
diff --git a/vito/ktx/build.gradle b/vito/ktx/build.gradle
diff --git a/vito/litho/build.gradle b/vito/litho/build.gradle
diff --git a/vito/options/build.gradle b/vito/options/build.gradle
diff --git a/vito/provider/build.gradle b/vito/provider/build.gradle
diff --git a/vito/view/build.gradle b/vito/view/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,6 @@ plugins {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`project.ext {`
`56`		`- buildToolsVersion = "${BUILD_TOOLS_VERSION}"`
`57`	`56`	`compileSdkVersion = COMPILE_SDK_VERSION.toInteger()`
`58`	`57`	`minSdkVersion = MIN_SDK_VERSION`
`59`	`58`	`samplesMinSdkVersion = SAMPLES_MIN_SDK_VERSION`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ dependencies {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`android {`
`24`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
	`24`	`+ buildToolsVersion FrescoConfig.buildToolsVersion`
`25`	`25`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`26`	`26`
`27`	`27`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ dependencies {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`android {`
`43`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
	`43`	`+ buildToolsVersion FrescoConfig.buildToolsVersion`
`44`	`44`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`45`	`45`
`46`	`46`	`useLibrary 'org.apache.http.legacy'`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ dependencies {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`android {`
`22`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
	`22`	`+ buildToolsVersion FrescoConfig.buildToolsVersion`
`23`	`23`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`24`	`24`
`25`	`25`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ dependencies {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`android {`
`23`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
	`23`	`+ buildToolsVersion FrescoConfig.buildToolsVersion`
`24`	`24`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`25`	`25`
`26`	`26`	`defaultConfig {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`android {`
`28`		`- buildToolsVersion rootProject.ext.buildToolsVersion`
	`28`	`+ buildToolsVersion FrescoConfig.buildToolsVersion`
`29`	`29`	`compileSdkVersion rootProject.ext.compileSdkVersion`
`30`	`30`
`31`	`31`	`defaultConfig {`