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 gradle to work with latest Android Studio beta

n8fr803d4cf264e1a
diff --git a/build.gradle b/build.gradle
index 92e4446..bf7f2fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.4-M3'
+ ext.kotlin_version = '1.4.21'
repositories {
google()
jcenter()
@@ -31,7 +31,7 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+//apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'
@@ -67,6 +67,10 @@ android {
compileSdkVersion 30
buildToolsVersion = '30.0.3'
+ buildFeatures {
+ viewBinding true
+ }
+
packagingOptions {
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
@@ -90,6 +94,8 @@ android {
archivesBaseName = "Haven-$versionName"
minSdkVersion 16
targetSdkVersion 30
+ ndkVersion '21.3.6528147'
+ //ndkPath '/home/n8fr8/Android/Ndk'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@@ -176,7 +182,7 @@ dependencies {
implementation 'com.github.ybq:Android-SpinKit:1.4.0'
implementation 'io.github.silvaren:easyrs:0.5.3'
// jcodec's pure-java video coding replaced by android system encoding
- implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.21"
// Room
@@ -197,7 +203,7 @@ dependencies {
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"
+ androidTestImplementation "androidx.room:room-testing:2.2.6"
// android-job
implementation 'com.evernote:android-job:1.4.2'