Update gradle plugin version in GradleFacetImportTest

Also drop legacy tests for 1_1_2
This commit is contained in:
Alexander Dudinsky
2020-08-05 13:47:05 +03:00
parent f431da2a66
commit e67518c349
31 changed files with 144 additions and 332 deletions
@@ -4,14 +4,14 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
compileKotlin {
@@ -7,10 +7,14 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin-platform-jvm'
compileKotlin {
@@ -7,14 +7,18 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
compile "org.apache.logging.log4j:log4j-core:2.7"
}
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -18,7 +18,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.40"
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72"
}
compileKotlinCommon{
@@ -7,14 +7,18 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
}
kotlin {
@@ -7,12 +7,16 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -7,13 +7,13 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
compile "org.apache.logging.log4j:log4j-core:2.7"
}
@@ -4,12 +4,12 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -15,10 +15,10 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.50"
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
}
compileKotlin {
kotlinOptions.freeCompilerArgs = ["-XXLanguage:+InlineClasses"]
kotlinOptions.languageVersion = "1.2"
kotlinOptions.languageVersion = "1.3"
}
@@ -7,14 +7,14 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
compile "org.apache.logging.log4j:log4j-core:2.7"
}
@@ -4,14 +4,18 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
}
compileKotlin {
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -7,10 +7,14 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin'
sourceSets {
@@ -27,7 +31,7 @@ srcDir 'test'
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
compileMyMainKotlin {
@@ -1,48 +0,0 @@
group 'Again'
version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-5")
}
}
apply plugin: 'kotlin'
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
sourceSets {
myMain {
kotlin {
srcDir 'src'
}
}
myTest {
kotlin {
srcDir 'test'
}
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.2-5"
}
compileMyMainKotlin {
kotlinOptions.jvmTarget = "1.7"
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
}
compileMyTestKotlin {
kotlinOptions.jvmTarget = "1.6"
kotlinOptions.apiVersion = "1.0"
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
}
@@ -1,37 +0,0 @@
group 'Again'
version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-dev'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.2-5")
}
}
apply plugin: 'kotlin'
repositories {
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.1.2-5"
}
compileKotlin {
kotlinOptions.jvmTarget = "1.7"
kotlinOptions.freeCompilerArgs = ["-Xsingle-module", "-Xdump-declarations-to", "tmp"]
}
compileTestKotlin {
kotlinOptions.jvmTarget = "1.6"
kotlinOptions.apiVersion = "1.0"
kotlinOptions.freeCompilerArgs = ["-Xdump-declarations-to", "tmpTest"]
}
@@ -9,7 +9,7 @@ buildscript {
}
dependencies {
classpath "com.android.tools.build:gradle:3.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
}
}
@@ -15,9 +15,9 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.1"
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8"
}
@@ -2,15 +2,19 @@ buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-dev'
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:1.3.72")
}
}
repositories {
mavenCentral()
}
apply plugin: 'kotlin'
repositories {
@@ -21,5 +25,5 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.11"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -14,6 +14,6 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.2.60"
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
implement project(":")
}
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -27,6 +27,6 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.60"
compile "org.jetbrains.kotlin:kotlin-stdlib"
implement project(":")
}
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -14,7 +14,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72"
}
compileKotlinCommon {
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -27,6 +27,6 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.2.60"
compile "org.jetbrains.kotlin:kotlin-stdlib-js"
implement project(":")
}
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -14,6 +14,6 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.60"
compile "org.jetbrains.kotlin:kotlin-stdlib"
implement project(":")
}
@@ -3,7 +3,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -14,5 +14,5 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.2.60"
compile "org.jetbrains.kotlin:kotlin-stdlib-common"
}
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -15,5 +15,5 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.50"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
@@ -4,7 +4,7 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72")
}
}
@@ -15,9 +15,9 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib:1.2.50"
compile "org.jetbrains.kotlin:kotlin-stdlib"
}
compileKotlin {
kotlinOptions.languageVersion = "1.2"
kotlinOptions.languageVersion = "1.3"
}