Merge pull request #16 from uber/ts/add-travis

Add Travis support and fix minor versioning issues

Author: tyvsmith

.travis.yml

@@ -0,0 +1,5 @@
+language: java
+
+jdk:
+  - oraclejdk7
+  - openjdk7 

CHANGELOG.md

@@ -1,5 +1,8 @@
-v0.5.1 - 6/7/2016
+v0.5.2 - TBD
 ------------
+
+v0.5.1 - 6/7/2016
+-----------------
 ### Fixed
  - [Issue #14](https://github.com/uber/rides-java-sdk/issues/14) Adjust RefreshAuthenticator to ignore Invalid scope
 

README.md

@@ -1,12 +1,12 @@
-# Uber Rides Java SDK (Beta)
+# Uber Rides Java SDK (Beta) [![Build Status](https://travis-ci.org/uber/rides-java-sdk.svg?branch=master)](https://travis-ci.org/uber/rides-java-sdk)
 This SDK helps your Java App make HTTP requests to the Uber Rides API.
 
 ## Setup
 
 ### Installing
 
 #### Before you begin
-Register your app in the [Uber developer dashboard](https://developer.uber.com/dashboard). Notice that the app gets a client ID, secret, and server token required for authenticating with the API. 
+Register your app in the [Uber developer dashboard](https://developer.uber.com/dashboard). Notice that the app gets a client ID, secret, and server token required for authenticating with the API.
 
 Note: Using Android? Be sure to checkout the [Uber Android SDK](github.com/uber/rides-android-sdk) in addition, which has native authentication mechanisms.
 
@@ -44,7 +44,7 @@ ServerTokenSession session = new ServerTokenSession(config));
 ```
 #### Create a session using the OAuth 2 flow
 In an OAuth session, the app first asks the user to authorize and then exchanges the authorization code for an access token from Uber.
-Note: Make sure the redirect URI matches the callback URI in the developer dashboard for the app. 
+Note: Make sure the redirect URI matches the callback URI in the developer dashboard for the app.
 
 **Step 1**. Create an OAuth2Credentials object with your client ID, client secret, scopes, and a redirect callback URI to capture the user’s authorization code.
 ```java
@@ -54,13 +54,13 @@ SessionConfiguration config = new SessionConfiguration.Builder()
     .setScopes(yourScopes)
     .setRedirectUri(redirectUri)
     .build();
-    
+
 OAuth2Credentials credentials = new OAuth2Credentials.Builder()
     .setSessionConfiguration(config)
     .build();
-    
+
 ```
-**Step 2**. Navigate the user to the authorization URL from the OAuth2Credentials object. 
+**Step 2**. Navigate the user to the authorization URL from the OAuth2Credentials object.
 ```java
 String authorizationUrl = credentials.getAuthorizationUrl();
 ```  

build.gradle

@@ -155,8 +155,22 @@ gradle.taskGraph.beforeTask { Task task ->
     }
 }
 
+task updateChangelog() << {
+    def newVersion = findProperty("version").replaceAll('-SNAPSHOT', '')
+    def changelog = rootProject.file('CHANGELOG.md')
+    def changelogText = changelog.text
+    if (!changelogText.startsWith("v${newVersion} -")) {
+        def updatedChangelog = "v${newVersion} - TBD\n"
+        def dashesCount = updatedChangelog.length()-1
+        updatedChangelog += "-"*dashesCount + "\n\n"
+
+        changelog.write(updatedChangelog + changelogText)
+    }
+}
+
 afterReleaseBuild.dependsOn ':sdk:uploadArchives'
 updateVersion.dependsOn ':githubRelease'
+commitNewVersion.dependsOn ':updateChangelog'
 githubRelease.dependsOn project(':samples').subprojects.collect { it.path + ':githubReleaseZip' }
 
 release {
@@ -195,6 +209,7 @@ distributions {
                 include 'releasenotes.gtpl'
                 include 'settings.gradle'
                 include 'gradle/'
+                include '.travis.yml'
             }
 
             from(rootDir) {

sdk/src/main/java/com/uber/sdk/rides/client/internal/ApiInterceptor.java

@@ -34,7 +34,7 @@ public class ApiInterceptor implements Interceptor {
     static final String HEADER_ACCESS_TOKEN = "Authorization";
 
 
-    static final String LIB_VERSION = "0.5.1";
+    static final String LIB_VERSION = "0.5.2";
     static final String HEADER_ACCEPT_LANGUAGE = "Accept-Language";
     static final String HEADER_USER_AGENT = "X-Uber-User-Agent";