jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/facebook/Sonar into Fix-Android

Browse Source
This commit is contained in:
Pritesh Nandgaonkar
2018-06-19 14:13:59 +01:00
parent ffa6e744c2 2076fc8fd1
commit 7405cd268a
102 changed files with 7538 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/build.gradle
View File

@@ -197,11 +197,13 @@ android {
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
ndk {
abiFilters 'arm64-v8a', 'x86'
stl 'c++_shared'
}
externalNativeBuild {
cmake {
arguments '-DANDROID_TOOLCHAIN=clang'
arguments '-DANDROID_STL=c++_shared'
}
}
}
@@ -242,7 +244,7 @@ android {
implementation deps.okhttp3
implementation 'com.facebook.litho:litho-core:0.15.0'
implementation 'com.facebook.litho:litho-widget:0.15.0'
implementation fileTree(dir: 'plugins/console/dependencies', include: ['*.jar'])
implementation 'org.mozilla:rhino:1.7.10'
}
}

5
android/plugins/inspector/litho-sonar/DebugComponentDescriptor.java
View File

@@ -18,7 +18,6 @@ import com.facebook.litho.ComponentContext;
import com.facebook.litho.ComponentLifecycle;
import com.facebook.litho.DebugComponent;
import com.facebook.litho.DebugLayoutNode;
import com.facebook.litho.EventHandler;
import com.facebook.litho.LithoView;
import com.facebook.litho.annotations.Prop;
import com.facebook.litho.annotations.State;
@@ -269,7 +268,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
@Nullable
private static SonarObject getPropData(DebugComponent node) {
if (node.isInternalComponent()) {
if (node.canResolve()) {
return null;
}
@@ -328,7 +327,7 @@ public class DebugComponentDescriptor extends NodeDescriptor<DebugComponent> {
@Nullable
private static SonarObject getStateData(DebugComponent node) {
if (node.isInternalComponent()) {
if (node.canResolve()) {
return null;
}

3
android/sample/AndroidManifest.xml
View File

@@ -16,7 +16,8 @@
android:label="@string/app_name"
android:icon="@drawable/ic_launcher"
android:allowBackup="false"
android:theme="@style/NoTitleBarWhiteBG">
android:theme="@style/NoTitleBarWhiteBG"
android:debuggable="true">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

34
android/sample/build.gradle
View File

@@ -38,30 +38,28 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
implementation 'com.android.support:design:26.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
// ...
implementation deps.supportAppCompat
implementation deps.supportConstraintLayout
implementation deps.supportDesign
testImplementation deps.junit
androidTestImplementation deps.supportTestRunner
androidTestImplementation deps.supportEspresso
// Litho
// implementation 'com.facebook.litho:litho-core:0.15.0'
// implementation 'com.facebook.litho:litho-widget:0.15.0'
// compileOnly 'com.facebook.litho:litho-annotations:0.15.0'
// implementation deps.lithoCore
// implementation deps.lithoWidget
// compileOnly deps.lithoAnnotations
// annotationProcessor 'com.facebook.litho:litho-processor:0.15.0'
// annotationProcessor deps.lithoProcessor
// SoLoader
implementation 'com.facebook.soloader:soloader:0.4.1'
// For integration with Fresco
// implementation 'com.facebook.litho:litho-fresco:0.15.0'
implementation deps.soloader
// For integration with Fresco
// implementation deps.lithoFresco
// For testing
// testImplementation 'com.facebook.litho:litho-testing:0.15.0'
// testImplementation deps.lithoTesting
implementation 'com.squareup.okhttp3:okhttp:3.10.0'
implementation project(':fbjni')
implementation deps.okhttp3
implementation project(':android')
implementation project(':fbjni')
}