Migrate import tests to annotation-driven determination of target
kotlin plugin versions
This commit is contained in:
+1
-2
@@ -22,8 +22,7 @@ android {
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "../include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
def kotlinVersion = '{{kotlin_plugin_version}}'
|
||||
|
||||
|
||||
dependencies {
|
||||
|
||||
+2
-5
@@ -1,10 +1,7 @@
|
||||
buildscript {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
def kotlinVersion = '{{kotlin_plugin_version}}'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.0'
|
||||
|
||||
+2
-8
@@ -1,15 +1,9 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
mavenCentral()
|
||||
maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.50')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
apply plugin: 'kotlin-multiplatform'
|
||||
|
||||
@@ -1,19 +1,15 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-11
@@ -1,14 +1,10 @@
|
||||
buildscript {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.21')
|
||||
def kotlinVersion = "{{kotlin_plugin_version}}"
|
||||
|
||||
|
||||
ext.kotlin_version = "$kotlinVersion"
|
||||
repositories {
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
|
||||
|
||||
google()
|
||||
jcenter()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -19,11 +15,7 @@ buildscript {
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
|
||||
|
||||
google()
|
||||
jcenter()
|
||||
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-9
@@ -1,21 +1,15 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
plugins {
|
||||
id 'org.jetbrains.kotlin.jvm' version '1.3.41' apply false
|
||||
id 'org.jetbrains.kotlin.jvm' version '{{kotlin_plugin_version}}' apply false
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-5
@@ -1,11 +1,8 @@
|
||||
plugins {
|
||||
id 'org.jetbrains.kotlin.multiplatform' version '1.3.50'
|
||||
id 'org.jetbrains.kotlin.multiplatform' version '{{kotlin_plugin_version}}'
|
||||
}
|
||||
repositories {
|
||||
mavenLocal()
|
||||
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
|
||||
mavenCentral()
|
||||
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
|
||||
|
||||
+1
-10
@@ -1,15 +1,6 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
|
||||
mavenLocal()
|
||||
|
||||
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
|
||||
|
||||
mavenCentral()
|
||||
|
||||
maven { url 'https://plugins.gradle.org/m2/' }
|
||||
|
||||
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
rootProject.name = 'project'
|
||||
|
||||
+3
-7
@@ -1,10 +1,8 @@
|
||||
buildscript {
|
||||
ext.kotlin_version = '1.3.41'
|
||||
ext.kotlin_version = '{{kotlin_plugin_version}}'
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
@@ -13,8 +11,6 @@ buildscript {
|
||||
|
||||
subprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,6 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -13,9 +11,7 @@ buildscript {
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-3
@@ -5,9 +5,7 @@ plugins {
|
||||
version 'unspecified'
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
+2
-6
@@ -11,16 +11,12 @@ buildscript {
|
||||
classpath "org.jetbrains.kotlin:kotlin-noarg:$kotlin_version"
|
||||
}
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
@@ -1,14 +1,6 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
maven { url 'http://dl.bintray.com/kotlin/kotlin-eap' }
|
||||
|
||||
mavenCentral()
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
|
||||
maven { url 'https://dl.bintray.com/qwwdfsad/kotlinx' }
|
||||
maven { url 'https://plugins.gradle.org/m2/' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
rootProject.name = 'jvm-on-mpp'
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.50')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +13,7 @@ apply plugin: 'kotlin-kapt'
|
||||
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
+3
-9
@@ -1,20 +1,14 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-7
@@ -1,13 +1,10 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.20')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +12,5 @@ apply plugin: 'kotlin-multiplatform'
|
||||
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
Vendored
+3
-8
@@ -1,20 +1,15 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
apply from: "../include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.20')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
|
||||
|
||||
+3
-5
@@ -1,16 +1,14 @@
|
||||
subprojects {
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}"
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,20 +1,14 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.50')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +13,7 @@ apply plugin: 'kotlin-kapt'
|
||||
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
+3
-9
@@ -1,22 +1,16 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
apply from: "../include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.50')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'kotlin-multiplatform'
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
mavenCentral()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
apply plugin: 'com.android.application'
|
||||
apply plugin: 'kotlin-android-extensions'
|
||||
|
||||
+2
-4
@@ -1,13 +1,11 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.2.1'
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
+2
-5
@@ -1,10 +1,7 @@
|
||||
pluginManagement {
|
||||
repositories {
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
|
||||
mavenCentral()
|
||||
|
||||
maven { url 'https://plugins.gradle.org/m2/' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
include ':app'
|
||||
|
||||
@@ -1,13 +1,10 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.20')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,8 +12,7 @@ apply plugin: 'kotlin-multiplatform'
|
||||
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
|
||||
+3
-9
@@ -1,21 +1,15 @@
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
dependencies {
|
||||
apply from: "include.gradle"
|
||||
def kotlinVersion = gradleKotlinPluginVersion('1.3.10')
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:{{kotlin_plugin_version}}")
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
repositories {
|
||||
mavenLocal()
|
||||
jcenter()
|
||||
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
|
||||
{{kotlin_plugin_repositories}}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user