diff options
Diffstat (limited to 'app/build.gradle')
| -rw-r--r-- | app/build.gradle | 160 |
1 files changed, 86 insertions, 74 deletions
diff --git a/app/build.gradle b/app/build.gradle index b46ed9ab..a809e86a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.android.application' def appName = 'Bitmask' android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 28 + buildToolsVersion '28.0.3' compileOptions { targetCompatibility 1.8 @@ -153,43 +153,44 @@ 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 group: 'com.tngtech.java', name: 'junit-dataprovider', version: '1.10.0' androidTestImplementation 'org.mockito:mockito-core:2.8.9' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2' //TODO: remove that library androidTestImplementation 'com.jayway.android.robotium:robotium-solo:5.6.3' testImplementation 'junit:junit:4.12' testImplementation 'org.json:json:20170516' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4' - releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' - betaImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' + 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.squareup.dagger:dagger-compiler:1.2.2' implementation 'com.jakewharton:butterknife:6.1.0' //TODO: replace that library compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2' - //TODO: remove that library? 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.android.support:support-core-utils:27.0.2" - implementation 'com.android.support:support-annotations:27.0.2' - implementation 'com.android.support:support-v4:27.0.2' - implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support:design:27.0.2' - implementation 'com.android.support:support-fragment:27.0.2' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation 'com.android.support:multidex:1.0.2' - implementation 'com.android.support:cardview-v7:27.0.2' + implementation "com.android.support:support-core-utils:28.0.0" + implementation 'com.android.support:support-annotations:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:support-fragment:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.android.support:multidex:1.0.3' + implementation 'com.android.support:cardview-v7:28.0.0' } // Ensure the no-op dependency is always used in JVM tests. @@ -201,12 +202,23 @@ configurations.all { config -> } } } - resolutionStrategy.force "com.android.support:support-annotations:27.0.2" - resolutionStrategy.force "com.android.support:support-v4:27.0.2" - resolutionStrategy.force "com.android.support:support-core-utils:27.0.2" - resolutionStrategy.force "com.android.support:appcompat-v7:27.0.2" - resolutionStrategy.force "com.android.support:design:27.0.2" - resolutionStrategy.force "com.android.support:support-fragment:27.0.2" + 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" + } + } + } } def processFileInplace(file, Closure processText) { @@ -216,31 +228,31 @@ def processFileInplace(file, Closure processText) { task copyIcsOpenVPNClasses( type: Copy ) { println "copyIcsOpenVPNClasses" - from ('../ics-openvpn/main/') { - include '**/LaunchVPN.java' - include '**/OpenVPNSservice.java' - include '**/VpnProfile.java' - include '**/DisconnectVPN.java' - include '**/VpnProfile.java' - include '**/SeekBarTicks.java' - include '**/core/**.java' - include '**/activities/BaseActivity.java' - include '**/APIVpnProfile.java' - include '**/aidl/**/api/**.aidl' - include '**/aidl/**/core/**.aidl' - - includeEmptyDirs = false - - filter { - line -> line.replaceAll('de.blinkt.openvpn.R', 'se.leap.bitmaskclient.R') - } - filter { - line -> line.replaceAll('de.blinkt.openvpn.BuildConfig', 'se.leap.bitmaskclient.BuildConfig') - } - filter { - line -> line.replace('package de.blinkt.openvpn;', 'package de.blinkt.openvpn;\n\nimport se.leap.bitmaskclient.R;') - } - } into '.' +// from ('../ics-openvpn/main/') { +// include '**/LaunchVPN.java' +// include '**/OpenVPNSservice.java' +// include '**/VpnProfile.java' +// include '**/DisconnectVPN.java' +// include '**/VpnProfile.java' +// include '**/SeekBarTicks.java' +// include '**/core/**.java' +// include '**/activities/BaseActivity.java' +// include '**/APIVpnProfile.java' +// include '**/aidl/**/api/**.aidl' +// include '**/aidl/**/core/**.aidl' +// +// includeEmptyDirs = false +// +// filter { +// line -> line.replaceAll('de.blinkt.openvpn.R', 'se.leap.bitmaskclient.R') +// } +// filter { +// line -> line.replaceAll('de.blinkt.openvpn.BuildConfig', 'se.leap.bitmaskclient.BuildConfig') +// } +// filter { +// line -> line.replace('package de.blinkt.openvpn;', 'package de.blinkt.openvpn;\n\nimport se.leap.bitmaskclient.R;') +// } +// } into '.' } task copyIcsOpenVPNXml( type: Copy ) { @@ -262,31 +274,31 @@ task copyIcsOpenVPNXml( type: Copy ) { task copyIcsOpenVPNImages( type: Copy ) { println "copyIcsOpenVPNImages" - from ('../ics-openvpn/main/') { - include '**/ic_filter*.png' - include '**/ic_delete*.png' - include '**/ic_share*.png' - include '**/ic_close*.png' - include '**/ic_edit*.png' - include '**/ic_check*.png' - include '**/ic_pause*.png' - include '**/ic_play*.png' - include '**/ic_content_copy_white_*.png' - include '**/ic_add_circle_outline_white_*.png' - include '**/ic_warning_black_*.png' - include '**/ic_add_circle_outline_grey600_*.png' - include '**/ic_archive_grey600_*.png' - include '**/ic_receipt_white_*.png' - include '**/ic_sort_white_*.png' - include '**/ic_content_copy_white_*.png' - include '**/ic_archive_white_*.png' - include '**/ic_menu_archive*.png' - include '**/vpn_item_settings*.png' - include '**/ic_menu_log*.png' - include '**/ic_menu_copy_holo_light*.png' - - includeEmptyDirs = false - } into '.' +// from ('../ics-openvpn/main/') { +// include '**/ic_filter*.png' +// include '**/ic_delete*.png' +// include '**/ic_share*.png' +// include '**/ic_close*.png' +// include '**/ic_edit*.png' +// include '**/ic_check*.png' +// include '**/ic_pause*.png' +// include '**/ic_play*.png' +// include '**/ic_content_copy_white_*.png' +// include '**/ic_add_circle_outline_white_*.png' +// include '**/ic_warning_black_*.png' +// include '**/ic_add_circle_outline_grey600_*.png' +// include '**/ic_archive_grey600_*.png' +// include '**/ic_receipt_white_*.png' +// include '**/ic_sort_white_*.png' +// include '**/ic_content_copy_white_*.png' +// include '**/ic_archive_white_*.png' +// include '**/ic_menu_archive*.png' +// include '**/vpn_item_settings*.png' +// include '**/ic_menu_log*.png' +// include '**/ic_menu_copy_holo_light*.png' +// +// includeEmptyDirs = false +// } into '.' } // thanks to http://pleac.sourceforge.net/pleac_groovy/fileaccess.html |