Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: build.gradle

Issue 29596603: Issue 5981 - Adjust build.gradle to support Kotlin (Closed)
Left Patch Set: Created Nov. 3, 2017, 10:59 a.m.
Right 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.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « adblockplussbrowser/build.gradle ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 buildscript { 1 buildscript {
2 ext.kotlin_version = '1.1.51' 2 // buildscript block is evaluated at the very beginning. Properties defined in the ext block
anton 2017/11/03 12:00:20 should not it be in the section below where the ot
jens 2017/11/03 12:45:54 Yeah, I wonder why it's not. Looks like Android St
diegocarloslima 2017/11/08 11:37:20 Minor thing, but for the other variables in ext, w
3 // don't exist at that time.
4 ext.kotlinVersion = '1.1.51'
3 repositories { 5 repositories {
4 jcenter() 6 jcenter()
5 } 7 }
6 dependencies { 8 dependencies {
7 classpath 'com.android.tools.build:gradle:2.3.1' 9 classpath 'com.android.tools.build:gradle:2.3.1'
8 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
9 } 11 }
10 } 12 }
11 13
12 allprojects { 14 allprojects {
13 repositories { 15 repositories {
14 jcenter() 16 jcenter()
15 mavenCentral() 17 mavenCentral()
16 } 18 }
17 } 19 }
18 20
19 ext { 21 ext {
20 minSdkVersion = 21 22 minSdkVersion = 21
21 targetSdkVersion = 25 23 targetSdkVersion = 25
22 compileSdkVersion = 25 24 compileSdkVersion = 25
23 buildToolsVersion = '25.0.3' 25 buildToolsVersion = '25.0.3'
24 androidSupportLibraryVersion = '25.3.1' 26 androidSupportLibraryVersion = '25.3.1'
25 sourceCompatibilityVersion = JavaVersion.VERSION_1_7 27 sourceCompatibilityVersion = JavaVersion.VERSION_1_7
26 targetCompatibilityVersion = JavaVersion.VERSION_1_7 28 targetCompatibilityVersion = JavaVersion.VERSION_1_7
27 easyListUpdateUrl = 'https://easylist-downloads.adblockplus.org/easylist.txt ' 29 easyListUpdateUrl = 'https://easylist-downloads.adblockplus.org/easylist.txt '
28 exceptionRulesUpdateUrl = 'https://easylist-downloads.adblockplus.org/except ionrules.txt' 30 exceptionRulesUpdateUrl = 'https://easylist-downloads.adblockplus.org/except ionrules.txt'
29 easyListFilePath = file('adblockplussbrowser/res/raw/easylist.txt').absolute Path 31 easyListFilePath = file('adblockplussbrowser/res/raw/easylist.txt').absolute Path
30 exceptionRulesFilePath = file('adblockplussbrowser/res/raw/exceptionrules.tx t').absolutePath 32 exceptionRulesFilePath = file('adblockplussbrowser/res/raw/exceptionrules.tx t').absolutePath
31 } 33 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld