From a9c9dac3abe46a985894bb201e4a417e0de02383 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Mon, 2 Mar 2020 10:02:50 -0800
Subject: [PATCH] Pull in geeksville-androidlib via git submodule

---
 .gitmodules           | 3 +++
 .idea/compiler.xml    | 1 +
 .idea/gradle.xml      | 2 +-
 .idea/vcs.xml         | 1 +
 TODO.md               | 4 ++--
 geeksville-androidlib | 1 +
 settings.gradle       | 2 +-
 7 files changed, 10 insertions(+), 4 deletions(-)
 create mode 160000 geeksville-androidlib

diff --git a/.gitmodules b/.gitmodules
index a989358cb..2e7f12732 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "app/src/main/proto"]
 	path = app/src/main/proto
 	url = https://github.com/meshtastic/Meshtastic-protobufs.git
+[submodule "geeksville-androidlib"]
+	path = geeksville-androidlib
+	url = https://github.com/meshtastic/geeksville-androidlib.git
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 88c27cdd3..1bd955209 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,6 +3,7 @@
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel>
       <module name="app" target="1.8" />
+      <module name="geeksville-androidlib" target="1.7" />
       <module name="Mesh Util-geeksville-androidlib" target="1.7" />
     </bytecodeTargetLevel>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9e4218b08..54874b2cf 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,7 +12,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/../geeksville-androidlib" />
+            <option value="$PROJECT_DIR$/geeksville-androidlib" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddfb..ed2599e83 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/app/src/main/proto" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
index 952209462..f0d8c3d57 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,7 +1,6 @@
 # High priority
 Work items for soon alpha builds
 
-* use git submodule for androidlib
 * run services in sim mode on emulator
 * show offline nodes as greyed out
 * show time since last contact on the node info card
@@ -159,4 +158,5 @@ Don't leave device discoverable.  Don't let unpaired users do things with device
 * when we select a new radio, restart the service
 * make channel button look like a button
 * generate real channel QR codes
-* Have play store entry ask users to report if their android version is too old to allow install
\ No newline at end of file
+* Have play store entry ask users to report if their android version is too old to allow install
+* use git submodule for androidlib
diff --git a/geeksville-androidlib b/geeksville-androidlib
new file mode 160000
index 000000000..b9616763f
--- /dev/null
+++ b/geeksville-androidlib
@@ -0,0 +1 @@
+Subproject commit b9616763f34cf5c09d8e0abe49fb79a5844ce27c
diff --git a/settings.gradle b/settings.gradle
index 79231d2cb..7477052ea 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,4 +2,4 @@ include ':app'
 rootProject.name='Mesh Util'
 
 include ':geeksville-androidlib'
-project(':geeksville-androidlib').projectDir = new File('../geeksville-androidlib')
+project(':geeksville-androidlib').projectDir = new File('geeksville-androidlib')