diff options
| author | cyberta <cyberta@riseup.net> | 2022-01-31 23:32:41 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2022-01-31 23:32:41 +0000 |
| commit | e631257d3f0e55bfb77e32d25a798bd3d0d3ff25 (patch) | |
| tree | 41796be8a9b56f5a66ab803b8a98a10f9d43f6af /app/build.gradle | |
| parent | 77908103f7d6d5bd6c8bd20c8e2ca0c9ac45da4d (diff) | |
| parent | 30cedf1f95f4f430ddc378d963e8cd46c1bd0903 (diff) | |
Merge branch 'update_tor-android-buildTools' into 'master'
Some cleanup
See merge request leap/bitmask_android!167
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/app/build.gradle b/app/build.gradle index 4d5ce050..df1634c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,6 +6,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 ndkVersion "21.4.7075529" + buildToolsVersion '30.0.3' compileOptions { targetCompatibility 1.8 @@ -369,21 +370,20 @@ android { dependencies { testImplementation 'junit:junit:4.12' //outdated mockito-core version due to powermock dependency - testImplementation 'org.mockito:mockito-core:2.8.9' - testImplementation('org.powermock:powermock-api-mockito2:1.7.3') - { exclude group: 'junit' exclude group: 'org.mockito' } - testImplementation 'org.powermock:powermock-module-junit4:1.7.3' - testImplementation 'org.powermock:powermock-core:1.7.3' - testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.3' + testImplementation 'org.mockito:mockito-core:3.6.0' + testImplementation('org.powermock:powermock-api-mockito2:2.0.9') + // { exclude group: 'junit' exclude group: 'org.mockito' } + testImplementation 'org.powermock:powermock-module-junit4:2.0.9' + testImplementation 'org.powermock:powermock-core:2.0.9' + testImplementation 'org.powermock:powermock-module-junit4-rule:2.0.9' testImplementation group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.10.0' - androidTestImplementation 'org.mockito:mockito-core:2.8.9' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0' + androidTestImplementation 'org.mockito:mockito-core:3.6.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.4.0' //TODO: remove that library androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3' - testImplementation 'junit:junit:4.12' 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' |