| OLD | NEW |
| 1 apply plugin: 'com.android.application' | 1 apply plugin: 'com.android.application' |
| 2 | 2 |
| 3 allprojects { | 3 allprojects { |
| 4 repositories { | 4 repositories { |
| 5 mavenLocal() | 5 mavenLocal() |
| 6 mavenCentral() | 6 mavenCentral() |
| 7 } | 7 } |
| 8 } | 8 } |
| 9 | 9 |
| 10 repositories { | 10 repositories { |
| 11 mavenLocal() | 11 mavenLocal() |
| 12 mavenCentral() | 12 mavenCentral() |
| 13 } | 13 } |
| 14 | 14 |
| 15 android { | 15 android { |
| 16 compileSdkVersion 21 | 16 compileSdkVersion 21 |
| 17 buildToolsVersion "25.0.0" | 17 buildToolsVersion "25.0.0" |
| 18 | 18 |
| 19 defaultConfig { | 19 defaultConfig { |
| 20 applicationId "org.adblockplus.libadblockplus.tests" | 20 applicationId "org.adblockplus.libadblockplus.tests" |
| 21 minSdkVersion 21 | 21 minSdkVersion 21 |
| 22 targetSdkVersion 21 | 22 targetSdkVersion 21 |
| 23 versionCode 1 | 23 versionCode 2 |
| 24 versionName "1.0" | 24 versionName "1.1" |
| 25 } | 25 } |
| 26 | 26 |
| 27 sourceSets { | 27 sourceSets { |
| 28 main { | 28 main { |
| 29 manifest.srcFile 'AndroidManifest.xml' | 29 manifest.srcFile 'AndroidManifest.xml' |
| 30 } | 30 } |
| 31 | 31 |
| 32 androidTest { | 32 androidTest { |
| 33 manifest.srcFile 'AndroidManifest.xml' | 33 manifest.srcFile 'AndroidManifest.xml' |
| 34 java.srcDirs = ['src'] | 34 java.srcDirs = ['src'] |
| 35 res.srcDirs = ['res'] | 35 res.srcDirs = ['res'] |
| 36 | 36 |
| 37 jni { | 37 jni { |
| 38 dependencies { | 38 dependencies { |
| 39 project(path: ":libadblockplus-android", configuration: getAbiFlavor()
+ "Debug") | 39 project(path: ":adblockplus-android", configuration: getAbiFlavor() +
"Debug") |
| 40 } | 40 } |
| 41 } | 41 } |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 } | 44 } |
| 45 | 45 |
| 46 dependencies { | 46 dependencies { |
| 47 androidTestCompile project(path: ':libadblockplus-android', configuration: get
AbiFlavor() + "Debug") | 47 androidTestCompile project(path: ':adblockplus-android', configuration: getAbi
Flavor() + "Debug") |
| 48 androidTestCompile project(':libadblockplus-android-settings') | 48 androidTestCompile project(':adblockplus-android-settings') |
| 49 androidTestCompile fileTree(include: ['*.jar'], dir: 'libs') | 49 androidTestCompile fileTree(include: ['*.jar'], dir: 'libs') |
| 50 | 50 |
| 51 androidTestCompile 'org.mockito:mockito-core:1.10.19' | 51 androidTestCompile 'org.mockito:mockito-core:1.10.19' |
| 52 androidTestCompile 'com.google.dexmaker:dexmaker:1.2' | 52 androidTestCompile 'com.google.dexmaker:dexmaker:1.2' |
| 53 androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' | 53 androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' |
| 54 } | 54 } |
| OLD | NEW |