Upgrade Android build infra (#3095)
Summary: This includes a bunch of different things which I wanted to do separately, but it's all a massive Jenga Tower and you cannot remove a single piece. - Litho upgrade - Gradle plugin upgrade - Remove storage permission as it apparently doesn't do anything above Android 10 - Upgraded build target to Android 12 because the new support lib/Kotlin stdlib required this which then caused the issue below to pop up - Added "export=true" everywhere as this is now a blocking issue if you don't have it - Upgraded to the LeakCanary2 plugin as version one no longer builds with an Android 12 target for the export reason - Make CI run on JRE 11 because that's required by the new Gradle plugin - Update internal CI to no longer define the SDK twice and use Java 11 Pull Request resolved: https://github.com/facebook/flipper/pull/3095 Test Plan: Built Android Sample and Tutorial app, connected to Flipper. Reviewed By: lblasa Differential Revision: D32644410 Pulled By: passy fbshipit-source-id: 8978f158d9c642b3bbd9dbbd7321eb20098a7a53
This commit is contained in:
committed by
Facebook GitHub Bot
parent
c9daf81098
commit
8ccae8a7ac
@@ -8,9 +8,9 @@
|
||||
-->
|
||||
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.facebook.flipper.sample">
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="com.facebook.flipper.sample">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
|
||||
<application
|
||||
android:name=".FlipperSampleApplication"
|
||||
@@ -18,8 +18,10 @@
|
||||
android:icon="@drawable/ic_launcher"
|
||||
android:allowBackup="false"
|
||||
android:theme="@style/NoTitleBarWhiteBG"
|
||||
android:debuggable="true">
|
||||
<activity android:name=".MainActivity">
|
||||
android:debuggable="true"
|
||||
tools:ignore="HardcodedDebugMode">
|
||||
<activity android:name=".MainActivity"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
@@ -31,7 +33,8 @@
|
||||
<data android:scheme="flipper" android:host="demo_page" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name=".DeepLinkActivity">
|
||||
<activity android:name=".DeepLinkActivity"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
@@ -39,7 +42,8 @@
|
||||
<data android:scheme="flipper" android:host="deep_link_activity" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name=".LayoutTestActivity">
|
||||
<activity android:name=".LayoutTestActivity"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
@@ -47,7 +51,8 @@
|
||||
<data android:scheme="flipper" android:host="layout_test_activity" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<activity android:name=".FragmentTestActivity">
|
||||
<activity android:name=".FragmentTestActivity"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
|
||||
@@ -72,6 +72,5 @@ dependencies {
|
||||
debugImplementation project(':fresco-plugin')
|
||||
debugImplementation project(':network-plugin')
|
||||
debugImplementation project(':litho-plugin')
|
||||
debugImplementation project(':leakcanary-plugin')
|
||||
releaseImplementation project(':noop')
|
||||
}
|
||||
|
||||
@@ -15,7 +15,6 @@ import com.facebook.flipper.plugins.example.ExampleFlipperPlugin;
|
||||
import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
|
||||
import com.facebook.flipper.plugins.inspector.DescriptorMapping;
|
||||
import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
|
||||
import com.facebook.flipper.plugins.leakcanary.LeakCanaryFlipperPlugin;
|
||||
import com.facebook.flipper.plugins.navigation.NavigationFlipperPlugin;
|
||||
import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
|
||||
import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
|
||||
@@ -50,7 +49,6 @@ public final class FlipperInitializer {
|
||||
Arrays.asList(
|
||||
new SharedPreferencesDescriptor("sample", Context.MODE_PRIVATE),
|
||||
new SharedPreferencesDescriptor("other_sample", Context.MODE_PRIVATE))));
|
||||
client.addPlugin(new LeakCanaryFlipperPlugin());
|
||||
client.addPlugin(new FrescoFlipperPlugin());
|
||||
client.addPlugin(new ExampleFlipperPlugin());
|
||||
client.addPlugin(CrashReporterPlugin.getInstance());
|
||||
|
||||
@@ -39,9 +39,9 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32"
|
||||
implementation "androidx.appcompat:appcompat:1.3.1"
|
||||
implementation "androidx.core:core-ktx:1.5.0"
|
||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
|
||||
implementation "androidx.appcompat:appcompat:1.4.0"
|
||||
implementation "androidx.core:core-ktx:1.7.0"
|
||||
|
||||
// Flipper
|
||||
// For simplicity, we use Flipper for both debug and release builds here.
|
||||
@@ -50,7 +50,6 @@ dependencies {
|
||||
implementation project(':fresco-plugin')
|
||||
implementation project(':network-plugin')
|
||||
implementation project(':litho-plugin')
|
||||
implementation project(':leakcanary-plugin')
|
||||
implementation deps.soloader
|
||||
|
||||
// Litho
|
||||
|
||||
@@ -14,12 +14,14 @@
|
||||
<application
|
||||
android:name=".TutorialApplication"
|
||||
android:allowBackup="true"
|
||||
android:fullBackupOnly="true"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme">
|
||||
<activity android:name=".MainActivity">
|
||||
<activity android:name=".MainActivity"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ import com.facebook.litho.fresco.FrescoImage
|
||||
@LayoutSpec
|
||||
object SingleImageComponentSpec {
|
||||
|
||||
@PropDefault val imageAspectRatio = 1f
|
||||
@get:PropDefault val imageAspectRatio = 1f
|
||||
|
||||
@OnCreateLayout
|
||||
fun onCreateLayout(
|
||||
|
||||
Reference in New Issue
Block a user