| LEFT | RIGHT |
| 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/main/java/'] | |
| 25 res.srcDirs = ['res'] | 24 res.srcDirs = ['res'] |
| 26 } | |
| 27 test { | |
| 28 java.srcDirs = ['src/test/java/'] | |
| 29 } | 25 } |
| 30 } | 26 } |
| 31 | 27 |
| 32 buildTypes { | 28 buildTypes { |
| 33 release { | 29 release { |
| 34 minifyEnabled true | 30 minifyEnabled true |
| 35 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'progu
ard-rules.pro' | 31 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'progu
ard-rules.pro' |
| 36 lintOptions { | 32 lintOptions { |
| 37 disable 'MissingTranslation' | 33 disable 'MissingTranslation' |
| 38 } | 34 } |
| (...skipping 26 matching lines...) Expand all Loading... |
| 65 dependencies { | 61 dependencies { |
| 66 testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" | 62 testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" |
| 67 testCompile 'junit:junit:4.12' | 63 testCompile 'junit:junit:4.12' |
| 68 testCompile 'org.mockito:mockito-core:2.11.0' | 64 testCompile 'org.mockito:mockito-core:2.11.0' |
| 69 testCompile 'org.robolectric:robolectric:3.5.1' | 65 testCompile 'org.robolectric:robolectric:3.5.1' |
| 70 compile "com.android.support:support-v4:$rootProject.ext.androidSupportLibra
ryVersion" | 66 compile "com.android.support:support-v4:$rootProject.ext.androidSupportLibra
ryVersion" |
| 71 compile (group: 'commons-validator', name: 'commons-validator', version: '+'
) { | 67 compile (group: 'commons-validator', name: 'commons-validator', version: '+'
) { |
| 72 exclude group: 'commons-logging', module: 'commons-logging' | 68 exclude group: 'commons-logging', module: 'commons-logging' |
| 73 } | 69 } |
| 74 } | 70 } |
| LEFT | RIGHT |