From d15f55d80719bbb247139e2b4db160b2a889bb32 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Thu, 22 Feb 2018 13:20:46 +0300
Subject: [PATCH] [gradle-plugin] Annotate commonSourceSet with @Deprecated

---
 .../jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt    | 3 ++-
 .../kotlin/org/jetbrains/kotlin/gradle/plugin/KonanSpecs.kt | 3 +++
 .../kotlin/gradle/plugin/tasks/KonanCompileTask.kt          | 1 +
 .../gradle/plugin/test/MultiplatformSpecification.groovy    | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt
index 1d19d273c99..94f79acdcd0 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanCompileConfig.kt
@@ -51,7 +51,8 @@ abstract class KonanCompileConfig<T: KonanCompileTask>(name: String,
     override fun nativeLibraries(vararg libs: Any) = forEach { it.nativeLibraries(*libs) }
     override fun nativeLibraries(libs: FileCollection) = forEach { it.nativeLibraries(libs) }
 
-    override fun commonSourceSet(sourceSetName: String) = forEach { it.commonSourceSet(sourceSetName) }
+    @Deprecated("Use commonSourceSets instead", ReplaceWith("commonSourceSets(sourceSetName)"))
+    override fun commonSourceSet(sourceSetName: String) = forEach { it.commonSourceSets(sourceSetName) }
     override fun commonSourceSets(vararg sourceSetNames: String) = forEach { it.commonSourceSets(*sourceSetNames) }
     override fun enableMultiplatform(flag: Boolean) = forEach { it.enableMultiplatform(flag) }
 
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanSpecs.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanSpecs.kt
index 160fbb9815f..26859dadc08 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanSpecs.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KonanSpecs.kt
@@ -54,6 +54,9 @@ interface KonanCompileSpec: KonanBuildingSpec {
 
     // DSL. Multiplatform projects
     fun enableMultiplatform(flag: Boolean)
+
+    // TODO: Get rid of commonSourceSet in 0.7
+    @Deprecated("Use commonSourceSets instead", ReplaceWith("commonSourceSets(sourceSetName)"))
     fun commonSourceSet(sourceSetName: String)
     fun commonSourceSets(vararg sourceSetNames: String)
 
diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt
index 84f4aa83746..b80decfa770 100644
--- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt
+++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/tasks/KonanCompileTask.kt
@@ -157,6 +157,7 @@ abstract class KonanCompileTask: KonanBuildingTask(), KonanCompileSpec {
         enableMultiplatform = flag
     }
 
+    @Deprecated("Use commonSourceSets instead", ReplaceWith("commonSourceSets(sourceSetName)"))
     override fun commonSourceSet(sourceSetName: String) {
         commonSourceSets = listOf(sourceSetName)
         enableMultiplatform(true)
diff --git a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy
index ddd3e263b48..e493c0902a8 100644
--- a/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy
+++ b/tools/kotlin-native-gradle-plugin/src/test/groovy/org/jetbrains/kotlin/gradle/plugin/test/MultiplatformSpecification.groovy
@@ -151,7 +151,7 @@ class MultiplatformSpecification extends BaseKonanSpecification {
                 konanArtifacts {
                     library('foo') {
                         enableMultiplatform true
-                        commonSourceSet 'common'
+                        commonSourceSets 'common'
                     }
                 }
 
@@ -305,7 +305,7 @@ class MultiplatformSpecification extends BaseKonanSpecification {
                 konanArtifacts {
                     library('foo') {
                         enableMultiplatform true
-                        commonSourceSet 'common'
+                        commonSourceSets 'common'
                     }
                 }
 
@@ -339,7 +339,7 @@ class MultiplatformSpecification extends BaseKonanSpecification {
             it.buildFile.append("""
                 konanArtifacts {
                     library('foo') {
-                        commonSourceSet 'common'
+                        commonSourceSets 'common'
                     }
                 }