Get rid of deprecated annotations and modifiers in project code
Original commit: 9c4564a5a6
This commit is contained in:
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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(", ")}]"
|
||||
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user