[Gradle Release Plugin] - pre tag commit: 'v0.7.0'.

Author: tyvsmith

CHANGELOG.md

@@ -1,5 +1,14 @@
-v0.6.1 - TBD
+v0.7.0 - TBD
 ------------
+This release refactors the SDK binary into three binaries and deprecates the previous one. This is a breaking change for imports for the majority of classes as we prepare for the 1.0 roadmap release with a stable API. This allows downstream dependencies to be able to avoid the oauth-client library dependency. 
+
+Check the [README](https://github.com/uber/rides-java-sdk/blob/master/README.md) for the latest integration instructions to update your gradle/maven dependency.
+
+### Breaking
+- Refactored SDK into three modules, uber-core, uber-rides, and uber-core-oauth-client-adapter. [Issue #34](https://github.com/uber/rides-java-sdk/issues/34)
+  - Repackaged com.uber.sdk.rides.auth.* classes to com.uber.sdk.core.auth.*
+  - Repackaged com.uber.sdk.rides.client.[AccessTokenSession, ServerTokenSession, Session, SessionConfiguration] to com.uber.sdk.core.client.*
+  - Moved Maven Artifact ID from 'sdk' to 'uber-rides', 'uber-core-oauth-client-adapter', and 'uber-core'. Old binary will no longer be updated.
 
 v0.6.0 - 11/11/2016
 ------------

README.md

@@ -14,7 +14,8 @@ Note: Using Android? Be sure to checkout the [Uber Android SDK](github.com/uber/
 If using Gradle, add this to your project’s `build.gradle` file:
 ```gradle
 dependencies {
-    compile 'com.uber.sdk:rides:0.6.0'
+    compile 'com.uber.sdk:uber-rides:0.7.0'
+    compile 'com.uber.sdk:uber-core-oauth-client-adapter:0.7.0'
 }
 ```
 
@@ -23,8 +24,14 @@ If using Maven, add this to your project's `pom.xml` file:
 ```xml
 <dependency>
   <groupId>com.uber.sdk</groupId>
-  <artifactId>rides</artifactId>
-  <version>0.6.0</version>
+  <artifactId>uber-rides</artifactId>
+  <version>0.7.0</version>
+</dependency>
+
+<dependency>
+  <groupId>com.uber.sdk</groupId>
+  <artifactId>uber-core-oauth-client-adapter</artifactId>
+  <version>0.7.0</version>
 </dependency>
 ```
 

build.gradle

@@ -168,7 +168,9 @@ task updateChangelog() << {
     }
 }
 
-afterReleaseBuild.dependsOn ':sdk:uploadArchives'
+afterReleaseBuild.dependsOn (   ':uber-core:uploadArchives',
+                                ':uber-core-oauth-client-adapter:uploadArchives',
+                                ':uber-rides:uploadArchives')
 updateVersion.dependsOn ':githubRelease'
 commitNewVersion.dependsOn ':updateChangelog'
 githubRelease.dependsOn project(':samples').subprojects.collect { it.path + ':githubReleaseZip' }
@@ -218,14 +220,15 @@ distributions {
                     line.replaceAll('@version@', unsnapshottedVersion)
                 }
             }
-
-            from('sdk') {
-                filter { String line ->
-                    line.replaceAll('@version@', unsnapshottedVersion)
+            ['uber-core', 'uber-core-oauth-client-adapter', 'uber-rides'].each { folder ->
+                from(folder) {
+                    filter { String line ->
+                        line.replaceAll('@version@', unsnapshottedVersion)
+                    }
+                    exclude 'build'
+                    exclude '*.iml'
+                    into folder
                 }
-                exclude 'build'
-                exclude '*.iml'
-                into 'sdk'
             }
 
             from('samples') {

gradle.properties

@@ -22,6 +22,5 @@
 
 group=com.uber.sdk
 groupId=com.uber.sdk
-artifactId=rides
 githubDownloadPrefix=https://github.com/uber/rides-java-sdk/releases/download/
-version=0.6.1-SNAPSHOT
+version=0.7.0

samples/build.gradle

@@ -66,8 +66,17 @@ subprojects {
 
         from('.') {
             filter { String line ->
-                line.replaceAll("compile project\\(':sdk'\\)",
-                        "compile '${groupId}:${artifactId}:${unsnapshottedVersion}'")
+                line.replaceAll("compile project\\(':uber-core'\\)",
+                        "compile '${groupId}:uber-core:${unsnapshottedVersion}'")
+            }
+            filter { String line ->
+                line.replaceAll("compile project\\(':uber-core-oauth-client-adapter'\\)",
+                        "compile '${groupId}:uber-core-oauth-client-adapter:${unsnapshottedVersion}'")
+            }
+
+            filter { String line ->
+                line.replaceAll("compile project\\(':uber-rides'\\)",
+                        "compile '${groupId}:uber-rides:${unsnapshottedVersion}'")
             }
             into '.'
             exclude 'build'

samples/cmdline-sample/README.md

@@ -10,7 +10,8 @@ This is a beta Java SDK not intended to be run on Android. An official Android S
 
 First, add your client ID and secret retrieved from developer.uber.com to `src/main/resources/secrets.properties`.
 
-To run the command line sample, run `$ ./gradlew clean build run`. You may need to add the redirect URL to your application (at developer.uber.com) for OAuth2 to succeed.
+To run the command line sample, run `$ ./gradlew clean :samples:cmdline-sample:build :samples:cmdline-sample:run`. You
+may need to add the redirect URL to your application (at developer.uber.com) for OAuth2 to succeed.
 
 Running the sample will store user credentials in your home directory under `.uber_credentials` for future executions.
 

samples/cmdline-sample/build.gradle

@@ -32,7 +32,8 @@ repositories {
 }
 
 dependencies {
-    compile project(':sdk')
+    compile project(':uber-core-oauth-client-adapter')
+    compile project(':uber-rides')
     compile 'com.google.oauth-client:google-oauth-client-jetty:1.19.0'
     compile 'com.google.oauth-client:google-oauth-client-servlet:1.19.0'
 }

samples/cmdline-sample/src/main/java/com/uber/sdk/rides/samples/cmdline/GetUserProfile.java

@@ -26,15 +26,15 @@
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
 import com.google.api.client.util.store.AbstractDataStoreFactory;
 import com.google.api.client.util.store.FileDataStoreFactory;
-import com.uber.sdk.rides.auth.OAuth2Credentials;
-import com.uber.sdk.rides.client.CredentialsSession;
-import com.uber.sdk.rides.client.SessionConfiguration;
+import com.uber.sdk.core.auth.OAuth2Credentials;
+import com.uber.sdk.core.client.CredentialsSession;
+import com.uber.sdk.core.client.SessionConfiguration;
+import com.uber.sdk.rides.client.services.RidesService;
 import com.uber.sdk.rides.client.UberRidesApi;
 import com.uber.sdk.rides.client.error.ApiError;
 import com.uber.sdk.rides.client.error.ClientError;
 import com.uber.sdk.rides.client.error.ErrorParser;
 import com.uber.sdk.rides.client.model.UserProfile;
-import com.uber.sdk.rides.client.services.RidesService;
 
 import java.io.File;
 import java.io.FileReader;

samples/servlet-sample/README.md

@@ -10,14 +10,19 @@ This is a beta Java SDK not intended to be run on Android. An official Android S
 
 First, add your client ID and secret retrieved from developer.uber.com to `src/main/resources/secrets.properties`.
 
-To run the servlet sample, run `$ ./gradlew clean build run`. You may need to add the redirect URL (http://localhost:8181/Callback) to your application (at developer.uber.com) for OAuth2 to succeed.
+To run the servlet sample, run `$ ./gradlew clean :samples:servlet-sample:build :samples:servlet-sample:run`. You may
+need to add the redirect URL (http://localhost:8181/Callback) to your application (at developer.uber.com)
+for OAuth2 to succeed.
 
 For full documentation, visit our [Developer Site](https://developer.uber.com/v1/endpoints/).
 
 ## Getting help
 
-Uber developers actively monitor the [uber tag](http://stackoverflow.com/questions/tagged/uber-api) on StackOverflow. If you need help installing or using the library, you can ask a question there.  Make sure to tag your question with `uber-api` and `java`!
+Uber developers actively monitor the [uber tag](http://stackoverflow.com/questions/tagged/uber-api) on StackOverflow.
+If you need help installing or using the library, you can ask a question there.  Make sure to tag your question
+with `uber-api` and `java`!
 
 ## Contributing
 
-We :heart: contributions. If you've found a bug in the library or would like new features added, go ahead and open issues or pull requests against this repo.  Write a test to show your bug was fixed or the feature works as expected.
+We :heart: contributions. If you've found a bug in the library or would like new features added, go ahead and open
+issues or pull requests against this repo.  Write a test to show your bug was fixed or the feature works as expected.

samples/servlet-sample/build.gradle

@@ -32,7 +32,8 @@ repositories {
 }
 
 dependencies {
-    compile project(':sdk')
+    compile project(':uber-core-oauth-client-adapter')
+    compile project(':uber-rides')
     compile 'com.google.oauth-client:google-oauth-client-jetty:1.19.0'
     compile 'com.google.oauth-client:google-oauth-client-servlet:1.19.0'
     compile 'org.eclipse.jetty:jetty-server:9.2.10.v20150310'