diff --git a/build.gradle b/build.gradle index c0cfd4c38a..4c1afcceef 100644 --- a/build.gradle +++ b/build.gradle @@ -44,10 +44,21 @@ subprojects { mavenCentral() } - // FIXME: This picks up non-Java files by default, failing to parse them. - // Need to configure this more carefully. + // Configure Javadoc to only process Java and Kotlin source files tasks.withType(Javadoc).all { - enabled = false + source = sourceSets.main.allJava + exclude '**/*.kt' + exclude '**/*.cpp' + exclude '**/*.h' + exclude '**/*.mk' + exclude '**/*.xml' + exclude '**/*.properties' + exclude '**/*.pro' + exclude '**/*.jpg' + exclude '**/*.png' + exclude '**/*.webp' + exclude '**/*.gif' + classpath = configurations.compileClasspath } tasks.withType(com.android.build.gradle.tasks.JavaDocGenerationTask).all { diff --git a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/dependencies.kt b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/dependencies.kt index 5d6ac39e31..a7434ff3b0 100644 --- a/buildSrc/src/main/java/com/facebook/fresco/buildsrc/dependencies.kt +++ b/buildSrc/src/main/java/com/facebook/fresco/buildsrc/dependencies.kt @@ -13,13 +13,13 @@ object Deps { const val inferAnnotation = "com.facebook.infer.annotation:infer-annotation:0.18.0" - const val okhttp3 = "com.squareup.okhttp3:okhttp:3.14.9" + const val okhttp3 = "com.squareup.okhttp3:okhttp:4.11.0" - const val volley = "com.android.volley:volley:1.2.1" + const val volley = "com.android.volley:volley:1.2.2" object AndroidX { - const val androidxAnnotation = "androidx.annotation:annotation:1.6.0" - const val core = "androidx.core:core:1.13.1" + const val androidxAnnotation = "androidx.annotation:annotation:1.7.0" + const val core = "androidx.core:core:1.15.0" const val exifInterface = "androidx.exifinterface:exifinterface:1.3.7" const val legacySupportCoreUtils = "androidx.legacy:legacy-support-core-utils:1.0.0" } @@ -59,12 +59,12 @@ object Deps { object Tools { object Flipper { - private const val version = "0.183.0" + private const val version = "0.240.0" const val flipper = "com.facebook.flipper:flipper:$version" } object Stetho { - private const val version = "1.6.0" + private const val version = "1.6.1" const val stetho = "com.facebook.stetho:stetho:$version" const val okhttp3 = "com.facebook.stetho:stetho-okhttp3:$version" } diff --git a/vito/tools/liveeditor/build.gradle b/vito/tools/liveeditor/build.gradle index c84b8ec305..cb8d00536a 100644 --- a/vito/tools/liveeditor/build.gradle +++ b/vito/tools/liveeditor/build.gradle @@ -16,7 +16,9 @@ kotlin { } dependencies { - implementation project(':drawee') // TODO RM; required for FadeDrawable access + // TODO: Review if drawee dependency can be removed. Currently kept for FadeDrawable access. + // Consider migrating to Vito APIs if FadeDrawable functionality is available there. + implementation project(':drawee') implementation project(':fbcore') implementation project(':middleware') implementation project(':ui-common')