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

Update build to latest AS 4 Canary 8 (plus libraries/gradle)

fattiree0fcb5123b37
diff --git a/build.gradle b/build.gradle
index a403587..933a98f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,11 @@
buildscript {
- ext.kotlin_version = '1.3.50'
+ ext.kotlin_version = '1.3.61'
repositories {
google()
jcenter()
- maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.android.tools.build:gradle:4.0.0-alpha08'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
@@ -37,7 +36,6 @@ repositories {
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 {
@@ -145,11 +143,11 @@ configurations {
dependencies {
implementation 'androidx.appcompat:appcompat:1.1.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.annotation:annotation:1.1.0'
- implementation 'com.google.android.material:material:1.2.0-alpha02'
+ implementation 'com.google.android.material:material:1.2.0-alpha03'
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'
@@ -162,7 +160,7 @@ dependencies {
implementation 'com.facebook.fresco:fresco:2.0.0'
implementation 'com.github.derlio:audio-waveform:v1.0.1'
implementation 'com.maxproj.simplewaveform:app:1.0.0'
- implementation 'com.googlecode.libphonenumber:libphonenumber:8.11.0'
+ implementation 'com.googlecode.libphonenumber:libphonenumber:8.11.1'
implementation('com.mikepenz:aboutlibraries:7.0.3@aar') {
transitive = true
}
@@ -172,7 +170,7 @@ dependencies {
implementation 'io.github.silvaren:easyrs:0.5.3'
implementation 'org.jcodec:jcodec:0.2.5'
implementation 'org.jcodec:jcodec-android:0.2.5'
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
// Room
implementation "android.arch.persistence.room:runtime:2.1.0"
@@ -180,7 +178,7 @@ dependencies {
implementation "android.arch.lifecycle:runtime:2.1.0"
implementation "android.arch.lifecycle:extensions:2.1.0"
- testImplementation "junit:junit:4.12"
+ 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'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 23384e5..6c70f8b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-rc-3-all.zip
android.useAndroidX=true
android.enableD8=true