Berack/upo-senior-assistant-pi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dawit

Browse Source 
# Conflicts:
#	.gradle/4.4/fileHashes/fileHashes.bin
#	.gradle/4.4/fileHashes/fileHashes.lock
#	.idea/workspace.xml
#	build.gradle
This commit is contained in:
Giacomo Bertolazzi
2018-06-01 11:29:06 +02:00
parent 8c2d94d90a cd65149211
commit 79989af712
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -21,7 +21,9 @@ dependencies {
compile 'com.google.api-client:google-api-client:1.23.0' compile 'com.google.api-client:google-api-client:1.23.0'
compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta' compile group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.11.0-beta'
// z-way-lib and all its dependencies (from https://github.com/pathec/ZWay-library-for-Java)
// z-way-lib and all its dependencies (from https://github.com/pathec/ZWay-library-for-Java)
compile files('lib/zway-lib-0.2.9-SNAPSHOT.jar') compile files('lib/zway-lib-0.2.9-SNAPSHOT.jar')
// compile 'com.google.code.gson:gson:2.4' //already up there // compile 'com.google.code.gson:gson:2.4' //already up there
compile 'org.apache.commons:commons-lang3:3.4' compile 'org.apache.commons:commons-lang3:3.4'