mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

minor fixes to work with virgin build trees

pull/8/head
Kevin Hester 2020-02-27 13:07:11 -08:00
rodzic c3d464929c
commit c3260a3fd7
5 zmienionych plików z 14 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
.idea/compiler.xml 100644
Wyświetl plik

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<bytecodeTargetLevel>
<module name="app" target="1.8" />
<module name="Mesh Util-geeksville-androidlib" target="1.7" />
</bytecodeTargetLevel>
</component>
</project>

2
.idea/gradle.xml
Wyświetl plik

@ -10,9 +10,9 @@
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$/../../geeksville-androidlib" />
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/../geeksville-androidlib" />
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />

2
build.gradle
Wyświetl plik

@ -9,7 +9,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0-alpha09' classpath 'com.android.tools.build:gradle:4.1.0-alpha01'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
gradle/wrapper/gradle-wrapper.properties vendored
Wyświetl plik

@ -1,6 +1,6 @@
#Tue Jan 21 19:05:09 PST 2020 #Thu Feb 27 12:08:19 PST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-all.zip

2
settings.gradle
Wyświetl plik

@ -2,4 +2,4 @@ include ':app'
rootProject.name='Mesh Util' rootProject.name='Mesh Util'
include ':geeksville-androidlib' include ':geeksville-androidlib'
project(':geeksville-androidlib').projectDir = new File('/home/kevinh/development/geeksville-androidlib') project(':geeksville-androidlib').projectDir = new File('../geeksville-androidlib')