Fixed build when fetching artifacts from Maven

gearvrf · Sep 13, 2018 · 338a783 · 338a783
1 parent a601316
commit 338a783
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/gvr-arcore/app/build.gradle b/gvr-arcore/app/build.gradle
@@ -28,6 +28,10 @@ dependencies {
     implementation "com.google.ar:core:1.2.0"
     implementation 'com.android.support:support-v4:27.0.2'
 
-    debugCompile(name: 'MixedReality-debug', ext: 'aar')
-    releaseCompile(name: 'MixedReality-release', ext: 'aar')
+    if (project.hasProperty("useLocalDependencies") && project.useLocalDependencies) {
+        debugCompile(name: 'MixedReality-debug', ext: 'aar')
+        releaseCompile(name: 'MixedReality-release', ext: 'aar')
+    } else {
+        compile "org.gearvrf:MixedReality:$gearvrfVersion"
+    }
 }
diff --git a/gvr-javascript/app/build.gradle b/gvr-javascript/app/build.gradle
@@ -28,10 +28,14 @@ android {
 }
 
 dependencies {
-    if (findProject(':script')) {
-        implementation project (':script')
+    if (project.hasProperty("useLocalDependencies") && project.useLocalDependencies) {
+        if (findProject(':script')) {
+			implementation project (':script')
+		} else {
+			debugCompile(name: 'script-debug', ext: 'aar')
+			releaseCompile(name: 'script-release', ext: 'aar')
+		}
     } else {
-        debugCompile(name: 'script-debug', ext: 'aar')
-        releaseCompile(name: 'script-release', ext: 'aar')
+        compile "org.gearvrf:script:$gearvrfVersion"
     }
 }
diff --git a/gvr-remote-scripting/app/build.gradle b/gvr-remote-scripting/app/build.gradle
@@ -29,11 +29,15 @@ android {
 }
 
 dependencies {
-    if (findProject(':script')) {
-        implementation project (':script')
+    if (project.hasProperty("useLocalDependencies") && project.useLocalDependencies) {
+        if (findProject(':script')) {
+			implementation project (':script')
+		} else {
+			debugCompile(name: 'script-debug', ext: 'aar')
+			releaseCompile(name: 'script-release', ext: 'aar')
+		}
     } else {
-        debugCompile(name: 'script-debug', ext: 'aar')
-        releaseCompile(name: 'script-release', ext: 'aar')
+        compile "org.gearvrf:script:$gearvrfVersion"
     }
 
     if(project.hasProperty("useLocalDependencies") && project.useLocalDependencies) {

diff --git a/gvr-x3d-demo/app/build.gradle b/gvr-x3d-demo/app/build.gradle
@@ -10,11 +10,15 @@ else if(file("../../../../GearVRf-Demos/common.gradle").exists()) {
 }
 
 dependencies {
-    if (findProject(':script')) {
-        implementation project (':script')
+    if (project.hasProperty("useLocalDependencies") && project.useLocalDependencies) {
+        if (findProject(':script')) {
+			implementation project (':script')
+		} else {
+			debugCompile(name: 'script-debug', ext: 'aar')
+			releaseCompile(name: 'script-release', ext: 'aar')
+		}
     } else {
-        debugCompile(name: 'script-debug', ext: 'aar')
-        releaseCompile(name: 'script-release', ext: 'aar')
+        compile "org.gearvrf:script:$gearvrfVersion"
     }
 
     if (project.hasProperty("useLocalDependencies") && project.useLocalDependencies) {