Merge branch 'liminal-timber_v3'

arcao · Apr 28, 2015 · ee61c89 · ee61c89 · arcao · Apr 28, 2015
2 parents ec29aa1 + 6502779
commit ee61c89
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.6</java.version>
 		<slf4j.version>1.7.12</slf4j.version>
-		<timber.version>2.7.1</timber.version>
+		<timber.version>3.0.1</timber.version>
 		<android.version>4.1.1.4</android.version>
 		<android.platform>16</android.platform>
 		<junit.version>4.10</junit.version>

diff --git a/src/test/java/com/arcao/slf4j/timber/TimberLoggerAdapterTest.java b/src/test/java/com/arcao/slf4j/timber/TimberLoggerAdapterTest.java
@@ -16,7 +16,6 @@
 import org.slf4j.LoggerFactory;
 
 import timber.log.Timber;
-import timber.log.TimberTestHelper;
 import android.util.Log;
 
 @RunWith(RobolectricTestRunner.class)
@@ -25,7 +24,7 @@ public class TimberLoggerAdapterTest {
   private static final Logger logger = LoggerFactory.getLogger(TimberLoggerAdapterTest.class);
 
   @Before @After public void setUpAndTearDown() {
-    TimberTestHelper.cleanTimber();
+    Timber.uprootAll();
   }
 
   @Test public void debugTest() {

diff --git a/src/test/java/timber/log/TimberTestHelper.java b/src/test/java/timber/log/TimberTestHelper.java