diff --git a/app/build.gradle b/app/build.gradle
index 0800cee9..56989a5d 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,51 +21,24 @@ repositories {
}
android {
- compileSdkVersion 29
- buildToolsVersion '29.0.2'
+ compileSdkVersion project.ext.compileSdkVersion
+
defaultConfig {
applicationId project.ext.applicationId
- minSdkVersion 21
+ minSdkVersion project.ext.minSdkVersion
+ //targetSdkVersion project.ext.targetSdkVersion
versionCode project.ext.versionCode
versionName project.ext.versionName
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- multiDexEnabled true
}
+ buildToolsVersion '28.0.3'
+
+ flavorDimensions "abi"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
- dexOptions {
- preDexLibraries true
- }
-
- lintOptions {
- lintConfig file("lint.xml")
- }
-
- // We have a three dimensional build configuration:
- // BUILD TYPE (debug, release) X PRODUCT FLAVOR (focus, klar) X ARCHITECTURE (x86, arm, aarch64)
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- }
- splits {
- abi {
- enable true
- reset()
- include 'arm64-v8a'
- include 'x86'
- include 'armeabi-v7a'
- include 'x86_64'
- universalApk false
- }
- }
- }
flavorDimensions project.ext.dimen
@@ -73,49 +46,86 @@ android {
arm {
versionCode project.ext.arm_vcode
versionName project.ext.arm_vname
- dimension project.ext.dimen
+ dimension "abi"
+ ndk {
+ abiFilter "armeabi-v7a"
+ }
}
aarch64 {
versionCode project.ext.aarch_vcode
versionName project.ext.aarch_vname
- dimension project.ext.dimen
+ dimension "abi"
+ ndk {
+ abiFilter "arm64-v8a"
+ }
}
x86 {
versionCode project.ext.x86_vcode
versionName project.ext.x86_vname
- dimension project.ext.dimen
+ dimension "abi"
+ ndk {
+ abiFilter "x86"
+ }
}
x86_64 {
versionCode project.ext.x64_vcode
versionName project.ext.x64_vname
- dimension project.ext.dimen
- }
- }
-
-
- sourceSets {
- test {
- resources {
- srcDir "${projectDir}/src/main/assets/"
+ dimension "abi"
+ ndk {
+ abiFilter "x86_64"
}
}
+ signingConfigs {
+ release {
+ keyAlias 'demo'
+ keyPassword 'demodemo'
+ storeFile file("${rootProject.projectDir}/demo.keystore")
+ storePassword 'demodemo'
+ }
+ }
}
- configurations.all {
- resolutionStrategy.force 'com.android.support:support-v4:26.1.0' // the lib is old dependencies version;
+
+
+ buildTypes {
+ release {
+ minifyEnabled true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+
+ }
+ }
+ lintOptions {
+ checkReleaseBuilds false
+ // Or, if you prefer, you can continue to check for errors in release builds,
+ // but continue the build even when errors are found:
+ abortOnError false
}
}
dependencies {
+
+ // Android Support Repository dependencies
+ def supportVersion = '28.0.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
+ implementation 'androidx.preference:preference:1.1.0'
+ implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+ implementation 'androidx.recyclerview:recyclerview:1.1.0'
+
+ // Testing-only dependencies
+ androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0') {
+ exclude group: 'com.android.support', module: 'support-annotations'
+ }
+
/*Default Libraries*/
- implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta4'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'
- implementation 'com.google.android.material:material:1.2.0-alpha03'
+ implementation 'com.google.android.material:material:1.2.0-alpha04'
implementation 'androidx.preference:preference:1.1.0'
- implementation 'com.google.android.material:material:1.0.0'
+ implementation 'com.android.support:design:28.0.0'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
/*Firefox ABI Splits*/
implementation "org.mozilla.components:browser-engine-gecko:$mozilla_components_version"
@@ -138,6 +148,8 @@ dependencies {
/*Orbot Service*/
implementation project(path: ':orbotservice')
+ implementation 'com.android.support:support-v4:28.0.0'
+ implementation 'com.github.apl-devs:appintro:v4.2.2'
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f199e6de..585b3e80 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,68 +1,70 @@
An error occurred during a connection
$ERROR_M2
$ERROR