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

setup gradle to 3.3 and kotlin to 1.3 maintains compat with Android Studio 3.3 stable

n8fr834a8ea95c4c4
diff --git a/build.gradle b/build.gradle
index 09cb5f8..f53a0ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,11 @@
buildscript {
- ext.kotlin_version = '1.2.60'
+ ext.kotlin_version = '1.3.0'
repositories {
google()
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.0-alpha01'
+ classpath 'com.android.tools.build:gradle:3.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
@@ -133,11 +133,7 @@ android {
}
dependencies {
-<<<<<<< HEAD
implementation 'androidx.appcompat:appcompat:1.0.2'
-=======
- implementation 'androidx.appcompat:appcompat:1.0.1'
->>>>>>> 68cf160e0173ec91057984f81c802ab3566a3eca
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.preference:preference:1.0.0'