Pull in geeksville-androidlib via git submodule

1.2-legacy
Kevin Hester 2020-03-02 10:02:50 -08:00
rodzic 6de46fc8df
commit a9c9dac3ab
7 zmienionych plików z 10 dodań i 4 usunięć

3
.gitmodules vendored
Wyświetl plik

@ -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

Wyświetl plik

@ -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>

Wyświetl plik

@ -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" />

Wyświetl plik

@ -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>

Wyświetl plik

@ -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

@ -0,0 +1 @@
Subproject commit b9616763f34cf5c09d8e0abe49fb79a5844ce27c

Wyświetl plik

@ -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')