Bump the version to 2.0, cleanup

* Bump the version of the library to 0.2.0
* Bump Robolectric to 3.0
* Bump gradle plugin to 1.3.0
* Remove unnecessary dependency on okio

Author: kaaes

build.gradle

@@ -4,7 +4,6 @@ buildscript {
     }
     dependencies {
         classpath "com.android.tools.build:gradle:${ANDROID_GRADLE_PLUGIN_VERSION}"
-        classpath "org.robolectric:robolectric-gradle-plugin:${ROBOLECTRIC_GRADLE_PLUGIN_VERSION}"
         classpath "com.jakewharton.sdkmanager:gradle-plugin:${SDKMANAGER_GRADLE_PLUGIN_VERSION}"
         classpath "com.github.dcendents:android-maven-gradle-plugin:1.3"
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -1,17 +1,16 @@
 org.gradle.daemon=true
 
 BASE_NAME=spotify-web-api-android
-VERSION_NAME=0.1.1
+VERSION_NAME=0.2.0
 GROUP=com.spotify.android
 
 # Deps for gradle
-ANDROID_GRADLE_PLUGIN_VERSION=1.2.3
-ROBOLECTRIC_GRADLE_PLUGIN_VERSION=1.1.0
+ANDROID_GRADLE_PLUGIN_VERSION=1.3.0
 SDKMANAGER_GRADLE_PLUGIN_VERSION=0.12.+
 
 # Deps for libraries
 FEST_ASSERT_CORE_VERSION=2.0M10
 GUAVA_VERSION=18.0
 JUNIT_VERSION=4.12
 MOCKITO_CORE_VERSION=1.+
-ROBOLECTRIC_VERSION=2.4
+ROBOLECTRIC_VERSION=3.0

release.gradle

@@ -33,7 +33,7 @@ jacoco {
 
 def coverageSourceDirs = ['src/main/java' ]
 
-task jacocoTestReport(type:JacocoReport, dependsOn: "testDebug") {
+task jacocoTestReport(type:JacocoReport, dependsOn: "test") {
     group = "Reporting"
     description = "Generate Jacoco coverage reports"
 

sample-search/build.gradle

@@ -12,10 +12,6 @@ android {
         versionName "1.0"
     }
 
-    lintOptions {
-        disable 'InvalidPackage' // for okio-1.2.0
-    }
-
     buildTypes {
         release {
             minifyEnabled false

spotify-api/build.gradle

@@ -1,21 +1,19 @@
 apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.library'
-apply plugin: 'org.robolectric'
 apply plugin: 'com.github.dcendents.android-maven'
 
 project.group = GROUP
 version = VERSION_NAME
 
 dependencies {
     compile('com.squareup.retrofit:retrofit:1.9.0')
-    compile('com.squareup.okhttp:okhttp:2.2.0')
 
     testCompile("org.robolectric:robolectric:${ROBOLECTRIC_VERSION}") {
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
-    testCompile  "com.google.guava:guava:${GUAVA_VERSION}"
+    testCompile "com.google.guava:guava:${GUAVA_VERSION}"
     testCompile "junit:junit:${JUNIT_VERSION}"
     testCompile "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}"
     testCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
@@ -27,10 +25,6 @@ android {
     compileSdkVersion 23
     buildToolsVersion '23.0.2'
 
-    lintOptions {
-        disable 'InvalidPackage' // for okio-1.2.0
-    }
-
     buildTypes {
         debug {
             testCoverageEnabled = true

spotify-api/src/main/java/kaaes/spotify/webapi/android/SpotifyService.java

@@ -1388,42 +1388,44 @@ public interface SpotifyService {
     /**
      * Get the current user's followed artists.
      *
+     * @return Object containing a list of artists that user follows wrapped in a cursor object.
      * @see <a href="https://developer.spotify.com/web-api/get-followed-artists/">Get User's Followed Artists</a>
      */
     @GET("/me/following?type=artist")
-    public ArtistsCursorPager getFollowedArtists();
+    ArtistsCursorPager getFollowedArtists();
 
     /**
      * Get the current user's followed artists.
      *
-     * @param callback   Callback method.
+     * @param callback Callback method.
      * @return An empty result
      * @see <a href="https://developer.spotify.com/web-api/get-followed-artists/">Get User's Followed Artists</a>
      */
     @GET("/me/following?type=artist")
-    public Result getFollowedArtists(Callback<ArtistsCursorPager> callback);
+    Result getFollowedArtists(Callback<ArtistsCursorPager> callback);
 
     /**
      * Get the current user's followed artists.
      *
-     * @param options  Optional parameters. For list of supported parameters see
-     *                 <a href="https://developer.spotify.com/web-api/get-followed-artists/">endpoint documentation</a>
+     * @param options Optional parameters. For list of supported parameters see
+     *                <a href="https://developer.spotify.com/web-api/get-followed-artists/">endpoint documentation</a>
+     * @return Object containing a list of artists that user follows wrapped in a cursor object.
      * @see <a href="https://developer.spotify.com/web-api/get-followed-artists/">Get User's Followed Artists</a>
      */
     @GET("/me/following?type=artist")
-    public ArtistsCursorPager getFollowedArtists(@QueryMap Map<String, Object> options);
+    ArtistsCursorPager getFollowedArtists(@QueryMap Map<String, Object> options);
 
     /**
      * Get the current user's followed artists.
      *
      * @param options  Optional parameters. For list of supported parameters see
      *                 <a href="https://developer.spotify.com/web-api/get-followed-artists/">endpoint documentation</a>
-     * @param callback   Callback method.
+     * @param callback Callback method.
      * @return An empty result
      * @see <a href="https://developer.spotify.com/web-api/get-followed-artists/">Get User's Followed Artists</a>
      */
     @GET("/me/following?type=artist")
-    public Result getFollowedArtists(@QueryMap Map<String, Object> options, Callback<ArtistsCursorPager> callback);
+    Result getFollowedArtists(@QueryMap Map<String, Object> options, Callback<ArtistsCursorPager> callback);
 
     /**********
      * Search *

spotify-api/src/test/resources/org.robolectric.Config.properties

@@ -0,0 +1,3 @@
+sdk=21
+constants= com.spotify.webapi.android.BuildConfig
+manifest=src/main/AndroidManifest.xml