build gradle updated

bandlab · Jul 27, 2016 · 708bdb0 · 708bdb0
1 parent 803d30d
commit 708bdb0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 project.ext.publishingGroupId = 'com.bandlab.m4m'
-project.ext.publishingVersion = '1.0.3'
+project.ext.publishingVersion = '1.0.4'
 apply from: '../artifactory.gradle'
 
 android {
@@ -22,6 +22,7 @@ android {
 }
 
 dependencies {
-    compile project(':domain')
+//    compile project(':domain')
+    compile "com.bandlab.m4m:domain:$project.ext.publishingVersion"
     testCompile 'junit:junit:4.12'
 }
diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,20 @@ plugins {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url getBuildProperty("ARTIFACTORY_CONTEXT_URL") + "/" + getBuildProperty("ARTIFACTORY_REPO_KEY")
+            credentials {
+                username getBuildProperty("ARTIFACTORY_USERNAME")
+                password getBuildProperty("ARTIFACTORY_PASSWORD")
+            }
+        }
+        maven {
+            url getBuildProperty("ARTIFACTORY_CONTEXT_URL") + "/" + getBuildProperty("ARTIFACTORY_SNAPSHOTS_REPO_KEY")
+            credentials {
+                username getBuildProperty("ARTIFACTORY_USERNAME")
+                password getBuildProperty("ARTIFACTORY_PASSWORD")
+            }
+        }
     }
     afterEvaluate { project ->
         if (project.hasProperty("android")) {
@@ -38,7 +52,7 @@ Object getBuildProperty(String varName, String defaultValue = null) {
         return System.getenv()[varName]
     }
 
-    def File propsFile = file(rootProject.file('local.properties'))
+    def File propsFile = file(project.rootProject.file('local.properties'))
     if (propsFile.exists() && propsFile.canRead()) {
         def Properties localProps = new Properties()
 

diff --git a/domain/build.gradle b/domain/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 project.ext.publishingGroupId = 'com.bandlab.m4m'
-project.ext.publishingVersion = '1.0.3'
+project.ext.publishingVersion = '1.0.4'
 apply from: '../artifactory_java.gradle'
 
 dependencies {

diff --git a/effects/build.gradle b/effects/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 project.ext.publishingGroupId = 'com.bandlab.m4m'
-project.ext.publishingVersion = '1.0.3'
+project.ext.publishingVersion = '1.0.4'
 apply from: '../artifactory.gradle'
 
 android {
@@ -21,6 +21,8 @@ android {
 }
 
 dependencies {
-    compile project(':domain')
-    compile project(':android')
+    compile "com.bandlab.m4m:domain:$project.ext.publishingVersion"
+    compile "com.bandlab.m4m:android:$project.ext.publishingVersion"
+//    compile project(':domain')
+//    compile project(':android')
 }