Skip to content

armgit / haven

Public Imported from GitHub
0

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 'android_studio_4.2c5' of https://github.com/fat-tire/haven into fat-tire-android_studio_4.2c5

n8fr8afa4f9e83449
diff --cc build.gradle
index 5925a19,7f0177c..4b7af0d
--- a/build.gradle
+++ b/build.gradle
@@@ -34,7 -37,11 +37,10 @@@ apply plugin: 'kotlin-kapt
repositories {
google()
jcenter()
- maven { url 'https://github.com/FireZenk/maven-repo/raw/master/' }
maven { url 'https://jitpack.io' }
+ maven {
+ url "https://dl.bintray.com/kotlin/kotlin-eap/"
+ }
}
allprojects {
@@@ -141,13 -147,13 +147,13 @@@ configurations
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
+ implementation 'androidx.appcompat:appcompat:1.2.0'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
- implementation 'androidx.preference:preference:1.1.1'
+ implementation 'androidx.preference:preference-ktx:1.1.1'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.annotation:annotation:1.1.0'
- implementation 'com.google.android.material:material:1.3.0-alpha01'
+ implementation 'com.google.android.material:material:1.3.0-alpha02'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'com.wdullaer:materialdatetimepicker:4.2.3'
implementation 'com.github.guardianproject:signal-cli-android:v0.6.0-android-beta-1'
@@@ -178,12 -187,14 +187,14 @@@
implementation "android.arch.lifecycle:runtime:2.1.0"
implementation "android.arch.lifecycle:extensions:2.1.0"
+ // Test helpers
+ testImplementation "androidx.room:room-testing:2.2.5"
testImplementation 'junit:junit:4.13'
- androidTestImplementation 'androidx.test:runner:1.2.0'
- androidTestImplementation 'androidx.test:core:1.2.0'
- androidTestImplementation 'androidx.test:rules:1.2.0'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
- androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+ androidTestImplementation 'androidx.test:runner:1.3.0'
+ androidTestImplementation 'androidx.test:core:1.3.0'
+ androidTestImplementation 'androidx.test:rules:1.3.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+ androidTestImplementation 'androidx.test.espresso:espresso-intents:3.3.0'
androidTestImplementation "android.arch.persistence.room:testing:2.1.0"
// android-job