From cdd00eeab5d8b890815885f0aa1bf90be9287e66 Mon Sep 17 00:00:00 2001
From: Harold Cooper <hrldcpr@gmail.com>
Date: Mon, 13 Jul 2015 18:14:38 -0400
Subject: [PATCH] better way to depend on DFULibrary

---
 .idea/gradle.xml  | 2 --
 .idea/modules.xml | 2 --
 app/build.gradle  | 2 +-
 settings.gradle   | 5 ++++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cff9e6e6..5609b20b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,8 +8,6 @@
         <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.2.1" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$/.." />
-            <option value="$PROJECT_DIR$/../DFULibrary" />
             <option value="$PROJECT_DIR$/../DFULibrary/dfu" />
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0b9e7f95..27665145 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/../...iml" filepath="$PROJECT_DIR$/../...iml" />
-      <module fileurl="file://$PROJECT_DIR$/../DFULibrary/DFULibrary.iml" filepath="$PROJECT_DIR$/../DFULibrary/DFULibrary.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/../DFULibrary/dfu/dfu.iml" filepath="$PROJECT_DIR$/../DFULibrary/dfu/dfu.iml" />
       <module fileurl="file://$PROJECT_DIR$/nRFToolbox.iml" filepath="$PROJECT_DIR$/nRFToolbox.iml" />
diff --git a/app/build.gradle b/app/build.gradle
index 35991da2..50805557 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:design:22.2.0'
-    compile project(':..:DFULibrary:dfu')
+    compile project(':dfu')
     compile files('libs/achartengine-1.1.0.jar')
     compile files('libs/nrf-logger-v2.0.jar')
 }
diff --git a/settings.gradle b/settings.gradle
index 1618263e..5b6a3f0a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
-include ':app', '..:DFULibrary:dfu'
+include ':app'
+
+include ':dfu'
+project(':dfu').projectDir = file('../DFULibrary/dfu')