Replace, where possible in tests, jcenter() with mavenCentral().

In few places I have to leave bintray repository due to not all kotlin
dependencies where migrated to maven central.

^KT-44949 In progress
This commit is contained in:
Yahor Berdnikau
2021-02-26 17:11:24 +01:00
committed by TeamCityServer
parent 7d766add4b
commit 24ba581910
165 changed files with 255 additions and 222 deletions
@@ -1078,7 +1078,7 @@ class KotlinGradleIT : BaseGradleIT() {
build( build(
":lib1:compileDebugUnitTestKotlin", ":lib1:compileDebugUnitTestKotlin",
options = defaultBuildOptions().copy( options = defaultBuildOptions().copy(
androidGradlePluginVersion = AGPVersion.v3_2_0, androidGradlePluginVersion = AGPVersion.v3_6_0,
androidHome = KtTestUtil.findAndroidSdk(), androidHome = KtTestUtil.findAndroidSdk(),
), ),
) { ) {
@@ -123,7 +123,10 @@ class MultiplatformGradleIT : BaseGradleIT() {
File(projectDir, "$subDirectory/build.gradle").modify { File(projectDir, "$subDirectory/build.gradle").modify {
""" """
buildscript { buildscript {
repositories { mavenLocal(); jcenter() } repositories {
mavenLocal();
maven { url = uri("https://jcenter.bintray.com/") }
}
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version"
} }
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
@@ -36,7 +37,8 @@ android {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,7 +15,8 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -4,7 +4,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
@@ -17,6 +18,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -4,7 +4,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
@@ -17,6 +18,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -3,7 +3,7 @@ buildscript {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
mavenCentral() mavenCentral()
jcenter() maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -14,6 +15,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -40,7 +41,8 @@ android {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -5,7 +5,7 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -17,6 +17,6 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
} }
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,7 +14,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
apply plugin: 'com.android.library' apply plugin: 'com.android.library'
@@ -4,7 +4,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
@@ -17,6 +18,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -1,8 +1,9 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } google()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,7 +14,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } google()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -8,7 +8,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") }
} }
@@ -5,7 +5,7 @@ enableFeaturePreview("GRADLE_METADATA")
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-multiplatform'
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
// NB: Build of this module depends on 'sample-lib' publication. You need to add the local // NB: Build of this module depends on 'sample-lib' publication. You need to add the local
// repository where 'sample-lib' artifacts are published. // repository where 'sample-lib' artifacts are published.
} }
@@ -8,7 +8,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") }
} }
@@ -5,7 +5,7 @@ enableFeaturePreview("GRADLE_METADATA")
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -4,7 +4,7 @@ version '1.0'
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,7 +15,7 @@ apply plugin: 'kotlin-multiplatform'
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" } maven { url "https://dl.bintray.com/kotlin/kotlinx.html/" }
} }
@@ -8,7 +8,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -9,7 +9,7 @@ repositories {
val thirdPartyRepo: String by project val thirdPartyRepo: String by project
maven(thirdPartyRepo) maven(thirdPartyRepo)
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -6,6 +6,6 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven("$rootDir/../repo") maven("$rootDir/../repo")
jcenter() mavenCentral()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.app" group = "com.example.app"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.bar" group = "com.example.bar"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.foo" group = "com.example.foo"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.thirdparty" group = "com.example.thirdparty"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
maven("../repo") maven("../repo")
jcenter() mavenCentral()
} }
group = "com.example.app" group = "com.example.app"
@@ -6,7 +6,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
maven("../repo") maven("../repo")
jcenter() mavenCentral()
} }
group = "com.example.bar" group = "com.example.bar"
@@ -6,7 +6,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
maven("../repo") maven("../repo")
jcenter() mavenCentral()
} }
group = "com.example.foo" group = "com.example.foo"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.thirdparty" group = "com.example.thirdparty"
@@ -5,6 +5,6 @@ plugins {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.app" group = "com.example.app"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.foo" group = "com.example.foo"
@@ -6,7 +6,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
maven("../repo") maven("../repo")
jcenter() mavenCentral()
} }
group = "com.example.foo" group = "com.example.foo"
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.thirdparty" group = "com.example.thirdparty"
@@ -3,7 +3,6 @@ plugins {
} }
repositories { repositories {
jcenter()
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
} }
@@ -5,9 +5,8 @@ plugins {
} }
repositories { repositories {
jcenter()
mavenCentral()
mavenLocal() mavenLocal()
mavenCentral()
} }
kotlin.js { kotlin.js {
@@ -7,7 +7,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -7,7 +7,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -5,7 +5,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
group = "com.example.thirdparty" group = "com.example.thirdparty"
@@ -2,7 +2,7 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -14,6 +14,6 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
} }
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -14,6 +15,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -6,7 +6,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -21,6 +22,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -6,7 +6,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -21,7 +22,8 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
if (VersionNumber.parse(android_tools_version) >= VersionNumber.parse("3.3.0")) { if (VersionNumber.parse(android_tools_version) >= VersionNumber.parse("3.3.0")) {
@@ -2,7 +2,7 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -14,7 +14,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
} }
} }
@@ -2,7 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -14,6 +15,7 @@ subprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -4,7 +4,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -2,7 +2,7 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,7 +13,7 @@ apply plugin: "kotlin-kapt"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -2,7 +2,7 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -37,7 +37,7 @@ android {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,7 +13,7 @@ apply plugin: 'kotlin-kapt'
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -2,7 +2,7 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -14,6 +14,6 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -10,7 +10,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() mavenCentral()
mavenLocal() mavenLocal()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -12,7 +12,7 @@ buildscript {
subprojects { subprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
jcenter()
mavenLocal() mavenLocal()
mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -10,8 +10,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter()
mavenLocal() mavenLocal()
mavenCentral()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,8 +13,8 @@ apply plugin: "kotlin"
apply plugin: "kotlin-kapt" apply plugin: "kotlin-kapt"
repositories { repositories {
jcenter()
mavenLocal() mavenLocal()
mavenCentral()
maven { maven {
url "https://jetbrains.bintray.com/intellij-third-party-dependencies/" url "https://jetbrains.bintray.com/intellij-third-party-dependencies/"
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -13,8 +13,8 @@ apply plugin: "kotlin"
apply plugin: "kotlin-kapt" apply plugin: "kotlin-kapt"
repositories { repositories {
jcenter()
mavenLocal() mavenLocal()
mavenCentral()
maven { maven {
url "https://jetbrains.bintray.com/intellij-third-party-dependencies/" url "https://jetbrains.bintray.com/intellij-third-party-dependencies/"
} }
@@ -3,7 +3,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -15,6 +16,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -8,6 +8,6 @@ version = "1.0"
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -8,6 +8,6 @@ version = "1.0"
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -8,7 +8,7 @@ dependencies {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -9,7 +9,8 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
kotlin.sourceSets { kotlin.sourceSets {
@@ -7,7 +7,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) { rootProject.plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) {
@@ -5,6 +5,6 @@ plugins {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -8,7 +8,7 @@ pluginManagement {
} }
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -11,6 +11,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -2,8 +2,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
google() google()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version" classpath "com.android.tools.build:gradle:$android_tools_version"
@@ -15,6 +15,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
google() google()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -12,6 +12,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -5,7 +5,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
google() google()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -16,7 +17,8 @@ buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
google() google()
jcenter() mavenCentral()
maven { url = uri("https://jcenter.bintray.com/") }
} }
kotlin { kotlin {
@@ -35,7 +37,7 @@ allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
google() google()
jcenter() mavenCentral()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -12,6 +12,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
@@ -12,6 +12,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -11,6 +11,6 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { setUrl(rootProject.projectDir.resolve("repo")) } maven { setUrl(rootProject.projectDir.resolve("repo")) }
} }
@@ -8,7 +8,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -1,7 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { setUrl(rootProject.projectDir.resolve("repo")) } maven { setUrl(rootProject.projectDir.resolve("repo")) }
} }
@@ -8,7 +8,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -1,7 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { setUrl(rootProject.projectDir.resolve("repo")) } maven { setUrl(rootProject.projectDir.resolve("repo")) }
} }
@@ -8,7 +8,7 @@ version = "1.0"
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -1,7 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -1,7 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
val disambiguation1Attribute = Attribute.of("myDisambiguation1Attribute", String::class.java) val disambiguation1Attribute = Attribute.of("myDisambiguation1Attribute", String::class.java)
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -1,7 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -1,7 +1,7 @@
buildscript { buildscript {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-multiplatform'
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") } maven { setUrl("https://dl.bintray.com/kotlin/kotlinx.html/") }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {
@@ -1,7 +1,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
gradlePluginPortal() gradlePluginPortal()
} }
} }
@@ -4,7 +4,7 @@ plugins {
repositories { repositories {
mavenLocal() mavenLocal()
jcenter() mavenCentral()
} }
kotlin { kotlin {

Some files were not shown because too many files have changed in this diff Show More