Merge pull request orhanobut#38 from orhanobut/oo/tests-fixes

tests and CI

.travis.yml

@@ -0,0 +1,16 @@
+language: android
+
+android:
+  components:
+    - build-tools-21.1.1
+    - android-18
+  licenses:
+    - 'android-sdk-license-.+'
+
+notifications:
+  email: true
+
+sudo: false
+
+script:
+- ./gradlew test

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+      classpath 'com.android.tools.build:gradle:1.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle.properties

@@ -18,8 +18,8 @@
 # org.gradle.parallel=true
 
 #VERSION_NAME=1.0-SNAPSHOT
-VERSION_NAME=1.10
-VERSION_CODE=11
+VERSION_NAME=1.11
+VERSION_CODE=12
 GROUP=com.orhanobut
 
 POM_DESCRIPTION=Simple,pretty and powerful log

logger/build.gradle

@@ -1,18 +1,23 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+  compileSdkVersion 21
+  buildToolsVersion "21.1.1"
 
-    defaultConfig {
-        minSdkVersion 8
-        targetSdkVersion 21
-        versionCode 1
-        versionName "1.0"
-    }
+  defaultConfig {
+    minSdkVersion 8
+    targetSdkVersion 21
+  }
 
-    lintOptions {
-        abortOnError false
-    }
+  lintOptions {
+    abortOnError false
+  }
+}
+
+dependencies {
+  testCompile 'junit:junit:4.12'
+  testCompile "org.mockito:mockito-core:1.9.5"
+  testCompile "org.robolectric:robolectric:3.0"
+  testCompile 'org.assertj:assertj-core:1.7.0'
 }
 
 apply from: '../maven_push.gradle'

logger/src/main/AndroidManifest.xml

@@ -1,6 +1,3 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.orhanobut.logger">
+<manifest package="com.orhanobut.logger">
 
-    <application android:allowBackup="true"/>
-
-</manifest>
+</manifest>

logger/src/main/java/com/orhanobut/logger/LogLevel.java

@@ -5,13 +5,13 @@
  */
 public enum LogLevel {
 
-    /**
-     * Prints all logs
-     */
-    FULL,
+  /**
+   * Prints all logs
+   */
+  FULL,
 
-    /**
-     * No log will be printed
-     */
-    NONE
+  /**
+   * No log will be printed
+   */
+  NONE
 }

logger/src/main/java/com/orhanobut/logger/Logger.java

@@ -8,87 +8,87 @@
  */
 public final class Logger {
 
-    private static final Printer printer = new LoggerPrinter();
-    private static final String DEFAULT_TAG = "PRETTYLOGGER";
-
-    //no instance
-    private Logger() {
-    }
-
-    /**
-     * It is used to get the settings object in order to change settings
-     *
-     * @return the settings object
-     */
-    public static Settings init() {
-        return printer.init(DEFAULT_TAG);
-    }
-
-    /**
-     * It is used to change the tag
-     *
-     * @param tag is the given string which will be used in Logger
-     */
-    public static Settings init(String tag) {
-        return printer.init(tag);
-    }
-
-    public static Printer t(String tag) {
-        return printer.t(tag, printer.getSettings().getMethodCount());
-    }
-
-    public static Printer t(int methodCount) {
-        return printer.t(null, methodCount);
-    }
-
-    public static Printer t(String tag, int methodCount) {
-        return printer.t(tag, methodCount);
-    }
-
-    public static void d(String message, Object... args) {
-        printer.d(message, args);
-    }
-
-    public static void e(String message, Object... args) {
-        printer.e(null, message, args);
-    }
-
-    public static void e(Throwable throwable, String message, Object... args) {
-        printer.e(throwable, message, args);
-    }
-
-    public static void i(String message, Object... args) {
-        printer.i(message, args);
-    }
-
-    public static void v(String message, Object... args) {
-        printer.v(message, args);
-    }
-
-    public static void w(String message, Object... args) {
-        printer.w(message, args);
-    }
-
-    public static void wtf(String message, Object... args) {
-        printer.wtf(message, args);
-    }
-
-    /**
-     * Formats the json content and print it
-     *
-     * @param json the json content
-     */
-    public static void json(String json) {
-        printer.json(json);
-    }
-
-    /**
-     * Formats the json content and print it
-     *
-     * @param xml the xml content
-     */
-    public static void xml(String xml) {
-        printer.xml(xml);
-    }
+  private static final Printer printer = new LoggerPrinter();
+  private static final String DEFAULT_TAG = "PRETTYLOGGER";
+
+  //no instance
+  private Logger() {
+  }
+
+  /**
+   * It is used to get the settings object in order to change settings
+   *
+   * @return the settings object
+   */
+  public static Settings init() {
+    return printer.init(DEFAULT_TAG);
+  }
+
+  /**
+   * It is used to change the tag
+   *
+   * @param tag is the given string which will be used in Logger
+   */
+  public static Settings init(String tag) {
+    return printer.init(tag);
+  }
+
+  public static Printer t(String tag) {
+    return printer.t(tag, printer.getSettings().getMethodCount());
+  }
+
+  public static Printer t(int methodCount) {
+    return printer.t(null, methodCount);
+  }
+
+  public static Printer t(String tag, int methodCount) {
+    return printer.t(tag, methodCount);
+  }
+
+  public static void d(String message, Object... args) {
+    printer.d(message, args);
+  }
+
+  public static void e(String message, Object... args) {
+    printer.e(null, message, args);
+  }
+
+  public static void e(Throwable throwable, String message, Object... args) {
+    printer.e(throwable, message, args);
+  }
+
+  public static void i(String message, Object... args) {
+    printer.i(message, args);
+  }
+
+  public static void v(String message, Object... args) {
+    printer.v(message, args);
+  }
+
+  public static void w(String message, Object... args) {
+    printer.w(message, args);
+  }
+
+  public static void wtf(String message, Object... args) {
+    printer.wtf(message, args);
+  }
+
+  /**
+   * Formats the json content and print it
+   *
+   * @param json the json content
+   */
+  public static void json(String json) {
+    printer.json(json);
+  }
+
+  /**
+   * Formats the json content and print it
+   *
+   * @param xml the xml content
+   */
+  public static void xml(String xml) {
+    printer.xml(xml);
+  }
 
 }