Update shadow plugin 6.1.0 -> 7.1.1
Version 7.1.1 is absent in jcenter, so additional repository was added in some modules. Leave old version in NewMultiplatformIT.kt because of `This version of Shadow supports Gradle 7.0+ only. Please upgrade.` error. ^KTI-733 Fixed
This commit is contained in:
@@ -56,7 +56,7 @@ dependencies {
|
||||
|
||||
// Located in <repo root>/shared and always provided by the composite build.
|
||||
api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
||||
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
||||
implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
|
||||
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
||||
}
|
||||
|
||||
+3
-1
@@ -14,10 +14,12 @@ import shadow.org.apache.commons.io.IOUtils
|
||||
import shadow.org.apache.tools.zip.ZipEntry
|
||||
import shadow.org.apache.tools.zip.ZipFile
|
||||
|
||||
class CollisionTransformer: Transformer {
|
||||
class CollisionTransformer : Transformer {
|
||||
var resolvedConflicts = mutableMapOf<String, File>()
|
||||
private val foundConflictsFiles = mutableSetOf<String>()
|
||||
|
||||
override fun getName() = "CollisionTransformer"
|
||||
|
||||
override fun canTransformResource(element: FileTreeElement): Boolean {
|
||||
val result = element.name in resolvedConflicts.keys
|
||||
if (result) {
|
||||
|
||||
@@ -41,11 +41,12 @@ buildscript {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
}
|
||||
gradlePluginPortal()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
//classpath project(":kotlin-native-utils")
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:5.1.0'
|
||||
classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.1'
|
||||
}
|
||||
}
|
||||
import org.jetbrains.kotlin.konan.*
|
||||
|
||||
@@ -31,7 +31,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
|
||||
org.gradle.workers.max=4
|
||||
slackApiVersion=1.2.0
|
||||
ktorVersion=1.2.1
|
||||
shadowVersion=5.1.0
|
||||
shadowVersion=7.1.1
|
||||
metadataVersion=0.0.1-dev-10
|
||||
|
||||
kotlinNativeVersionInResources=true
|
||||
|
||||
@@ -89,7 +89,7 @@ dependencies {
|
||||
val kotlinVersion = project.bootstrapKotlinVersion
|
||||
val ktorVersion = "1.2.1"
|
||||
val slackApiVersion = "1.2.0"
|
||||
val shadowVersion = "5.1.0"
|
||||
val shadowVersion = "7.1.1"
|
||||
val metadataVersion = "0.0.1-dev-10"
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
@@ -105,7 +105,7 @@ dependencies {
|
||||
|
||||
// Located in <repo root>/shared and always provided by the composite build.
|
||||
//api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
||||
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
||||
implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
|
||||
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ dependencies {
|
||||
val kotlinVersion = project.bootstrapKotlinVersion
|
||||
val ktorVersion = "1.2.1"
|
||||
val slackApiVersion = "1.2.0"
|
||||
val shadowVersion = "5.1.0"
|
||||
val shadowVersion = "7.1.1"
|
||||
val metadataVersion = "0.0.1-dev-10"
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
@@ -106,7 +106,7 @@ dependencies {
|
||||
|
||||
// Located in <repo root>/shared and always provided by the composite build.
|
||||
//api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
||||
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
||||
implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ buildscript {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.4'
|
||||
classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.1'
|
||||
classpath "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,7 +88,7 @@ dependencies {
|
||||
val kotlinVersion = project.bootstrapKotlinVersion
|
||||
val ktorVersion = "1.2.1"
|
||||
val slackApiVersion = "1.2.0"
|
||||
val shadowVersion = "5.1.0"
|
||||
val shadowVersion = "7.1.1"
|
||||
val metadataVersion = "0.0.1-dev-10"
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
@@ -104,6 +104,6 @@ dependencies {
|
||||
|
||||
// Located in <repo root>/shared and always provided by the composite build.
|
||||
//api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
||||
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
||||
implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ dependencies {
|
||||
val kotlinVersion = project.bootstrapKotlinVersion
|
||||
val ktorVersion = "1.2.1"
|
||||
val slackApiVersion = "1.2.0"
|
||||
val shadowVersion = "5.1.0"
|
||||
val shadowVersion = "7.1.1"
|
||||
val metadataVersion = "0.0.1-dev-10"
|
||||
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
|
||||
@@ -102,6 +102,6 @@ dependencies {
|
||||
|
||||
// Located in <repo root>/shared and always provided by the composite build.
|
||||
//api("org.jetbrains.kotlin:kotlin-native-shared:$konanVersion")
|
||||
implementation("com.github.jengelman.gradle.plugins:shadow:$shadowVersion")
|
||||
implementation("gradle.plugin.com.github.johnrengelman:shadow:$shadowVersion")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-metadata-klib:$metadataVersion")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user