Merge pull request square#20 from dlew/dlew/dependencies

Modernized the build

.travis.yml

@@ -2,8 +2,11 @@ language: android
 
 android:
   components:
-    - build-tools-21.1.2
-    - android-21
+    - tools
+    - platform-tools
+    - build-tools-23.0.2
+    - android-23
+    - extra-android-m2repository
   licenses:
     - android-sdk-license-5be876d5
 

build.gradle

@@ -5,8 +5,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:1.0.0'
-    classpath 'com.github.jcandksolutions.gradle:android-unit-test:2.1.1'
+    classpath 'com.android.tools.build:gradle:1.5.0'
   }
 }
 dependencies {
@@ -22,8 +21,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
 android {
-  compileSdkVersion 21
-  buildToolsVersion '21.1.2'
+  compileSdkVersion 23
+  buildToolsVersion '23.0.2'
 
   defaultConfig {
     minSdkVersion 11
@@ -36,15 +35,13 @@ android {
   }
 }
 
-apply plugin: 'android-unit-test'
-
 dependencies {
-  compile 'com.android.support:support-annotations:21.0.3'
+  compile 'com.android.support:support-annotations:23.1.1'
 
-  testCompile 'junit:junit:4.10'
-  testCompile 'org.mockito:mockito-core:1.9.5'
+  testCompile 'junit:junit:4.12'
+  testCompile 'org.mockito:mockito-core:1.10.19'
   testCompile 'org.easytesting:fest-assert-core:2.0M10'
-  testCompile 'org.robolectric:robolectric:2.3'
+  testCompile 'org.robolectric:robolectric:3.0'
 }
 
 android.libraryVariants.all { variant ->

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Feb 04 10:58:17 PST 2015
+#Sat Feb 06 10:49:01 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

gradlew

@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

src/test/java/com/squareup/phrase/ListPhraseTest.java

@@ -16,9 +16,6 @@
 package com.squareup.phrase;
 
 import com.squareup.phrase.ListPhrase.Formatter;
-import edu.emory.mathcs.backport.java.util.Collections;
-import java.util.AbstractList;
-import java.util.List;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -27,6 +24,10 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.AbstractList;
+import java.util.Collections;
+import java.util.List;
+
 import static java.util.Arrays.asList;
 import static org.fest.assertions.api.Assertions.assertThat;