azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MPP] Don't publish PM20

Browse Source 
^KT-60198
This commit is contained in:
Timofey Solonin
2023-07-24 20:53:01 +02:00
committed by Space Team
parent 9ecf02fddf
commit 167ddc556d
7 changed files with 37 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/projectSetupDefaults.kt
-2
View File
@@ -25,7 +25,6 @@ internal val DEFAULT_GROOVY_SETTINGS_FILE =
id "org.jetbrains.kotlin.js" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.native.cocoapods" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.multiplatform" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.multiplatform.pm20" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.plugin.allopen" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.plugin.spring" version "${'$'}kotlin_version"
id "org.jetbrains.kotlin.plugin.jpa" version "${'$'}kotlin_version"
@@ -86,7 +85,6 @@ internal val DEFAULT_KOTLIN_SETTINGS_FILE =
id("org.jetbrains.kotlin.js") version kotlin_version
id("org.jetbrains.kotlin.native.cocoapods") version kotlin_version
id("org.jetbrains.kotlin.multiplatform") version kotlin_version
id("org.jetbrains.kotlin.multiplatform.pm20") version kotlin_version
id("org.jetbrains.kotlin.plugin.allopen") version kotlin_version
id("org.jetbrains.kotlin.plugin.spring") version kotlin_version
id("org.jetbrains.kotlin.plugin.jpa") version kotlin_version
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-multi-module-published/build.gradle.kts
+10 -2
View File
@@ -1,10 +1,18 @@
import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
plugins {
kotlin("multiplatform.pm20").version("<pluginMarkerVersion>")
`maven-publish`
}
buildscript {
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:<pluginMarkerVersion>")
}
}
apply<KotlinPm20PluginWrapper>()
repositories {
mavenLocal()
mavenCentral()
@@ -13,7 +21,7 @@ repositories {
group = "com.example.bar"
version = "1.0"
kotlin {
configure<KotlinPm20ProjectExtension> {
// feel free to add more modules, variants and fragments
mainAndTest {
jvm
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpm-simple/build.gradle.kts
+12 -2
View File
@@ -1,11 +1,21 @@
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
import org.jetbrains.kotlin.project.model.*
plugins {
kotlin("multiplatform.pm20")
buildscript {
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${property("kotlin_version")}")
}
}
apply<KotlinPm20PluginWrapper>()
repositories {
mavenLocal()
mavenCentral()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kpmTransientPluginOptions/build.gradle.kts
+12 -2
View File
@@ -1,11 +1,21 @@
import org.gradle.api.Project
import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.*
import org.jetbrains.kotlin.project.model.*
plugins {
kotlin("multiplatform.pm20")
buildscript {
repositories {
mavenLocal()
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:<pluginMarkerVersion>")
}
}
apply<KotlinPm20PluginWrapper>()
repositories {
mavenLocal()
mavenCentral()
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
-6
View File
@@ -248,12 +248,6 @@ gradlePlugin {
displayName = description
implementationClass = "org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin"
}
create("kotlinMultiplatformPluginPm20") {
id = "org.jetbrains.kotlin.multiplatform.pm20"
description = "Kotlin Multiplatform plugin with PM2.0"
displayName = description
implementationClass = "org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper"
}
}
}
libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/kpm/AbstractKpmExtensionTest.kt
+3 -1
View File
@@ -8,8 +8,10 @@ package org.jetbrains.kotlin.gradle.unitTests.kpm
import org.gradle.api.Project
import org.gradle.api.artifacts.verification.DependencyVerificationMode
import org.gradle.api.internal.project.ProjectInternal
import org.gradle.kotlin.dsl.apply
import org.gradle.testfixtures.ProjectBuilder
import org.jetbrains.kotlin.gradle.idea.kpm.IdeaKpmProject
import org.jetbrains.kotlin.gradle.plugin.KotlinPm20PluginWrapper
import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.KotlinPm20ProjectExtension
import org.jetbrains.kotlin.gradle.util.addBuildEventsListenerRegistryMock
@@ -23,7 +25,7 @@ abstract class AbstractKpmExtensionTest {
fun Project.applyKpmPlugin(configure: KotlinPm20ProjectExtension.() -> Unit = {}): KotlinPm20ProjectExtension {
addBuildEventsListenerRegistryMock(project)
plugins.apply("org.jetbrains.kotlin.multiplatform.pm20")
apply<KotlinPm20PluginWrapper>()
return (extensions.getByName("kotlin") as KotlinPm20ProjectExtension).also(configure)
}