Skip to content

Commit

Permalink
Root level folder for litho-core
Browse files Browse the repository at this point in the history
Summary: Move the `src` folder into `litho-core/src`.

Reviewed By: IanChilds

Differential Revision: D4810163

fbshipit-source-id: ef7332a6218acbb2414b5d0ddafe6b54126ca4e1
  • Loading branch information
passy authored and facebook-github-bot committed Apr 3, 2017
1 parent f06473e commit 79e9fd5
Show file tree
Hide file tree
Showing 301 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android_library(
android_aar(
name = "release-litho-core",
include_build_config_class = True,
manifest_skeleton = "src/main/AndroidManifest.xml",
manifest_skeleton = "litho-core/src/main/AndroidManifest.xml",
visibility = [
"PUBLIC",
],
Expand All @@ -41,7 +41,7 @@ android_aar(
android_resource(
name = "res",
package = "com.facebook.litho",
res = "src/main/res",
res = "litho-core/src/main/res",
visibility = [
"PUBLIC",
],
Expand Down
18 changes: 9 additions & 9 deletions COMPONENTS_DEFS
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ def make_dep_path(pth):
COMPONENTS_ROOT_TARGET = make_dep_path(":components")

# Java source
COMPONENTS_JAVA_TARGET = make_dep_path('src/main/java/com/facebook/litho:components')
COMPONENTS_DEBUG_JAVA_TARGET = make_dep_path('src/debug/java/com/facebook/litho:components')
COMPONENTS_JAVA_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/litho:components')
COMPONENTS_DEBUG_JAVA_TARGET = make_dep_path('litho-core/src/debug/java/com/facebook/litho:components')
COMPONENTS_ANNOTATIONS_TARGET = make_dep_path('litho-annotations/src/main/java/com/facebook/litho/annotations:annotations')
COMPONENTS_CONFIG_TARGET = make_dep_path('src/main/java/com/facebook/litho/config:config')
COMPONENTS_CONFIG_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/litho/config:config')
COMPONENTS_DISPLAYLISTSTUBS_TARGET = make_dep_path('litho-stubs:stubs')
COMPONENTS_VIEWCOMPATCREATOR_TARGET = make_dep_path('src/main/java/com/facebook/litho/viewcompatcreator:viewcompatcreator')
COMPONENTS_UTILS_TARGET = make_dep_path('src/main/java/com/facebook/litho/utils:utils')
COMPONENTS_VIEWCOMPATCREATOR_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/litho/viewcompatcreator:viewcompatcreator')
COMPONENTS_UTILS_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/litho/utils:utils')
COMPONENTS_WIDGET_ACCESSIBILITIES_TARGET = make_dep_path('litho-widget/src/main/java/com/facebook/litho/widget/accessibility:accessibility')
COMPONENTS_WIDGET_TARGET = make_dep_path('litho-widget/src/main/java/com/facebook/litho/widget:widget')
COMPONENTS_COMPONENTS_FRESCO_TARGET = make_dep_path('src/main/java/com/facebook/litho/fresco:fresco')
COMPONENTS_COMPONENTS_FRESCO_COMMON_TARGET = make_dep_path('src/main/java/com/facebook/litho/fresco/common:common')
COMPONENTS_COMPONENTS_FRESCO_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/litho/fresco:fresco')
COMPONENTS_COMPONENTS_FRESCO_COMMON_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/litho/fresco/common:common')

# Test source
COMPONENTS_TEST_TARGET = make_dep_path('src/test/java/com/facebook/litho:components')
COMPONENTS_TEST_TARGET = make_dep_path('litho-core/src/test/java/com/facebook/litho:components')

# Java source with local upstream
COMPONENTS_PROGUARDANNOTATIONS_TARGET = make_dep_path('src/main/java/com/facebook/proguard/annotations:annotations')
COMPONENTS_PROGUARDANNOTATIONS_TARGET = make_dep_path('litho-core/src/main/java/com/facebook/proguard/annotations:annotations')

# Resources
COMPONENTS_RES_TARGET = make_dep_path(':res')
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ android_library(
],
visibility = [
"//javatests/...",
make_dep_path("src/test/..."),
make_dep_path("litho-core/src/test/..."),
],
deps = [
COMPONENTS_ANDROIDSUPPORT_TARGET,
COMPONENTS_JAVA_TARGET,
COMPONENTS_POWERMOCK_REFLECT_TARGET,
make_dep_path("src/debug/java/com/facebook/litho/testing/viewtree:viewtree"),
make_dep_path("src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing/viewtree:viewtree"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing:testing"),
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ private static String getAndroidManifestPath() {
}

return prefix +
"src/test/java/com/facebook/litho/AndroidManifest.xml";
"litho-core/src/test/java/com/facebook/litho/AndroidManifest.xml";
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ android_library(
COMPONENTS_ROBOLECTRIC_TARGET,
],
tests = [
make_dep_path("src/test/java/com/facebook/litho/testing/viewtree:viewtree"),
make_dep_path("litho-core/src/test/java/com/facebook/litho/testing/viewtree:viewtree"),
],
visibility = [
"PUBLIC",
Expand All @@ -21,6 +21,6 @@ android_library(
COMPONENTS_JAVA_TARGET,
COMPONENTS_JSR_TARGET,
COMPONENTS_JUNIT_TARGET,
make_dep_path("src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing:testing"),
],
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ components_robolectric_test(
COMPONENTS_SOLOADER_TARGET,
COMPONENTS_WIDGET_TARGET,
COMPONENTS_YOGA_TARGET,
make_dep_path("src/main/java/com/facebook/litho/viewcompatcreator:viewcompatcreator"),
make_dep_path("src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("src/debug/java/com/facebook/litho/testing/assertj:assertj"),
make_dep_path("src/debug/java/com/facebook/litho/testing/testrunner:testrunner"),
make_dep_path("litho-core/src/main/java/com/facebook/litho/viewcompatcreator:viewcompatcreator"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing/assertj:assertj"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing/testrunner:testrunner"),
],
)

Expand All @@ -54,7 +54,7 @@ android_resource(
package = "com.facebook.litho",
res = "res",
visibility = [
make_dep_path("src/test/..."),
make_dep_path("litho-core/src/test/..."),
"//javatests/com/facebook/litho/...",
],
)
Expand All @@ -68,7 +68,7 @@ android_library(
"TouchExpansionTestInternalNode.java",
],
visibility = [
make_dep_path("src/test/java/com/facebook/litho/..."),
make_dep_path("litho-core/src/test/java/com/facebook/litho/..."),
],
deps = [
COMPONENTS_ANDROIDSUPPORT_TARGET,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ components_robolectric_test(
COMPONENTS_JUNIT_TARGET,
COMPONENTS_ROBOLECTRIC_TARGET,
make_dep_path("litho-widget/src/main/java/com/facebook/litho/widget:widget"),
make_dep_path("src/debug/java/com/facebook/litho/testing/testrunner:testrunner"),
make_dep_path("src/debug/java/com/facebook/litho/testing/viewtree:viewtree"),
make_dep_path("src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("src/test/java/com/facebook/litho:res"),
make_dep_path("src/test/java/com/facebook/litho:testutil"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing/testrunner:testrunner"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing/viewtree:viewtree"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("litho-core/src/test/java/com/facebook/litho:res"),
make_dep_path("litho-core/src/test/java/com/facebook/litho:testutil"),
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ components_robolectric_test(
COMPONENTS_ANDROIDSUPPORT_TARGET,
COMPONENTS_ANDROIDSUPPORT_RECYCLERVIEW_TARGET,
make_dep_path("litho-widget/src/main/java/com/facebook/litho/widget:widget"),
make_dep_path("src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("src/debug/java/com/facebook/litho/testing/testrunner:testrunner"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing:testing"),
make_dep_path("litho-core/src/debug/java/com/facebook/litho/testing/testrunner:testrunner"),
],
)
Loading

0 comments on commit 79e9fd5

Please sign in to comment.