Migrate sam-with-receiver plugin configuration
This change should also trigger proper publishing of this plugin to Gradle plugin portal. ^KT-49227 In Progress
This commit is contained in:
+2
-5
@@ -30,6 +30,7 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
|
||||
id "org.jetbrains.kotlin.plugin.jpa" version "${'$'}kotlin_version"
|
||||
id "org.jetbrains.kotlin.plugin.noarg" version "${'$'}kotlin_version"
|
||||
id "org.jetbrains.kotlin.plugin.lombok" version "${'$'}kotlin_version"
|
||||
id "org.jetbrains.kotlin.plugin.sam.with.receiver" version "${'$'}kotlin_version"
|
||||
id "org.jetbrains.kotlin.plugin.serialization" version "${'$'}kotlin_version"
|
||||
id "org.jetbrains.kotlin.test.fixes.android" version "${'$'}test_fixes_version"
|
||||
id "org.jetbrains.kotlin.gradle-subplugin-example" version "${'$'}kotlin_version"
|
||||
@@ -55,9 +56,6 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
|
||||
case "kotlin2js":
|
||||
useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
|
||||
break
|
||||
case "org.jetbrains.kotlin.plugin.sam.with.receiver":
|
||||
useModule("org.jetbrains.kotlin:kotlin-sam-with-receiver:${'$'}kotlin_version")
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -90,6 +88,7 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
|
||||
id("org.jetbrains.kotlin.plugin.jpa") version kotlin_version
|
||||
id("org.jetbrains.kotlin.plugin.noarg") version kotlin_version
|
||||
id("org.jetbrains.kotlin.plugin.lombok") version kotlin_version
|
||||
id("org.jetbrains.kotlin.plugin.sam.with.receiver") version kotlin_version
|
||||
id("org.jetbrains.kotlin.plugin.serialization") version kotlin_version
|
||||
id("org.jetbrains.kotlin.test.fixes.android") version test_fixes_version
|
||||
id("org.jetbrains.kotlin.gradle-subplugin-example") version kotlin_version
|
||||
@@ -109,8 +108,6 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
|
||||
"com.android.feature" -> useModule("com.android.tools.build:gradle:${'$'}android_tools_version")
|
||||
"kotlin-dce-js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
|
||||
"kotlin2js" -> useModule("org.jetbrains.kotlin:kotlin-gradle-plugin:${'$'}kotlin_version")
|
||||
"org.jetbrains.kotlin.plugin.sam.with.receiver" ->
|
||||
useModule("org.jetbrains.kotlin:kotlin-sam-with-receiver:${'$'}kotlin_version")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
plugins {
|
||||
id "gradle-plugin-common-configuration"
|
||||
id "jps-compatible"
|
||||
}
|
||||
|
||||
pill {
|
||||
variant = 'FULL'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api project(':kotlin-gradle-plugin-api')
|
||||
api project(':kotlin-gradle-plugin-model')
|
||||
|
||||
compileOnly project(':compiler')
|
||||
compileOnly project(':kotlin-sam-with-receiver-compiler-plugin')
|
||||
|
||||
testApi gradleApi()
|
||||
testApi DependenciesKt.commonDependency(project, "junit")
|
||||
|
||||
embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false }
|
||||
}
|
||||
|
||||
ArtifactsKt.runtimeJar(project, EmbeddableKt.rewriteDefaultJarDepsToShadedCompiler(project, {}), {})
|
||||
@@ -0,0 +1,32 @@
|
||||
import org.jetbrains.kotlin.pill.PillExtension
|
||||
|
||||
plugins {
|
||||
id("gradle-plugin-common-configuration")
|
||||
id("jps-compatible")
|
||||
}
|
||||
|
||||
pill {
|
||||
variant = PillExtension.Variant.FULL
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api(project(":kotlin-gradle-plugin-model"))
|
||||
|
||||
compileOnly(project(":compiler"))
|
||||
compileOnly(project(":kotlin-sam-with-receiver-compiler-plugin"))
|
||||
|
||||
testApi(commonDependency("junit"))
|
||||
|
||||
embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false }
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
plugins {
|
||||
create("samWithReceiver") {
|
||||
id = "org.jetbrains.kotlin.plugin.sam.with.receiver"
|
||||
displayName = ""
|
||||
description = displayName
|
||||
implementationClass = "org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin"
|
||||
}
|
||||
}
|
||||
}
|
||||
-1
@@ -1 +0,0 @@
|
||||
implementation-class=org.jetbrains.kotlin.samWithReceiver.gradle.SamWithReceiverGradleSubplugin
|
||||
Reference in New Issue
Block a user