Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ext.deps = [
inferAnnotations : 'com.facebook.infer.annotation:infer-annotation:0.17.0',
// Debugging and testing
guava : 'com.google.guava:guava:20.0',
robolectric : 'org.robolectric:robolectric:3.0',
robolectric : 'org.robolectric:robolectric:3.8',
junit : 'junit:junit:4.12',
hamcrestLibrary : 'org.hamcrest:hamcrest-library:1.3',
powermockMockito : 'org.powermock:powermock-api-mockito:1.5.6',
Expand Down
1 change: 1 addition & 0 deletions litho-it-powermock/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dependencies {
testImplementation deps.assertjCore
testImplementation deps.guava
testImplementation deps.inferAnnotations
testImplementation deps.junit
testImplementation deps.powermockJunit
testImplementation deps.powermockMockito
testImplementation deps.powermockXstream
Expand Down
1 change: 1 addition & 0 deletions litho-it-spec/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ dependencies {

// Testing deps
testImplementation deps.assertjCore
testImplementation deps.junit
testImplementation deps.robolectric
}

2 changes: 2 additions & 0 deletions litho-it/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ android {

testOptions {
unitTests.all {
systemProperty 'robolectric.dependency.repo.url', 'https://repo1.maven.org/maven2'

jvmArgs '-Dcom.facebook.litho.is_oss=true'
testLogging {
events "passed", "skipped", "failed", "standardOut", "standardError"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.junit.runner.RunWith;
import org.robolectric.Robolectric;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.util.ActivityController;
import org.robolectric.android.controller.ActivityController;

@RunWith(ComponentsTestRunner.class)
public class ComponentsPoolsTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.facebook.litho.testing.shadows;

import static org.robolectric.internal.Shadow.directlyOn;
import static org.robolectric.shadow.api.Shadow.directlyOn;

import android.graphics.Canvas;
import android.graphics.ColorFilter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,8 @@ public Config getConfig(final Method method) {
final Config config = super.getConfig(method);
// We are hard-coding the path here instead of relying on BUCK internals
// to allow for building with gradle in the Open Source version.
return new Config.Implementation(config) {
@Override
public String manifest() {
return getResPrefix() + "AndroidManifest.xml";
}
};
return new Config.Implementation.Builder(config)
.setManifest(getResPrefix() + "AndroidManifest.xml")
.build();
}
}