Fixed GradleFacetImportTests for gradle 5.x

This commit is contained in:
Andrey Uskov
2019-11-19 15:17:34 +03:00
parent 9e7eff7e72
commit 8a3dfe93f2
17 changed files with 58 additions and 107 deletions
@@ -4,9 +4,10 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath "com.android.tools.build:gradle:2.3.0"
classpath "com.android.tools.build:gradle:3.4.2"
}
}
@@ -4,14 +4,12 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenLocal()
maven {
url='https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
jcenter()
google()
}
dependencies {
classpath "com.android.tools.build:gradle:2.3.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0"
classpath "com.android.tools.build:gradle:3.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"
}
}
@@ -22,9 +20,6 @@ ext {
allprojects {
repositories {
mavenLocal()
maven {
url='https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
jcenter()
}
}
@@ -4,18 +4,15 @@ 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.2.40")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
apply plugin: 'kotlin2js'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
}
@@ -4,18 +4,15 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.6")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
apply plugin: 'kotlin2js'
dependencies {
compile "org.jetbrains.kotlin:kotlin-js-library:1.0.6"
compile "org.jetbrains.kotlin:kotlin-js-library:1.3.50"
}
@@ -1,12 +1,9 @@
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
@@ -14,11 +11,8 @@ apply plugin: 'kotlin-platform-common'
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50"
}
@@ -1,12 +1,9 @@
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
@@ -27,11 +24,8 @@ sourceSets {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50"
}
@@ -5,9 +5,6 @@ buildscript {
repositories {
mavenCentral()
mavenLocal()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-dev'
}
}
dependencies {
@@ -20,7 +17,6 @@ apply plugin: 'kotlin'
repositories {
mavenLocal()
mavenCentral()
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
}
dependencies {
@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
@@ -21,7 +18,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
}
compileKotlin2Js {
@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
@@ -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.50")
}
}
@@ -18,6 +18,6 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
}
@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
@@ -21,5 +18,5 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-test-js:1.1.0"
compile "org.jetbrains.kotlin:kotlin-test-js:1.3.50"
}
@@ -4,13 +4,10 @@ version '1.0-SNAPSHOT'
buildscript {
repositories {
mavenCentral()
maven {
url 'https://dl.bintray.com/kotlin/kotlin-eap-1.1'
}
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.1.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
}
}
@@ -30,7 +27,7 @@ srcDir 'test'
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.1.0"
compile "org.jetbrains.kotlin:kotlin-stdlib-js:1.3.50"
}
compileMyMainKotlin2Js {
@@ -5,7 +5,7 @@ buildscript {
}
plugins {
id "org.jetbrains.kotlin.jvm" version "1.1.3"
id "org.jetbrains.kotlin.jvm" version "1.3.50"
}
version '1.0-SNAPSHOT'
@@ -19,7 +19,7 @@ repositories {
}
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.1.3"
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:1.3.50"
testCompile group: 'junit', name: 'junit', version: '4.12'
}
@@ -5,9 +5,10 @@ buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath "com.android.tools.build:gradle:2.3.0"
classpath "com.android.tools.build:gradle:3.1.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.50"
}
}
@@ -7,8 +7,8 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.10")
classpath("org.jetbrains.kotlin:kotlin-noarg:1.2.10")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
classpath("org.jetbrains.kotlin:kotlin-noarg:1.3.50")
}
}
@@ -7,8 +7,8 @@ buildscript {
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.10")
classpath("org.jetbrains.kotlin:kotlin-allopen:1.2.10")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50")
classpath("org.jetbrains.kotlin:kotlin-allopen:1.3.50")
}
}