Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Merge branch 'room_experiments' of https://github.com/archie94/haven into archie94-room_experiments
n8fr8451b659b53d5
diff --cc build.gradleindex 522c395,3cd1a74..09cb5f8--- a/build.gradle+++ b/build.gradle@@@ -4,7 -5,9 +5,8 @@@ buildscriptjcenter()}dependencies {+ classpath 'com.android.tools.build:gradle:3.5.0-alpha01'+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"- classpath 'com.android.tools.build:gradle:3.4.0-alpha02'-}}@@@ -110,16 -134,15 +133,19 @@@ android}dependencies {++<<<<<<< HEAD+ implementation 'androidx.appcompat:appcompat:1.0.2'++=======+ implementation 'androidx.appcompat:appcompat:1.0.1'++>>>>>>> 68cf160e0173ec91057984f81c802ab3566a3ecaimplementation 'androidx.cardview:cardview:1.0.0'implementation 'androidx.constraintlayout:constraintlayout:1.1.3'implementation 'androidx.preference:preference:1.0.0'- implementation 'androidx.multidex:multidex:2.0.0'- implementation 'androidx.annotation:annotation:1.0.0'+ implementation 'androidx.multidex:multidex:2.0.1'+ implementation 'androidx.annotation:annotation:1.0.1'implementation 'com.google.android.material:material:1.0.0'- implementation 'com.wdullaer:materialdatetimepicker:3.6.4'+ implementation 'com.wdullaer:materialdatetimepicker:4.1.1'implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'- implementation 'com.github.satyan:sugar:1.5'implementation 'net.the4thdimension:audio-wife:1.0.3'implementation 'com.github.apl-devs:appintro:master' /* use master until androidx ver is released */implementation 'info.guardianproject.netcipher:netcipher:2.0.0-beta1'