OLD | NEW |
1 apply plugin: 'com.android.application' | 1 apply plugin: 'com.android.application' |
2 apply plugin: 'kotlin-android' | 2 apply plugin: 'kotlin-android' |
3 | 3 |
4 android { | 4 android { |
5 compileSdkVersion rootProject.ext.compileSdkVersion | 5 compileSdkVersion rootProject.ext.compileSdkVersion |
6 buildToolsVersion rootProject.ext.buildToolsVersion | 6 buildToolsVersion rootProject.ext.buildToolsVersion |
7 | 7 |
8 compileOptions { | 8 compileOptions { |
9 sourceCompatibility = rootProject.ext.sourceCompatibilityVersion | 9 sourceCompatibility = rootProject.ext.sourceCompatibilityVersion |
10 targetCompatibility = rootProject.ext.targetCompatibilityVersion | 10 targetCompatibility = rootProject.ext.targetCompatibilityVersion |
11 } | 11 } |
12 | 12 |
13 defaultConfig { | 13 defaultConfig { |
14 applicationId "org.adblockplus.adblockplussbrowser" | 14 applicationId "org.adblockplus.adblockplussbrowser" |
15 minSdkVersion rootProject.ext.minSdkVersion | 15 minSdkVersion rootProject.ext.minSdkVersion |
16 targetSdkVersion rootProject.ext.targetSdkVersion | 16 targetSdkVersion rootProject.ext.targetSdkVersion |
17 versionCode 11 | 17 versionCode 11 |
18 versionName '1.1.1' | 18 versionName '1.1.1' |
19 } | 19 } |
20 | 20 |
21 sourceSets { | 21 sourceSets { |
22 main { | 22 main { |
23 manifest.srcFile 'AndroidManifest.xml' | 23 manifest.srcFile 'AndroidManifest.xml' |
24 java.srcDirs = ['src'] | 24 java.srcDirs = ['src/main/java/'] |
25 res.srcDirs = ['res'] | 25 res.srcDirs = ['res'] |
26 } | 26 } |
| 27 test { |
| 28 java.srcDirs = ['src/test/java/'] |
| 29 } |
27 } | 30 } |
28 | 31 |
29 buildTypes { | 32 buildTypes { |
30 release { | 33 release { |
31 minifyEnabled true | 34 minifyEnabled true |
32 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'progu
ard-rules.pro' | 35 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'progu
ard-rules.pro' |
33 lintOptions { | 36 lintOptions { |
34 disable 'MissingTranslation' | 37 disable 'MissingTranslation' |
35 } | 38 } |
36 } | 39 } |
37 } | 40 } |
38 | 41 |
| 42 testOptions { |
| 43 unitTests { |
| 44 includeAndroidResources = true |
| 45 } |
| 46 } |
| 47 |
39 afterEvaluate { project -> | 48 afterEvaluate { project -> |
40 project.tasks.generateReleaseResources << { | 49 project.tasks.generateReleaseResources << { |
41 updateBundledLists() | 50 updateBundledLists() |
42 println('Bundled lists updated at ' + new Date().format('dd MMM yyyy
, HH:mm:ss zzz')) | 51 println('Bundled lists updated at ' + new Date().format('dd MMM yyyy
, HH:mm:ss zzz')) |
43 } | 52 } |
44 } | 53 } |
45 } | 54 } |
46 | 55 |
47 def updateBundledLists() { | 56 def updateBundledLists() { |
48 new URL(rootProject.ext.easyListUpdateUrl).withInputStream { | 57 new URL(rootProject.ext.easyListUpdateUrl).withInputStream { |
49 i -> new File(rootProject.ext.easyListFilePath).withOutputStream { it <<
i } | 58 i -> new File(rootProject.ext.easyListFilePath).withOutputStream { it <<
i } |
50 } | 59 } |
51 new URL(rootProject.ext.exceptionRulesUpdateUrl).withInputStream { | 60 new URL(rootProject.ext.exceptionRulesUpdateUrl).withInputStream { |
52 i -> new File(rootProject.ext.exceptionRulesFilePath).withOutputStream {
it << i } | 61 i -> new File(rootProject.ext.exceptionRulesFilePath).withOutputStream {
it << i } |
53 } | 62 } |
54 } | 63 } |
55 | 64 |
56 dependencies { | 65 dependencies { |
57 testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" | 66 testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" |
| 67 testCompile 'junit:junit:4.12' |
| 68 testCompile 'org.mockito:mockito-core:2.11.0' |
| 69 testCompile 'org.robolectric:robolectric:3.5.1' |
58 compile "com.android.support:support-v4:$rootProject.ext.androidSupportLibra
ryVersion" | 70 compile "com.android.support:support-v4:$rootProject.ext.androidSupportLibra
ryVersion" |
59 compile (group: 'commons-validator', name: 'commons-validator', version: '+'
) { | 71 compile (group: 'commons-validator', name: 'commons-validator', version: '+'
) { |
60 exclude group: 'commons-logging', module: 'commons-logging' | 72 exclude group: 'commons-logging', module: 'commons-logging' |
61 } | 73 } |
62 } | 74 } |
OLD | NEW |