From d019bef728543efeff1604ed5dcde6a5f8352120 Mon Sep 17 00:00:00 2001
From: Denis Zharkov <denis.zharkov@jetbrains.com>
Date: Mon, 14 Sep 2015 16:26:59 +0300
Subject: [PATCH] Get rid of deprecated annotations and modifiers in project
 code

Original commit: 9c4564a5a6557a192e1ece40c93c89d676a312c1
---
 .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt  | 5 ++---
 .../kotlin/jps/incremental/IncrementalCacheImpl.kt          | 6 +++---
 .../jetbrains/kotlin/jps/incremental/storage/BasicMap.kt    | 2 +-
 .../kotlin/jps/build/AbstractIncrementalJpsTest.kt          | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
index 0276a1665c0..97a89c990cc 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
@@ -26,7 +26,6 @@ import org.jetbrains.jps.util.JpsPathUtil
 import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
 import java.io.File
 import java.util.ArrayList
-import kotlin.platform.platformStatic
 
 object JpsJsModuleUtils {
 
@@ -63,9 +62,9 @@ object JpsJsModuleUtils {
         })
     }
 
-    platformStatic
+    @JvmStatic
     fun getOutputFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.JS_EXT)
 
-    platformStatic
+    @JvmStatic
     fun getOutputMetaFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.META_JS_SUFFIX)
 }
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index c0b865d962a..2873e30f5ca 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -160,7 +160,7 @@ public class IncrementalCacheImpl(
         dependents.add(cache)
     }
 
-    TestOnly
+    @TestOnly
     public fun dump(): String {
         return maps.map { it.dump() }.join("\n\n")
     }
@@ -821,7 +821,7 @@ private object PathCollectionExternalizer : DataExternalizer<Collection<String>>
 private val File.normalizedPath: String
     get() = FileUtil.toSystemIndependentName(canonicalPath)
 
-TestOnly
+@TestOnly
 private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): String =
         StringBuilder {
             append("{")
@@ -836,7 +836,7 @@ private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): St
             append("}")
         }.toString()
 
-TestOnly
+@TestOnly
 public fun <T : Comparable<T>> Collection<T>.dumpCollection(): String =
         "[${sort().map(Any::toString).join(", ")}]"
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
index c89fb8bc5ce..7ef01948a49 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
@@ -64,7 +64,7 @@ public abstract class BasicMap<K : Comparable<K>, V>(
         storage.close()
     }
 
-    TestOnly
+    @TestOnly
     public fun dump(): String {
         return with(StringBuilder()) {
             with(Printer(this)) {
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
index 2ee2e68ebd0..eca21b76fbf 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
@@ -107,7 +107,7 @@ public abstract class AbstractIncrementalJpsTest(
 
     protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING
 
-    protected open fun checkLookups(@suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {}
+    protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {}
 
     fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult {
         val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath)