Bump AGP from 7.4.2 to 8.1.1

Reviewed By: defHLT Differential Revision: D57974435 fbshipit-source-id: b1e35de411cbbea89ae901c6ec6bc846738c3032
facebook · May 31, 2024 · 8a0e8c7 · 8a0e8c7
1 parent ca18704
commit 8a0e8c7
Show file tree

Hide file tree

Showing 64 changed files with 294 additions and 20 deletions.
diff --git a/animated-base/build.gradle b/animated-base/build.gradle
@@ -11,6 +11,10 @@ import com.facebook.fresco.buildsrc.TestDeps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 dependencies {
  compileOnly Deps.inferAnnotation
  compileOnly Deps.javaxAnnotation
@@ -52,6 +56,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipeline.animated"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/animated-drawable/build.gradle b/animated-drawable/build.gradle
@@ -11,10 +11,16 @@ import com.facebook.fresco.buildsrc.TestDeps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.animated.drawable"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/animated-gif-lite/build.gradle b/animated-gif-lite/build.gradle
@@ -21,6 +21,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.animated.giflite"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/animated-gif/build.gradle b/animated-gif/build.gradle
@@ -10,6 +10,12 @@ import com.facebook.fresco.buildsrc.TestDeps
 
 apply plugin: 'com.android.library'
 
+java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(11))
+ }
+}
+
 dependencies {
  compileOnly Deps.inferAnnotation
  compileOnly Deps.jsr305
@@ -48,6 +54,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.animated.gif"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/animated-webp/build.gradle b/animated-webp/build.gradle
@@ -10,6 +10,12 @@ import com.facebook.fresco.buildsrc.TestDeps
 
 apply plugin: 'com.android.library'
 
+java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(11))
+ }
+}
+
 dependencies {
  compileOnly Deps.inferAnnotation
  compileOnly Deps.jsr305
@@ -41,6 +47,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.animated.webp"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/build.gradle b/build.gradle
@@ -21,8 +21,6 @@ buildscript {
  classpath GradleDeps.Android.gradlePlugin
  classpath GradleDeps.Kotlin.gradlePlugin
 
- classpath GradleDeps.Kotlin.gradlePlugin
-
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
  }

diff --git a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/GradleDeps.kt
@@ -10,7 +10,7 @@ package com.facebook.fresco.buildsrc
 object GradleDeps {
 
  object Android {
- private const val version = "7.4.2"
+ private const val version = "8.1.1"
 
  const val gradlePlugin = "com.android.tools.build:gradle:$version"
  }
@@ -21,6 +21,10 @@ object GradleDeps {
  const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib:$version"
  }
 
+ object Native {
+ const val version = "25.2.9519653"
+ }
+
  object Publishing {
  const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
  }

diff --git a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/TestDeps.kt b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/TestDeps.kt
@@ -19,7 +19,7 @@ object TestDeps {
 
  const val festAssertCore = "org.easytesting:fest-assert-core:2.0M10"
 
- const val robolectric = "org.robolectric:robolectric:4.11"
+ const val robolectric = "org.robolectric:robolectric:4.12"
 
  const val truth = "com.google.truth:truth:1.0.1"
 
@@ -30,7 +30,7 @@ object TestDeps {
  }
 
  object Powermock {
- private const val version = "2.0.2"
+ private const val version = "2.0.9"
 
  const val apiMockito = "org.powermock:powermock-api-mockito2:$version"
  const val moduleJunit4 = "org.powermock:powermock-module-junit4:$version"

diff --git a/drawee-backends/drawee-pipeline/build.gradle b/drawee-backends/drawee-pipeline/build.gradle
@@ -11,6 +11,10 @@ import com.facebook.fresco.buildsrc.TestDeps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 dependencies {
  compileOnly Deps.AndroidX.legacySupportCoreUtils
  compileOnly Deps.AndroidX.androidxAnnotation
@@ -44,6 +48,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.drawee.backends.pipeline"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/drawee-span/build.gradle b/drawee-span/build.gradle
@@ -35,6 +35,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.drawee.span"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/drawee/build.gradle b/drawee/build.gradle
@@ -42,6 +42,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.drawee"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/fbcore/build.gradle b/fbcore/build.gradle
@@ -11,6 +11,10 @@ import com.facebook.fresco.buildsrc.TestDeps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 dependencies {
  compileOnly Deps.inferAnnotation
  compileOnly Deps.jsr305
@@ -42,6 +46,8 @@ android {
 
  useLibrary 'org.apache.http.legacy'
 
+ namespace "com.facebook.fbcore"
+
  defaultConfig {
  consumerProguardFiles 'proguard-fresco.pro'
  minSdkVersion FrescoConfig.minSdkVersion

diff --git a/gradle.properties b/gradle.properties
@@ -9,8 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+# Default value: -Xmx10248m
+# org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.jvmargs=-Xmx2048m
 
 # When configured, Gradle will run in incubating parallel mode.
@@ -46,3 +46,6 @@ LIBWEBP_VERSION=1.3.2
 
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
+
+# AGP 8.0 feature(s)
+android.enableBuildConfigAsBytecode=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 08 15:10:53 GMT 2023
+#Thu May 30 11:49:44 BST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/imagepipeline-backends/imagepipeline-okhttp3/build.gradle b/imagepipeline-backends/imagepipeline-okhttp3/build.gradle
@@ -10,6 +10,10 @@ import com.facebook.fresco.buildsrc.Deps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 dependencies {
  compileOnly Deps.inferAnnotation
  compileOnly Deps.jsr305
@@ -29,6 +33,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipeline.backends.okhttp3"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/imagepipeline-backends/imagepipeline-volley/build.gradle b/imagepipeline-backends/imagepipeline-volley/build.gradle
@@ -26,6 +26,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipeline.backends.volley"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/imagepipeline-base-test/build.gradle b/imagepipeline-base-test/build.gradle
@@ -27,6 +27,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipelinebase.test"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/imagepipeline-base/build.gradle b/imagepipeline-base/build.gradle
@@ -11,6 +11,10 @@ import com.facebook.fresco.buildsrc.TestDeps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 dependencies {
  compileOnly Deps.AndroidX.androidxAnnotation
  compileOnly Deps.AndroidX.exifInterface
@@ -46,6 +50,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipelinebase"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion
@@ -58,6 +64,10 @@ android {
  }
  }
  }
+
+ buildFeatures {
+ buildConfig = true
+ }
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/imagepipeline-native/build.gradle b/imagepipeline-native/build.gradle
@@ -6,10 +6,17 @@
  */
 
 import com.facebook.fresco.buildsrc.Deps
+import com.facebook.fresco.buildsrc.GradleDeps
 import com.facebook.fresco.buildsrc.TestDeps
 
 apply plugin: 'com.android.library'
 
+java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(11))
+ }
+}
+
 dependencies {
  compileOnly Deps.inferAnnotation
  compileOnly Deps.jsr305
@@ -39,6 +46,8 @@ dependencies {
 
 
 android {
+ ndkVersion GradleDeps.Native.version
+
  def ndkLibs = [
  ['bitmaps', []],
  ['imagepipeline', []],
@@ -47,6 +56,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipeline.nativecode"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/imagepipeline-test/build.gradle b/imagepipeline-test/build.gradle
@@ -22,6 +22,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipeline.test"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/imagepipeline/build.gradle b/imagepipeline/build.gradle
@@ -12,6 +12,10 @@ import com.facebook.fresco.buildsrc.TestDeps
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
+kotlin {
+ jvmToolchain(11)
+}
+
 dependencies {
  compileOnly Deps.AndroidX.androidxAnnotation
  compileOnly Deps.AndroidX.legacySupportCoreUtils
@@ -55,6 +59,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.imagepipeline"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/memory-types/ashmem/build.gradle b/memory-types/ashmem/build.gradle
@@ -33,6 +33,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.fresco.memorytypes.ashmem"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/memory-types/nativememory/build.gradle b/memory-types/nativememory/build.gradle
@@ -36,6 +36,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.fresco.memorytypes.nativememory"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion

diff --git a/memory-types/simple/build.gradle b/memory-types/simple/build.gradle
@@ -32,6 +32,8 @@ android {
  buildToolsVersion FrescoConfig.buildToolsVersion
  compileSdkVersion FrescoConfig.compileSdkVersion
 
+ namespace "com.facebook.fresco.memorytypes.simple"
+
  defaultConfig {
  minSdkVersion FrescoConfig.minSdkVersion
  targetSdkVersion FrescoConfig.targetSdkVersion