From 2baadf98679c0aaa814ebae4d85da12a15782221 Mon Sep 17 00:00:00 2001 From: Pascal Hartig Date: Thu, 19 Sep 2019 02:58:43 -0700 Subject: [PATCH] Make litho/sections a separate plugin Summary: Breaking Litho/Sections off. Doesn't really make sense to have two deps for this especially since they're pretty tightly coupled. This makes our core already quite slim. Reviewed By: jknoxville Differential Revision: D17420118 fbshipit-source-id: 9a03911f4af6410745b9aefd0e6a75bdf106660f --- android/build.gradle | 5 ---- android/plugins/litho/build.gradle | 30 +++++++++++++++++++ .../litho/src/main/AndroidManifest.xml | 11 +++++++ .../flipper/plugins/litho/DataUtils.java | 0 .../litho/DebugComponentDescriptor.java | 0 .../plugins/litho/DebugSectionDescriptor.java | 0 ...hoAccessibilityRenderExtensionCommand.java | 0 .../litho/LithoFlipperDescriptors.java | 0 .../litho/LithoRecyclerViewDescriptor.java | 0 .../plugins/litho/LithoViewDescriptor.java | 0 .../plugins/litho/PropWithDescription.java | 0 .../litho/PropWithInspectorSection.java | 0 .../plugins/sections/ChangesetDebug.java | 0 .../sections/SectionsFlipperPlugin.java | 0 android/sample/build.gradle | 1 + android/tutorial/build.gradle | 1 + settings.gradle | 3 ++ 17 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 android/plugins/litho/build.gradle create mode 100644 android/plugins/litho/src/main/AndroidManifest.xml rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/DataUtils.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/LithoRecyclerViewDescriptor.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/PropWithDescription.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/litho/PropWithInspectorSection.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/sections/ChangesetDebug.java (100%) rename android/{ => plugins/litho}/src/main/java/com/facebook/flipper/plugins/sections/SectionsFlipperPlugin.java (100%) diff --git a/android/build.gradle b/android/build.gradle index f59f47785..27e8d529b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -56,7 +56,6 @@ android { } dependencies { - compileOnly deps.lithoAnnotations compileOnly deps.proguardAnnotations implementation 'com.facebook.fbjni:fbjni:0.0.1' extractHeaders 'com.facebook.fbjni:fbjni:0.0.1:headers' @@ -65,10 +64,6 @@ android { implementation deps.jsr305 implementation deps.supportAppCompat implementation deps.stetho - implementation deps.lithoCore - implementation deps.lithoSectionsDebug - implementation deps.lithoSectionsCore - implementation deps.lithoWidget compileOnly deps.leakcanary testImplementation deps.mockito diff --git a/android/plugins/litho/build.gradle b/android/plugins/litho/build.gradle new file mode 100644 index 000000000..305aeb680 --- /dev/null +++ b/android/plugins/litho/build.gradle @@ -0,0 +1,30 @@ +/* + * 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. + */ + +apply plugin: 'com.android.library' +apply plugin: 'maven' + +android { + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion + + defaultConfig { + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion + } + + dependencies { + compileOnly deps.lithoAnnotations + implementation project(':android') + implementation deps.lithoCore + implementation deps.lithoSectionsDebug + implementation deps.lithoSectionsCore + implementation deps.lithoWidget + implementation deps.supportAppCompat + compileOnly deps.jsr305 + } +} diff --git a/android/plugins/litho/src/main/AndroidManifest.xml b/android/plugins/litho/src/main/AndroidManifest.xml new file mode 100644 index 000000000..5be0e5c29 --- /dev/null +++ b/android/plugins/litho/src/main/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DataUtils.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DataUtils.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/DataUtils.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DataUtils.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugComponentDescriptor.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/DebugSectionDescriptor.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/GenerateLithoAccessibilityRenderExtensionCommand.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/LithoFlipperDescriptors.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoRecyclerViewDescriptor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/LithoRecyclerViewDescriptor.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/LithoRecyclerViewDescriptor.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/LithoRecyclerViewDescriptor.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/LithoViewDescriptor.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/PropWithDescription.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/PropWithDescription.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/PropWithDescription.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/PropWithDescription.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/litho/PropWithInspectorSection.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/PropWithInspectorSection.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/litho/PropWithInspectorSection.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/litho/PropWithInspectorSection.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/sections/ChangesetDebug.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/sections/ChangesetDebug.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/sections/ChangesetDebug.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/sections/ChangesetDebug.java diff --git a/android/src/main/java/com/facebook/flipper/plugins/sections/SectionsFlipperPlugin.java b/android/plugins/litho/src/main/java/com/facebook/flipper/plugins/sections/SectionsFlipperPlugin.java similarity index 100% rename from android/src/main/java/com/facebook/flipper/plugins/sections/SectionsFlipperPlugin.java rename to android/plugins/litho/src/main/java/com/facebook/flipper/plugins/sections/SectionsFlipperPlugin.java diff --git a/android/sample/build.gradle b/android/sample/build.gradle index f54ec2409..ede3993a0 100644 --- a/android/sample/build.gradle +++ b/android/sample/build.gradle @@ -69,5 +69,6 @@ dependencies { debugImplementation project(':android') debugImplementation project(':fresco-plugin') debugImplementation project(':network-plugin') + debugImplementation project(':litho-plugin') releaseImplementation project(':noop') } diff --git a/android/tutorial/build.gradle b/android/tutorial/build.gradle index be773e5fb..93933e4d4 100644 --- a/android/tutorial/build.gradle +++ b/android/tutorial/build.gradle @@ -47,6 +47,7 @@ dependencies { implementation project(':android') implementation project(':fresco-plugin') implementation project(':network-plugin') + implementation project(':litho-plugin') implementation deps.soloader // Litho diff --git a/settings.gradle b/settings.gradle index 904011465..5f76a006e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -36,3 +36,6 @@ project(':fresco-plugin').projectDir = file('android/plugins/fresco') include ':network-plugin' project(':network-plugin').projectDir = file('android/plugins/network') + +include ':litho-plugin' +project(':litho-plugin').projectDir = file('android/plugins/litho')