Changed gradle-plugin version in Gradle tests.

When 6.5.1 Gradle version was added, more tests have began to fail
because of legacy gradle-plugin versions (1.1., 1.2.) which are not
compatible with the new version of Gradle. This commit updates the used
version of the Gradle plugin to the latest stable (1.3.72) and makes it
configurable from tests.
This commit is contained in:
Alexander Dudinsky
2020-08-04 12:57:40 +03:00
parent 6652a7072c
commit 05d6217f78
68 changed files with 252 additions and 111 deletions
@@ -4,12 +4,12 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-{{kotlin_plugin_version}}"
}
@@ -4,14 +4,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-{{kotlin_plugin_version}}"
}
kotlin {
experimental {
@@ -4,12 +4,12 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -4,14 +4,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
compileKotlin {
kotlinOptions {
+2 -2
View File
@@ -4,12 +4,12 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -4,13 +4,13 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
implementation "org.jetbrains.kotlin:kotlin-reflect:1.0.0"
}
@@ -1,8 +1,8 @@
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
dependencies {
testCompile("junit:junit:4.12")
compile(kotlinModule("stdlib-jre8"))
compile(kotlin("stdlib-jre8"))
}
@@ -1,9 +1,9 @@
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
dependencies {
testCompile("junit:junit:4.12")
compile(kotlinModule("stdlib-jre8"))
compile(kotlin("stdlib-jre8"))
implementation(kotlin("reflect"))
}
@@ -1,8 +1,8 @@
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
dependencies {
testCompile("junit:junit:4.12")
compile(kotlinModule("stdlib-jre8"))
compile(kotlin("stdlib-jre8"))
}
@@ -1,9 +1,9 @@
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
dependencies {
testCompile("junit:junit:4.12")
compile(kotlinModule("stdlib-jre8"))
compile(kotlin("stdlib-jre8"))
implementation("org.a.b:lib:1.0.0")
}
@@ -1,7 +1,7 @@
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
dependencies {
compile(kotlinModule("stdlib-jre8"))
compile(kotlin("stdlib-jre8"))
}
@@ -1,9 +1,9 @@
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
dependencies {
compile(kotlinModule("stdlib-jre8"))
compile(kotlin("stdlib-jre8"))
testImplementation("junit:junit:4.12")
testImplementation(kotlin("test"))
}
@@ -4,14 +4,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
kotlin {
experimental {
@@ -4,14 +4,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
kotlin {
experimental {
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.Coroutines
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
kotlin {
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.Coroutines
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
kotlin {
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.Coroutines
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
kotlin {
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.Coroutines
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
kotlin {
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -19,6 +19,6 @@ dependencies {
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
freeCompilerArgs = ["-Xinline-classes"]
}
}
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
@@ -4,14 +4,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
compileKotlin {
kotlinOptions {
@@ -4,14 +4,14 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
compileKotlin {
kotlinOptions {
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
val compileKotlin: KotlinCompile by tasks
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.50"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
val compileKotlin: KotlinCompile by tasks
@@ -0,0 +1,15 @@
buildscript {
repositories {
jcenter()
mavenCentral()
}
}
plugins {
id 'org.jetbrains.kotlin.jvm' version '1.0.6'
}
repositories {
mavenCentral()
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -0,0 +1,25 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.1.2"
}
buildscript {
repositories {
jcenter()
mavenCentral()
}
}
dependencies {
implementation(kotlin("stdlib-jre8"))
}
repositories {
mavenCentral()
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = "1.8"
}
val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = "1.8"
}
@@ -0,0 +1,22 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.60-dev-286"
}
group = "testgroup"
version = "1.0-SNAPSHOT"
dependencies {
implementation(kotlin("stdlib-jdk8"))
}
repositories {
maven("https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_KotlinPublic_Compiler),number:1.2.60-dev-286,branch:(default:any)/artifacts/content/maven")
mavenCentral()
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
jvmTarget = "1.8"
}
val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = "1.8"
}
@@ -0,0 +1,18 @@
plugins {
id 'java'
id 'org.jetbrains.kotlin.jvm' version '1.0.6'
}
group 'testgroup'
version '1.0-SNAPSHOT'
sourceCompatibility = 1.8
repositories {
mavenCentral()
}
dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
implementation "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -1,4 +1,4 @@
plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
val compileKotlin: KotlinCompile by tasks
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -19,6 +19,6 @@ dependencies {
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
freeCompilerArgs = ["-Xinline-classes"]
}
}
@@ -1,3 +1,3 @@
plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
@@ -1,9 +1,9 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
kotlin("jvm") version "1.2.70"
kotlin("jvm") version "{{kotlin_plugin_version}}"
}
val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
freeCompilerArgs = listOf("-XXLanguage:+InlineClasses")
freeCompilerArgs = listOf("-Xinline-classes")
}
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin-multiplatform"
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin-multiplatform"
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin-multiplatform"
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.0-rc-190"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin-multiplatform"
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -5,7 +5,7 @@ buildscript {
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.11"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
apply plugin: "kotlin"
@@ -19,7 +19,7 @@ dependencies {
}
compileKotlin {
kotlinOptions {
freeCompilerArgs = ["-XXLanguage:+SamConversionForKotlinFunctions", "-XXLanguage:+InlineClasses"]
freeCompilerArgs = ["-XXLanguage:+SamConversionForKotlinFunctions", "-Xinline-classes"]
// Free compiler arguments
}
}
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
}
}
@@ -1,6 +1,6 @@
plugins {
id 'java'
id 'org.jetbrains.kotlin.jvm' version '1.2.50'
id 'org.jetbrains.kotlin.jvm' version '{{kotlin_plugin_version}}'
}
repositories {
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
}
}
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
}
}
@@ -1 +1 @@
test=1.3.0
test={{kotlin_plugin_version}}
@@ -1,2 +1,2 @@
kotlin=1.3.10
kotlin={{kotlin_plugin_version}}
lib_version=1.3.30
@@ -9,12 +9,12 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
}
}
apply plugin: 'kotlin-platform-common'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.40"
compile "org.jetbrains.kotlin:kotlin-stdlib-common"
}
@@ -9,12 +9,12 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.40"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7"
}
@@ -11,9 +11,7 @@ buildscript {
allprojects {
repositories {
google()
jcenter()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
{{kotlin_plugin_repositories}}
}
}
@@ -6,6 +6,11 @@ buildscript {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
}
}
repositories {
{{kotlin_plugin_repositories}}
}
apply plugin: 'kotlin-multiplatform'
group 'com.example'
@@ -1,6 +1,4 @@
include('mpp-base')
include('mpp')
include('jvm')
enableFeaturePreview('STABLE_PUBLISHING')
include('jvm')