Merge "TBR reader/web: adds UI for drag and drop device-set management."
diff --git a/android/app/build.gradle b/android/app/build.gradle
index e7c7c88..5618fa5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,9 +25,6 @@
repositories {
mavenCentral()
- maven {
- url 'https://maven.v.io/'
- }
}
android {
@@ -72,7 +69,7 @@
compile 'com.android.support:cardview-v7:22.2.1'
compile 'com.android.support:recyclerview-v7:22.2.1'
compile 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar'
- compile 'io.v:vanadium-android:0.1-SNAPSHOT'
+ compile 'io.v:vanadium-android:0.1'
}
vdl {
diff --git a/web/Makefile b/web/Makefile
index 18f1b35..39e4120 100644
--- a/web/Makefile
+++ b/web/Makefile
@@ -105,7 +105,7 @@
--root-dir="tmp/syncbase_$(id)" \
--name="users/$(email)/reader/$(id)/syncbase" \
--v23.namespace.root="/ns.dev.v.io:8101" \
- --v23.proxy="/ns.dev.v.io:8101/proxy" \
+ --v23.proxy="proxy" \
--v23.tcp.address=":$(syncbase_port)" \
--v23.credentials="credentials" \
--v23.permissions.literal='{"Admin":{"In":["..."]},"Write":{"In":["..."]},"Read":{"In":["..."]},"Resolve":{"In":["..."]},"Debug":{"In":["..."]}}'
@@ -120,7 +120,7 @@
--root-dir="tmp/cloudsync" \
--name="users/$(email)/reader/cloudsync" \
--v23.namespace.root="/ns.dev.v.io:8101" \
- --v23.proxy="/ns.dev.v.io:8101/proxy" \
+ --v23.proxy="proxy" \
--v23.tcp.address=":$(cloudsync_port)" \
--v23.credentials="credentials" \
--v23.permissions.literal='{"Admin":{"In":["..."]},"Write":{"In":["..."]},"Read":{"In":["..."]},"Resolve":{"In":["..."]},"Debug":{"In":["..."]}}'
