Merge pull request #88 from d-kunin/master

Separate module for library. Parcelable models

Author: kaaes

.utility/publish-javadoc.sh

@@ -4,7 +4,7 @@ if [ "$TRAVIS_REPO_SLUG" == "kaaes/spotify-web-api-android" ] && [ "$TRAVIS_PULL
 
   echo -e "Merged new code into master branch. Publishing Javadoc to GH Pages...\n"
 
-  cp -R build/docs $HOME/javadoc-latest
+  cp -R spotify-api/build/docs $HOME/javadoc-latest
 
   cd $HOME
   git config --global user.email "[email protected]"

README.md

@@ -5,23 +5,20 @@
 This project is a wrapper for the [Spotify Web API](https://developer.spotify.com/web-api/).
 It uses [Retrofit](http://square.github.io/retrofit/) to create Java interfaces from API endpoints.
 
-## Building
+## <a name="building"></a>Building
 This project is built using [Gradle](https://gradle.org/):
 
 1. Clone the repository: `git clone https://github.com/kaaes/spotify-web-api-android.git`
 2. Build: `./gradlew assemble`
-3. Grab the `aar` that can be found in `build/outputs/aar/spotify-web-api-android-0.1.0.aar` and put it in the `libs` folder in your application
+3. Grab the `aar` that can be found in `spotify-api/build/outputs/aar/spotify-web-api-android-0.1.1.aar` and put it in the `libs` folder in your application
 
-#### Dependencies
+## Integration into your project
 
-This project depends on `Retrofit 1.9.0` and `OkHttp 2.2.0`. When you build it, it creates an `aar`
+This project depends on `Retrofit 1.9.0` and `OkHttp 2.2.0`. When you [build it](#building), it creates an `aar`
 that doesn't contain Retrofit and OkHttp files. To make your app work you'll need to include these
-dependencies in your app's `gradle.build` file.
+dependencies in your app's `build.gradle` file.
 
-The `repositories` section tells your application to look for the `spotify-web-api-android-0.1.0.aar`
-in the local repository in the `libs` folder.
-
-Add following to the `gradle.build` file in your app:
+Add following to the `build.gradle` file in your app:
 
 ```groovy
 repositories {
@@ -40,10 +37,12 @@ dependencies {
 }
 ```
 
+The `repositories` section tells your application to look for the `spotify-web-api-android-0.1.1.aar`
+in the local repository in the `libs` folder.
 
 ## Usage
 
-Out of the box it uses [OkHttp](http://square.github.io/okhttp/) HTTP client and a [single thread executor](https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Executors.html#newSingleThreadExecutor()).
+Out of the box it uses [OkHttp](http://square.github.io/okhttp/) HTTP client and a [single thread executor](https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/Executors.html).
 
 ```java
 SpotifyApi api = new SpotifyApi();

build.gradle

@@ -2,110 +2,20 @@ buildscript {
     repositories {
         jcenter()
     }
-
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
-        classpath 'org.robolectric:robolectric-gradle-plugin:1.1.0'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
-    }
-}
+        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}"
 
-apply plugin: 'android-sdk-manager'
-apply plugin: 'com.android.library'
-apply plugin: 'org.robolectric'
-
-repositories {
-    jcenter()
-}
-
-archivesBaseName="spotify-web-api-android"
-version="0.1.0"
-
-android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
-
-    buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
-
-    // make proper name for 'aar' file
-    libraryVariants.all { variant ->
-        variant.outputs.each { output ->
-            def outputFile = output.outputFile
-            if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                def fileName = "${archivesBaseName}-${version}.aar"
-                output.outputFile = new File(outputFile.parent, fileName)
-            }
-        }
-    }
-
-    lintOptions {
-        warning 'InvalidPackage'
-    }
-}
-
-dependencies {
-    compile('com.squareup.retrofit:retrofit:1.9.0') {
-        transitive = true
-    }
-    compile('com.squareup.okhttp:okhttp:2.2.0') {
-        transitive = true
-    }
-
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:2.4'
-    testCompile 'org.mockito:mockito-core:1.9.5'
 }
 
-// javadoc { The name will be 'generateReleaseJavadoc' }
-android.libraryVariants.all { variant ->
-    task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
-
-        title = "Spotify Web API Android Client - API Reference"
-        destinationDir = file("./build/docs/")
-        options.links("http://docs.oracle.com/javase/7/docs/api/");
-        options.links("http://square.github.io/retrofit/javadoc/");
-
-        source = variant.javaCompile.source
-        ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
-        classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
-    }
-}
-
-/* jacoco {`./gradlew check` generates report `build/reports/jacoco` } */
-apply plugin: 'jacoco'
-
-jacoco {
-    toolVersion = "0.7.1.201405082137"
-}
-
-def coverageSourceDirs = ['src/main/java' ]
-
-task jacocoTestReport(type:JacocoReport, dependsOn: "testDebug") {
-    group = "Reporting"
-    description = "Generate Jacoco coverage reports"
-
-    classDirectories = fileTree(
-            dir: 'build/intermediates/classes/debug',
-            excludes: ['**/R.class',
-                       '**/R$*.class',
-                       '**/*$ViewInjector*.*',
-                       '**/BuildConfig.*',
-                       '**/Manifest*.*']
-    )
-
-    additionalSourceDirs = files(coverageSourceDirs)
-    sourceDirectories = files(coverageSourceDirs)
-    executionData = files('build/jacoco/testDebug.exec')
-
-    reports {
-        xml.enabled = true
-        html.enabled = true
+subprojects {
+    repositories {
+        mavenLocal()
+        jcenter()
+        mavenCentral()
     }
-
-}
-check.dependsOn jacocoTestReport
-/* !jacoco */
+}

gradle.properties

@@ -1,18 +1,17 @@
-# Project-wide Gradle settings.
+org.gradle.daemon=true
 
-# IDE (e.g. Android Studio) users:
-# Settings specified in this file will override any Gradle settings
-# configured through the IDE.
+BASE_NAME=spotify-web-api-android
+VERSION_NAME=0.1.1
+GROUP=com.spotify.android
 
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Deps for gradle
+ANDROID_GRADLE_PLUGIN_VERSION=1.2.3
+ROBOLECTRIC_GRADLE_PLUGIN_VERSION=1.1.0
+SDKMANAGER_GRADLE_PLUGIN_VERSION=0.12.+
 
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx10248m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# 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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Jun 04 23:00:13 CEST 2015
+#Mon Jun 15 22:15:36 CEST 2015
 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.4-all.zip

release.gradle

@@ -0,0 +1,60 @@
+// javadoc { The name will be 'generateReleaseJavadoc' }
+android.libraryVariants.all { variant ->
+    task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
+
+        title = "Spotify Web API Android Client - API Reference"
+        destinationDir = file("./build/docs/")
+        options.links("http://docs.oracle.com/javase/7/docs/api/");
+        options.links("http://square.github.io/retrofit/javadoc/");
+
+        source = variant.javaCompile.source
+        ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
+        classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)
+    }
+}
+
+// make proper name for 'aar' file
+android.libraryVariants.all { variant ->
+    variant.outputs.each { output ->
+        def outputFile = output.outputFile
+        if (outputFile != null && outputFile.name.endsWith('.aar')) {
+            def fileName = "${BASE_NAME}-${version}.aar"
+            output.outputFile = new File(outputFile.parent, fileName)
+        }
+    }
+}
+
+/* jacoco {`./gradlew check` generates report `build/reports/jacoco` } */
+apply plugin: 'jacoco'
+
+jacoco {
+    toolVersion = "0.7.1.201405082137"
+}
+
+def coverageSourceDirs = ['src/main/java' ]
+
+task jacocoTestReport(type:JacocoReport, dependsOn: "testDebug") {
+    group = "Reporting"
+    description = "Generate Jacoco coverage reports"
+
+    classDirectories = fileTree(
+            dir: 'build/intermediates/classes/debug',
+            excludes: ['**/R.class',
+                       '**/R$*.class',
+                       '**/*$ViewInjector*.*',
+                       '**/BuildConfig.*',
+                       '**/Manifest*.*']
+    )
+
+    additionalSourceDirs = files(coverageSourceDirs)
+    sourceDirectories = files(coverageSourceDirs)
+    executionData = files('build/jacoco/testDebug.exec')
+
+    reports {
+        xml.enabled = true
+        html.enabled = true
+    }
+
+}
+check.dependsOn jacocoTestReport
+/* !jacoco */

settings.gradle

@@ -0,0 +1 @@
+include ':spotify-api'

spotify-api/build.gradle

@@ -0,0 +1,55 @@
+apply plugin: 'android-sdk-manager'
+apply plugin: 'com.android.library'
+apply plugin: 'org.robolectric'
+
+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 "junit:junit:${JUNIT_VERSION}"
+    testCompile "org.easytesting:fest-assert-core:${FEST_ASSERT_CORE_VERSION}"
+    testCompile "org.mockito:mockito-core:${MOCKITO_CORE_VERSION}"
+}
+
+apply from: rootProject.file('release.gradle')
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
+
+    lintOptions {
+        disable 'InvalidPackage' // for okio-1.2.0
+    }
+
+    buildTypes {
+        debug {
+            testCoverageEnabled = true
+        }
+    }
+}
+
+android.testOptions.unitTests.all {
+    // Configure includes / excludes
+    include '**/*Test.class'
+    exclude '**/espresso/**/*.class'
+
+    maxHeapSize = '2048m'
+    jvmArgs '-XX:MaxPermSize=512m', '-XX:-UseSplitVerifier'
+    maxParallelForks = 4
+    forkEvery = 150
+
+    afterTest { descriptor, result ->
+        println "Executing test for ${descriptor.name} with result: ${result.resultType}"
+    }
+}
+
+