From fdb238031283eee434da2cff6acee1e50296875b Mon Sep 17 00:00:00 2001 From: Aditya Sharat Date: Tue, 27 Jun 2023 03:52:10 -0700 Subject: [PATCH] Fixes build Summary: Fixes build Reviewed By: pentiumao Differential Revision: D46863174 fbshipit-source-id: 73d1d26dc4a3d2c2a2da31a45d209639df0e645d --- build.gradle | 4 ++-- .../java/com/facebook/litho/testing/LegacyLithoViewRule.kt | 5 +++++ .../main/java/com/facebook/litho/testing/LithoViewRule.kt | 4 ++++ sample/src/main/AndroidManifest.xml | 4 ++-- .../litho/kotlin/animations/dynamicprops/SimpleClockView.kt | 4 +--- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 220ca52e764..329ef6471b6 100644 --- a/build.gradle +++ b/build.gradle @@ -110,7 +110,7 @@ ext.isDokkaBuild = getGradle().getStartParameter().getTaskNames().toString().toL ext.deps = [ // Android support supportAnnotations : 'androidx.annotation:annotation:1.0.0', - supportAppCompat : 'androidx.appcompat:appcompat:1.0.0', + supportAppCompat : 'androidx.appcompat:appcompat:1.6.1', supportCore : 'androidx.core:core-ktx:1.9.0', supportFragment : 'androidx.fragment:fragment:1.3.5', supportCustomView : 'androidx.customview:customview:1.0.0', @@ -157,7 +157,7 @@ ext.deps = [ // Proguard annotations (published through Yoga) proguardAnnotations: 'com.facebook.yoga:proguard-annotations:1.14.1', // Processor - javapoet : 'com.squareup:javapoet:1.9.0', + javapoet : 'com.squareup:javapoet:1.13.0', // Misc khronos : 'org.khronos:opengl-api:gl1.1-android-2.1_r1', // Kotlin diff --git a/litho-testing/src/main/java/com/facebook/litho/testing/LegacyLithoViewRule.kt b/litho-testing/src/main/java/com/facebook/litho/testing/LegacyLithoViewRule.kt index b4dd307ee20..b0c0d93b219 100644 --- a/litho-testing/src/main/java/com/facebook/litho/testing/LegacyLithoViewRule.kt +++ b/litho-testing/src/main/java/com/facebook/litho/testing/LegacyLithoViewRule.kt @@ -77,6 +77,11 @@ constructor( val componentsConfiguration: ComponentsConfiguration? = null, val themeResId: Int? = null ) : TestRule { + + init { + ComponentsConfiguration.isDebugModeEnabled = true + } + val componentTree: ComponentTree get() { if (_componentTree == null) { diff --git a/litho-testing/src/main/java/com/facebook/litho/testing/LithoViewRule.kt b/litho-testing/src/main/java/com/facebook/litho/testing/LithoViewRule.kt index ea48c39874c..93c271e8c7f 100644 --- a/litho-testing/src/main/java/com/facebook/litho/testing/LithoViewRule.kt +++ b/litho-testing/src/main/java/com/facebook/litho/testing/LithoViewRule.kt @@ -66,6 +66,10 @@ constructor( lateinit var context: ComponentContext private var threadLooperController: BaseThreadLooperController = ThreadLooperController() + init { + ComponentsConfiguration.isDebugModeEnabled = true + } + override fun apply(base: Statement, description: Description): Statement { return object : Statement() { override fun evaluate() { diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index e8a9d1da17c..0a9e2375f0d 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -162,8 +162,8 @@ + android:minSdkVersion="19" + android:targetSdkVersion="33" /> diff --git a/sample/src/main/java/com/facebook/samples/litho/kotlin/animations/dynamicprops/SimpleClockView.kt b/sample/src/main/java/com/facebook/samples/litho/kotlin/animations/dynamicprops/SimpleClockView.kt index db1f331faca..af52236d128 100644 --- a/sample/src/main/java/com/facebook/samples/litho/kotlin/animations/dynamicprops/SimpleClockView.kt +++ b/sample/src/main/java/com/facebook/samples/litho/kotlin/animations/dynamicprops/SimpleClockView.kt @@ -23,8 +23,6 @@ import android.graphics.Paint import android.graphics.PointF import android.util.TypedValue import android.view.View -import androidx.annotation.Dimension -import androidx.annotation.Dimension.Companion.DP import androidx.annotation.Px import java.util.concurrent.TimeUnit import kotlin.math.min @@ -87,6 +85,6 @@ class SimpleClockView(context: Context) : View(context) { } companion object { - @Dimension(unit = DP) private const val STROKE_WIDTH_DP = 6f + private const val STROKE_WIDTH_DP = 6f } }