Merge pull request #1000 from rahul27/release_v3.1

v3.1 : Update the template IO devices to use framework v3.1
Samsung · Dec 28, 2016 · 1108119 · 1108119
2 parents baf7749 + 2b2ae68
commit 1108119
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/GVRf/Extensions/3DCursor/IODevices/io_hand_template/build.gradle b/GVRf/Extensions/3DCursor/IODevices/io_hand_template/build.gradle
@@ -16,6 +16,7 @@
 apply plugin: 'com.android.library'
 
 repositories {
+    jcenter()
     flatDir {
         dirs '../../3DCursorLibrary/build/outputs/aar/',
                 '../../../../Framework/framework/build/outputs/aar/'
@@ -53,7 +54,12 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile(name:'3DCursorLibrary-debug', ext:'aar')
-    compile(name: 'framework-debug', ext: 'aar')
+    if(rootProject.useLocalDependencies) {
+        compile(name: 'framework-debug', ext: 'aar')
+        compile(name: '3DCursorLibrary-debug', ext: 'aar')
+    } else {
+        compile 'org.gearvrf:framework:3.1.0'
+        compile 'org.gearvrf:3DCursorLibrary:3.1.0'
+    }
 }
 
diff --git a/GVRf/Extensions/3DCursor/IODevices/io_template/build.gradle b/GVRf/Extensions/3DCursor/IODevices/io_template/build.gradle
@@ -15,6 +15,7 @@
 
 apply plugin: 'com.android.library'
 repositories {
+    jcenter()
     flatDir {
         dirs '../../3DCursorLibrary/build/outputs/aar/',
                 '../../../../Framework/framework/build/outputs/aar/'
@@ -49,7 +50,12 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile(name:'3DCursorLibrary-debug', ext:'aar')
-    compile(name: 'framework-debug', ext: 'aar')
+    if(rootProject.useLocalDependencies) {
+        compile(name: 'framework-debug', ext: 'aar')
+        compile(name: '3DCursorLibrary-debug', ext: 'aar')
+    } else {
+        compile 'org.gearvrf:framework:3.1.0'
+        compile 'org.gearvrf:3DCursorLibrary:3.1.0'
+    }
 }