Side by Side Diff: adblockplussbrowser/build.gradle
Issue 29728661:
Noissue - Update dependencies and tools (Closed)
Patch Set: Update Kotlin version
Created March 28, 2018, 12:54 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
build.gradle » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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 apply plugin: 'kotlin-android-extensions' | |
| 3 | 4 |
| 4 android { | 5 android { |
| 5 compileSdkVersion rootProject.ext.compileSdkVersion | 6 compileSdkVersion rootProject.ext.compileSdkVersion |
| 6 buildToolsVersion rootProject.ext.buildToolsVersion | 7 buildToolsVersion rootProject.ext.buildToolsVersion |
| 7 | 8 |
| 8 compileOptions { | 9 compileOptions { |
| 9 sourceCompatibility = rootProject.ext.sourceCompatibilityVersion | 10 sourceCompatibility = rootProject.ext.sourceCompatibilityVersion |
| 10 targetCompatibility = rootProject.ext.targetCompatibilityVersion | 11 targetCompatibility = rootProject.ext.targetCompatibilityVersion |
| 11 } | 12 } |
| 12 | 13 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 72 i -> new File(rootProject.ext.easyListFilePath).withOutputStream { it << i } | 73 i -> new File(rootProject.ext.easyListFilePath).withOutputStream { it << i } |
| 73 } | 74 } |
| 74 new URL(rootProject.ext.exceptionRulesUpdateUrl).withInputStream { | 75 new URL(rootProject.ext.exceptionRulesUpdateUrl).withInputStream { |
| 75 i -> new File(rootProject.ext.exceptionRulesFilePath).withOutputStream { it << i } | 76 i -> new File(rootProject.ext.exceptionRulesFilePath).withOutputStream { it << i } |
| 76 } | 77 } |
| 77 } | 78 } |
| 78 | 79 |
| 79 dependencies { | 80 dependencies { |
| 80 testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" | 81 testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" |
| 81 testImplementation 'junit:junit:4.12' | 82 testImplementation 'junit:junit:4.12' |
| 82 testImplementation 'org.mockito:mockito-core:2.11.0' | 83 testImplementation 'org.mockito:mockito-core:2.16.0' |
| 83 testImplementation 'org.robolectric:robolectric:3.5.1' | 84 testImplementation 'org.robolectric:robolectric:3.8' |
| 84 implementation "com.android.support:support-v4:$rootProject.ext.androidSuppo rtLibraryVersion" | 85 implementation "com.android.support:support-v4:$rootProject.ext.androidSuppo rtLibraryVersion" |
| 85 implementation (group: 'commons-validator', name: 'commons-validator', versi on: '+') { | 86 implementation (group: 'commons-validator', name: 'commons-validator', versi on: '1.6') { |
| 86 exclude group: 'commons-logging', module: 'commons-logging' | 87 exclude group: 'commons-logging', module: 'commons-logging' |
| 87 } | 88 } |
| 88 } | 89 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
build.gradle » ('j')
|
no next file with comments »
