summaryrefslogtreecommitdiff
path: root/app/build.gradle
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2020-12-29 19:24:27 -0800
committercyberta <cyberta@riseup.net>2020-12-29 19:24:27 -0800
commitf03c21446566546e66c977c72c16fdb87f16ffed (patch)
tree4e3d7c5561e963504553ee941cc258b6b2b06d14 /app/build.gradle
parentfd81f2e14e36adb59d534df257e6ba2262cc362f (diff)
parent9b690df036cf91f749c0b6159a7035233a73315d (diff)
Merge branch 'update_android_10' into 'master'
Update android 10 See merge request leap/bitmask_android!118
Diffstat (limited to 'app/build.gradle')
-rw-r--r--app/build.gradle38
1 files changed, 14 insertions, 24 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 0b3403ff..979bf40f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,8 +4,7 @@ import java.util.regex.Pattern
apply plugin: 'com.android.application'
android {
- compileSdkVersion 28
- buildToolsVersion '28.0.3'
+ compileSdkVersion 30
compileOptions {
targetCompatibility 1.8
@@ -17,7 +16,7 @@ android {
versionCode 149
versionName "1.0.5"
minSdkVersion 16
- targetSdkVersion 28
+ targetSdkVersion 30
vectorDrawables.useSupportLibrary = true
buildConfigField 'boolean', 'openvpn3', 'false'
@@ -361,31 +360,29 @@ dependencies {
//TODO: remove that library
androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3'
testImplementation 'junit:junit:4.12'
- testImplementation 'org.json:json:20170516'
+ testImplementation 'org.json:json:20180813'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
betaImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2'
- annotationProcessor 'com.jakewharton:butterknife:6.1.0'
+ annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2'
- implementation 'com.jakewharton:butterknife:6.1.0'
+ implementation 'com.jakewharton:butterknife:10.2.1'
//TODO: replace that library
compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2'
implementation 'com.github.pedrovgs:renderers:1.5'
- implementation 'com.intellij:annotations:12.0'
- implementation 'com.google.code.gson:gson:2.8.2'
- implementation 'com.squareup.okhttp3:okhttp:3.9.0'
+ implementation 'com.google.code.gson:gson:2.8.6'
+ implementation 'com.squareup.okhttp3:okhttp:3.12.12'
implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
- implementation 'androidx.annotation:annotation:1.0.0'
+ implementation 'androidx.annotation:annotation:1.1.0'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'androidx.appcompat:appcompat:1.0.0'
- implementation 'com.google.android.material:material:1.0.0'
- implementation 'androidx.fragment:fragment:1.0.0'
- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
- implementation 'androidx.multidex:multidex:2.0.0'
+ implementation 'androidx.appcompat:appcompat:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
+ implementation 'androidx.fragment:fragment:1.2.5'
+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+ implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
implementation 'de.hdodenhof:circleimageview:3.1.0'
- //implementation project(path: ':shapeshifter')
fatwebImplementation project(path: ':bitmask-web-core')
fatImplementation project(path: ':bitmask-core')
x86Implementation project(path: ':bitmask-core')
@@ -449,20 +446,13 @@ configurations.all { config ->
}
}
}
- resolutionStrategy.force "com.android.support:support-annotations:28.0.0"
- resolutionStrategy.force "com.android.support:support-v4:28.0.0"
- resolutionStrategy.force "com.android.support:support-core-utils:28.0.0"
- resolutionStrategy.force "com.android.support:appcompat-v7:28.0.0"
- resolutionStrategy.force "com.android.support:design:28.0.0"
- resolutionStrategy.force "com.android.support:support-fragment:28.0.0"
}
subprojects {
afterEvaluate {project ->
if (project.hasProperty("android")) {
android {
- compileSdkVersion 28
- buildToolsVersion "28.0.3"
+ compileSdkVersion 30
}
}
}