Side by Side Diff: adblockplussbrowser/build.gradle
Issue 29596603:
Issue 5981 - Adjust build.gradle to support Kotlin (Closed)
Patch Set: Changed kotlinVersion to camel case
Created Nov. 8, 2017, 1:30 p.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 | 3 |
| 3 android { | 4 android { |
| 4 compileSdkVersion rootProject.ext.compileSdkVersion | 5 compileSdkVersion rootProject.ext.compileSdkVersion |
| 5 buildToolsVersion rootProject.ext.buildToolsVersion | 6 buildToolsVersion rootProject.ext.buildToolsVersion |
| 6 | 7 |
| 7 compileOptions { | 8 compileOptions { |
| 8 sourceCompatibility = rootProject.ext.sourceCompatibilityVersion | 9 sourceCompatibility = rootProject.ext.sourceCompatibilityVersion |
| 9 targetCompatibility = rootProject.ext.targetCompatibilityVersion | 10 targetCompatibility = rootProject.ext.targetCompatibilityVersion |
| 10 } | 11 } |
| 11 | 12 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 46 def updateBundledLists() { | 47 def updateBundledLists() { |
| 47 new URL(rootProject.ext.easyListUpdateUrl).withInputStream { | 48 new URL(rootProject.ext.easyListUpdateUrl).withInputStream { |
| 48 i -> new File(rootProject.ext.easyListFilePath).withOutputStream { it << i } | 49 i -> new File(rootProject.ext.easyListFilePath).withOutputStream { it << i } |
| 49 } | 50 } |
| 50 new URL(rootProject.ext.exceptionRulesUpdateUrl).withInputStream { | 51 new URL(rootProject.ext.exceptionRulesUpdateUrl).withInputStream { |
| 51 i -> new File(rootProject.ext.exceptionRulesFilePath).withOutputStream { it << i } | 52 i -> new File(rootProject.ext.exceptionRulesFilePath).withOutputStream { it << i } |
| 52 } | 53 } |
| 53 } | 54 } |
| 54 | 55 |
| 55 dependencies { | 56 dependencies { |
| 57 testCompile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion" | |
| 56 compile "com.android.support:support-v4:$rootProject.ext.androidSupportLibra ryVersion" | 58 compile "com.android.support:support-v4:$rootProject.ext.androidSupportLibra ryVersion" |
| 57 compile (group: 'commons-validator', name: 'commons-validator', version: '+' ) { | 59 compile (group: 'commons-validator', name: 'commons-validator', version: '+' ) { |
| 58 exclude group: 'commons-logging', module: 'commons-logging' | 60 exclude group: 'commons-logging', module: 'commons-logging' |
| 59 } | 61 } |
| 60 } | 62 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
build.gradle » ('j')
|
no next file with comments »
