Merge remote-tracking branch 'origin/newTimestamps' into wifi_ftm

This commit is contained in:
2019-09-24 11:21:01 +02:00
36 changed files with 897 additions and 575 deletions

View File

@@ -1,7 +1,8 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
compileSdkVersion 29
buildToolsVersion '29.0.2'
defaultConfig {
applicationId "de.fhws.indoor.sensorreadout"
@@ -20,10 +21,13 @@ android {
}
dependencies {
implementation 'com.android.support:design:23.4.0'
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.google.android.gms:play-services:10.2.0'
implementation 'com.android.support:appcompat-v7:23.4.0'
implementation 'com.google.android.gms:play-services:10.2.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'org.apmem.tools:layouts:1.10@aar'
//compile 'com.google.android.support:wearable:1.3.0'
//compile 'com.google.android.gms:play-services-wearable:8.4.0'
//provided 'com.google.android.wearable:wearable:1.0.0'