azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gradle: do not add ext prefix for kotlin_version property

Browse Source 
#KT-4690 Fixed
This commit is contained in:
Natalia Ukhorskaya
2014-03-17 16:19:02 +04:00
parent 85dbd8cf49
commit a9d3543967
25 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/configuration/android-gradle/gradleExamples/gradleExample0_after.gradle
+2 -2
View File
@@ -37,7 +37,7 @@ project.afterEvaluate {
dependencies {
compile project(':lib')
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
buildscript {
@@ -47,7 +47,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
repositories {
idea/testData/configuration/android-gradle/gradleExamples/gradleExample18_after.gradle
+2 -2
View File
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'android'
@@ -20,7 +20,7 @@ dependencies {
debugCompile 'com.android.support:support-v13:13.0.0'
compile 'com.google.android.gms:play-services:3.1.36'
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
android {
idea/testData/configuration/android-gradle/gradleExamples/gradleExample22_after.gradle
+2 -2
View File
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'android'
@@ -55,5 +55,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
idea/testData/configuration/android-gradle/gradleExamples/gradleExample44_after.gradle
+2 -2
View File
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'android'
@@ -64,5 +64,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
idea/testData/configuration/android-gradle/gradleExamples/gradleExample50_after.gradle
+2 -2
View File
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'android'
@@ -28,5 +28,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
idea/testData/configuration/android-gradle/gradleExamples/gradleExample58_after.gradle
+2 -2
View File
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
apply plugin: 'android'
@@ -31,5 +31,5 @@ android.applicationVariants.each { variant ->
variant.outputFile = file("$project.buildDir/${variant.name}.apk")
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
idea/testData/configuration/android-gradle/gradleExamples/gradleExample5_after.gradle
+2 -2
View File
@@ -43,12 +43,12 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
idea/testData/configuration/android-gradle/gradleExamples/gradleExample65_after.gradle
+2 -2
View File
@@ -5,7 +5,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
@@ -21,7 +21,7 @@ repositories {
dependencies {
compile 'com.example.android.multiproject:util:1.0'
releaseCompile 'com.google.guava:guava:11.0.2'
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
android {
idea/testData/configuration/android-gradle/gradleExamples/gradleExample8_after.gradle
+2 -2
View File
@@ -14,7 +14,7 @@ android {
//
dependencies {
compile project(':lib')
compile "org.jetbrains.kotlin:kotlin-stdlib:$ext.kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
buildscript {
@@ -24,7 +24,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:0.5.+'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$ext.kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
repositories {