Generate new Gradle dependency directives when is version above 3.4 (KT-22571)

^KT-22571 Fixed
This commit is contained in:
Nikolay Krasko
2018-11-22 18:05:02 +03:00
parent 7aa195b017
commit e4da6c268a
41 changed files with 113 additions and 59 deletions
@@ -13,7 +13,7 @@ apply {
plugin("kotlin-android")
}
dependencies {
compile(kotlinModule("stdlib-jdk7", kotlin_version))
implementation(kotlinModule("stdlib-jdk7", kotlin_version))
}
repositories {
mavenCentral()
@@ -41,7 +41,7 @@ android {
dependencies {
compile("com.android.support:appcompat-v7:23.4.0")
compile("com.android.support.constraint:constraint-layout:1.0.0-alpha8")
compile(kotlinModule("stdlib-jdk7", kotlin_version))
implementation(kotlinModule("stdlib-jdk7", kotlin_version))
}
repositories {
@@ -10,7 +10,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
buildscript {
ext.kotlin_version = '$VERSION$'
@@ -11,7 +11,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
buildscript {
ext.kotlin_version = '$VERSION$'
@@ -5,7 +5,7 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre8"
}
compileKotlin {
kotlinOptions {
+1 -1
View File
@@ -7,5 +7,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
implementation "org.jetbrains.kotlin:kotlin-stdlib-js"
}
@@ -11,7 +11,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
buildscript {
ext.kotlin_version = '$VERSION$'
@@ -6,7 +6,7 @@ version = '1.0'
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
buildscript {
@@ -6,7 +6,7 @@ version = '1.0'
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
buildscript {
@@ -11,7 +11,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
buildscript {
ext.kotlin_version = '$VERSION$'
@@ -10,7 +10,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.11'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
buildscript {
ext.kotlin_version = '$VERSION$'
@@ -17,7 +17,7 @@ repositories {
dependencies {
testCompile("junit:junit:4.12")
compile(kotlin("stdlib-jre8"))
implementation(kotlin("stdlib-jre8"))
}
// VERSION: $VERSION$
@@ -16,7 +16,7 @@ repositories {
dependencies {
testCompile("junit:junit:4.12")
compile(kotlin("stdlib"))
implementation(kotlin("stdlib"))
}
// VERSION: $VERSION$
@@ -16,7 +16,7 @@ repositories {
dependencies {
testCompile("junit:junit:4.12")
compile(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib-jdk8"))
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
@@ -30,7 +30,7 @@ repositories {
dependencies {
testCompile("junit:junit:4.12")
compile(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib-jdk8"))
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
@@ -20,7 +20,7 @@ repositories {
dependencies {
testCompile("junit:junit:4.12")
compile(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib-jdk8"))
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
@@ -13,5 +13,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
@@ -11,5 +11,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib"
implementation "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -16,7 +16,7 @@ apply {
plugin("kotlin")
}
dependencies {
compile(kotlinModule("stdlib-jre8", kotlin_version))
implementation(kotlinModule("stdlib-jre8", kotlin_version))
}
repositories {
mavenCentral()
@@ -10,7 +10,7 @@ buildscript {
}
}
dependencies {
compile(kotlin("stdlib-jre8"))
implementation(kotlin("stdlib-jre8"))
}
repositories {
mavenCentral()
@@ -18,7 +18,7 @@ apply {
plugin("kotlin")
}
dependencies {
compile(kotlinModule("stdlib-jdk8", kotlin_version))
implementation(kotlinModule("stdlib-jdk8", kotlin_version))
}
repositories {
maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") }
@@ -6,7 +6,7 @@ plugins {
group = "testgroup"
version = "1.0-SNAPSHOT"
dependencies {
compile(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib-jdk8"))
}
repositories {
maven { setUrl("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_Compiler),number:1.2.60-dev-286,branch:default:any/artifacts/content/maven/") }
@@ -9,5 +9,5 @@ repositories {
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
implementation "org.jetbrains.kotlin:kotlin-stdlib-js"
}
@@ -9,5 +9,5 @@ repositories {
maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }
}
dependencies {
compile(kotlin("stdlib-js"))
implementation(kotlin("stdlib-js"))
}
@@ -8,5 +8,5 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
implementation "org.jetbrains.kotlin:kotlin-stdlib-js"
}
@@ -8,5 +8,5 @@ repositories {
mavenCentral()
}
dependencies {
compile(kotlin("stdlib-js"))
implementation(kotlin("stdlib-js"))
}
@@ -15,7 +15,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
compileKotlin {
kotlinOptions {
@@ -14,7 +14,7 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
compileKotlin {
kotlinOptions {
@@ -14,7 +14,7 @@ repositories {
dependencies {
testCompile("junit", "junit", "4.12")
compile(kotlin("stdlib-jdk8"))
implementation(kotlin("stdlib-jdk8"))
}
configure<JavaPluginConvention> {
@@ -20,7 +20,7 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
compileKotlin {
kotlinOptions {
@@ -10,7 +10,7 @@ repositories {
mavenCentral()
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
compileKotlin {
kotlinOptions {
@@ -23,5 +23,5 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
@@ -14,5 +14,5 @@ repositories {
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib"
implementation "org.jetbrains.kotlin:kotlin-stdlib"
}