Pull in geeksville-androidlib via git submodule

eriktheV-king · Mar 2, 2020 · a9c9dac · a9c9dac
1 parent 6de46fc
commit a9c9dac
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 4 deletions.
diff --git 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
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git 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
+* 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
diff --git 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')