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

Get rid of deprecated annotations and modifiers in project code

Browse Source 
Original commit: 9c4564a5a6
This commit is contained in:
Denis Zharkov
2015-09-14 16:26:59 +03:00
parent 4aa3b9e334
commit d019bef728
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+2 -3
View File
@@ -26,7 +26,6 @@ import org.jetbrains.jps.util.JpsPathUtil
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
import java.io.File import java.io.File
import java.util.ArrayList import java.util.ArrayList
import kotlin.platform.platformStatic
object JpsJsModuleUtils { object JpsJsModuleUtils {
@@ -63,9 +62,9 @@ object JpsJsModuleUtils {
}) })
} }
platformStatic @JvmStatic
fun getOutputFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.JS_EXT) 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) fun getOutputMetaFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.META_JS_SUFFIX)
} }
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+3 -3
View File
@@ -160,7 +160,7 @@ public class IncrementalCacheImpl(
dependents.add(cache) dependents.add(cache)
} }
TestOnly @TestOnly
public fun dump(): String { public fun dump(): String {
return maps.map { it.dump() }.join("\n\n") return maps.map { it.dump() }.join("\n\n")
} }
@@ -821,7 +821,7 @@ private object PathCollectionExternalizer : DataExternalizer<Collection<String>>
private val File.normalizedPath: String private val File.normalizedPath: String
get() = FileUtil.toSystemIndependentName(canonicalPath) get() = FileUtil.toSystemIndependentName(canonicalPath)
TestOnly @TestOnly
private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): String = private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): String =
StringBuilder { StringBuilder {
append("{") append("{")
@@ -836,7 +836,7 @@ private fun <K : Comparable<K>, V> Map<K, V>.dumpMap(dumpValue: (V)->String): St
append("}") append("}")
}.toString() }.toString()
TestOnly @TestOnly
public fun <T : Comparable<T>> Collection<T>.dumpCollection(): String = public fun <T : Comparable<T>> Collection<T>.dumpCollection(): String =
"[${sort().map(Any::toString).join(", ")}]" "[${sort().map(Any::toString).join(", ")}]"
jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt
+1 -1
View File
@@ -64,7 +64,7 @@ public abstract class BasicMap<K : Comparable<K>, V>(
storage.close() storage.close()
} }
TestOnly @TestOnly
public fun dump(): String { public fun dump(): String {
return with(StringBuilder()) { return with(StringBuilder()) {
with(Printer(this)) { with(Printer(this)) {
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+1 -1
View File
@@ -107,7 +107,7 @@ public abstract class AbstractIncrementalJpsTest(
protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING 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 { fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult {
val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath)