Skip to content

Commit a7a00c7

Browse files
authored
Merge pull request #61 from ticketmaster/v2_pr
apply v2 to master git history
2 parents e7f4383 + 62f57a5 commit a7a00c7

File tree

1,876 files changed

+202728
-15361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,876 files changed

+202728
-15361
lines changed

README.md

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Actions On Google Client Library
22

3+
4+
5+
36
![](https://storage.googleapis.com/kotlin-actions-sdk.appspot.com/actions-kotlin-java.png)
47

58
This is a port of the [official Node.js SDK](https://github.com/actions-on-google/actions-on-google-nodejs) to Kotlin. This can also be used from Java and any JVM language.
@@ -15,40 +18,56 @@ __Quick Facts__
1518
* Conversation Components & Transaction Sample ported
1619
* Supports v2 of Actions on Google API (if v1 is needed, make an issue please)
1720

18-
## Setup Instructions
21+
22+
## V2 Support
23+
24+
The V2 release is available by using:
25+
26+
compile 'com.tmsdurham.actions:actions-on-google:2.0.1'
27+
28+
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:
29+
30+
* 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.
31+
* middleware not supported. Same functionality can be implemented without lib support by wrapping handlers in fuctions.
32+
33+
__V2 notes__:
34+
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.
35+
36+
## Setup Instructions(V1 - see sample for V2 setup and use)
1937

2038
This library is available on jCenter. If your using gradle simply add the dependency as follows:
2139

2240
__Gradle:__
2341

2442
repositories {
25-
jcenter()
43+
jCenter()
44+
}
2645
}
2746

2847
dependencies {
29-
compile 'com.tmsdurham.actions:actions-on-google:1.6.3'
48+
compile 'com.tmsdurham.actions:actions-on-google:1.6.0'
3049
}
3150
__Maven:__
3251

3352
<dependency>
3453
<groupId>com.tmsdurham.actions</groupId>
3554
<artifactId>actions-on-google</artifactId>
36-
<version>1.6.3</version>
55+
<version>1.6.0</version>
3756
<type>pom</type>
3857
</dependency>
3958

4059
The above artifact should fit the needs of most developers, however, if you are not using ```java.servlet.http.HttpServlet```, or do not want to use [Gson](https://github.com/google/gson) for deserialization, you can use the ```actions-on-google-core lib```. For example how to use the core library, reading through the sdk-gson-servlet module.
4160

4261
__Gradle:__
4362

44-
compile 'com.tmsdurham.actions:actions-on-google-core:1.6.3'. //only if not using Servlets
63+
compile 'com.tmsdurham.actions:actions-on-google-core:1.6.0'. //only if not using Servlets
4564

4665
__Maven:__
4766

4867
<dependency>
4968
<groupId>com.tmsdurham.actions</groupId>
5069
<artifactId>actions-on-google-core</artifactId> //only if not using Servlets
51-
<version>1.6.3</version>
70+
<version>1.6.0</version>
5271
<type>pom</type>
5372
</dependency>
5473

action-sdk-samples/action.json

Lines changed: 0 additions & 21 deletions
This file was deleted.

action-sdk-samples/build.gradle

Lines changed: 0 additions & 44 deletions
This file was deleted.

action-sdk-samples/src/main/java/com/tmsdurham/actions/ConversationComponentsSample.kt

Lines changed: 0 additions & 234 deletions
This file was deleted.

action-sdk-samples/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 0 additions & 16 deletions
This file was deleted.

action-sdk-samples/src/main/webapp/WEB-INF/web.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)