From 39ad538d52f783ce513b80340c961b332e46f974 Mon Sep 17 00:00:00 2001
From: Patrick Jackson <patrick.jackson@ticketmaster.com>
Date: Wed, 14 Nov 2018 12:28:18 -0500
Subject: [PATCH] updated version number and README

---
 README.md       |  7 ++++---
 build.gradle    | 19 ++++++++++++++++++-
 settings.gradle |  4 +++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c1f3bb3..5f223ea 100644
--- a/README.md
+++ b/README.md
@@ -18,18 +18,19 @@ __Quick Facts__
  * Conversation Components & Transaction Sample ported
  * Supports v2 of Actions on Google API (if v1 is needed, make an issue please)
 
-
 ## V2 Support
 
 The V2 release is available by using:
 
-        compile 'com.tmsdurham.actions:actions-on-google:2.0.1'
-	
+        compile 'com.tmsdurham.actions:actions-on-google:2.0.2'
+
 The V2 is mostly complete, but may have a few bugs and missing features.  All Conversation components and Transaction API are working.  Dialogflow & ActionSDK has been tested and working.  The API matches the official node.js API very closely.  The sample in this repo is a good place to get started.  The setup and samples in this readme have not been updated yet.  There are a few differerences and additions:
 
 	* use action name from Dialogflow instead of intent name.  The official library changed from using the action field, to using the intent name.  There is a PR open on the official SDK for support for action.  If/when this is merged, this library will be updated to match.
 	* middleware not supported.  Same functionality can be implemented without lib support by wrapping handlers in fuctions.
 
+
+
 __V2 notes__:
 A common module was used with the intent on targeting multiple platforms (JS & possibly native).  These other platforms are purely experimental at this time.  A single code base for JVM and JS would be more efficient.
 
diff --git a/build.gradle b/build.gradle
index 06dd800..f007e09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 allprojects {
     group 'com.ticketmaster.actions'
-    version '1-SNAPSHOT'
+    version '2.0.2'
 
     apply plugin: 'idea'
     idea {
@@ -45,8 +46,17 @@ buildscript {
     }
 }
 
+<<<<<<< Updated upstream
 ext {
     sdkVersion = '2.0.2-alpha' //version of deployed artifacts
+=======
+<<<<<<< Updated upstream
+repositories {
+    mavenCentral()
+=======
+ext {
+    sdkVersion = '2.0.2' //version of deployed artifacts
+>>>>>>> Stashed changes
     nodeVersion = '8.11.1'
     qunitVersion = '2.6.0'
     libraries = [
@@ -59,6 +69,13 @@ ext {
             kotlin_test_js                : "org.jetbrains.kotlin:kotlin-test-js:$kotlinVersion",
             kotlin_test_junit             : "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion",
     ]
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
+}
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+>>>>>>> Stashed changes
 }
 
 subprojects {
diff --git a/settings.gradle b/settings.gradle
index ecacd8c..7782512 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,4 @@
+include ':sdk', ':sdk-gson-servlet', ':dialogflow-samples', ':action-sdk-samples'
 rootProject.name = 'actions-on-google-kotlin'
 
 include ':common'
@@ -6,4 +7,5 @@ include ':jvm'
 include ':jvm-app'
 include ':js'
 include ':js-app'
-include ':sample-gae-jvm'
+//include ':sample-gae-jvm'
+