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

update ide to canary 4

pull/8/head
geeksville 2020-03-29 11:49:35 -07:00
rodzic b085a7f761
commit 5b60253e00
5 zmienionych plików z 7 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.idea/compiler.xml
Wyświetl plik

@ -5,6 +5,8 @@
<module name="app" target="1.8" /> <module name="app" target="1.8" />
<module name="geeksville-androidlib" target="1.7" /> <module name="geeksville-androidlib" target="1.7" />
<module name="Mesh Util-geeksville-androidlib" target="1.7" /> <module name="Mesh Util-geeksville-androidlib" target="1.7" />
<module name="Mesh_Util.app" target="1.8" />
<module name="Mesh_Util.geeksville-androidlib" target="1.7" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
</project> </project>

1
.idea/gradle.xml
Wyświetl plik

@ -16,6 +16,7 @@
</set> </set>
</option> </option>
<option name="resolveModulePerSourceSet" value="false" /> <option name="resolveModulePerSourceSet" value="false" />
<option name="useQualifiedModuleNames" value="true" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

2
build.gradle
Wyświetl plik

@ -9,7 +9,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.0-alpha01' classpath 'com.android.tools.build:gradle:4.1.0-alpha04'
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

2
geeksville-androidlib

@ -1 +1 @@
Subproject commit 669bc3fbb54ffaef3db086d1a756489b781fb2a0 Subproject commit 65f39f90ce365263620d5f9cbddca0c8abebcf9a

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

@ -1,6 +1,6 @@
#Thu Feb 27 12:08:19 PST 2020 #Sun Mar 29 11:25:06 PDT 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.2-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-1-bin.zip