Get rid of deprecated annotations and modifiers in project code
This commit is contained in:
@@ -143,7 +143,8 @@ public object KotlinCompilerClient {
|
||||
}
|
||||
|
||||
|
||||
@JvmStatic public fun main(vararg args: String) {
|
||||
@JvmStatic
|
||||
public fun main(vararg args: String) {
|
||||
val compilerId = CompilerId()
|
||||
val daemonOptions = DaemonOptions()
|
||||
val daemonLaunchingOptions = DaemonJVMOptions()
|
||||
@@ -351,7 +352,7 @@ public object KotlinCompilerClient {
|
||||
makeRunFilenameString(timestamp = "lock",
|
||||
digest = compilerId.compilerClasspath.map { File(it).absolutePath }.distinctStringsDigest(),
|
||||
port = "0"))
|
||||
private @Volatile var locked = acquireLockFile(lockFile)
|
||||
@Volatile private var locked = acquireLockFile(lockFile)
|
||||
private val channel = if (locked) RandomAccessFile(lockFile, "rw").channel else null
|
||||
private val lock = channel?.lock()
|
||||
|
||||
|
||||
@@ -271,9 +271,11 @@ public data class CompilerId(
|
||||
}
|
||||
|
||||
companion object {
|
||||
public @JvmStatic fun makeCompilerId(vararg paths: File): CompilerId = makeCompilerId(paths.asIterable())
|
||||
@JvmStatic
|
||||
public fun makeCompilerId(vararg paths: File): CompilerId = makeCompilerId(paths.asIterable())
|
||||
|
||||
public @JvmStatic fun makeCompilerId(paths: Iterable<File>): CompilerId =
|
||||
@JvmStatic
|
||||
public fun makeCompilerId(paths: Iterable<File>): CompilerId =
|
||||
CompilerId(compilerClasspath = paths.map { it.absolutePath }, compilerDigest = paths.getFilesClasspathDigest())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,7 +89,8 @@ public object CompileDaemon {
|
||||
return null
|
||||
}
|
||||
|
||||
@JvmStatic public fun main(args: Array<String>) {
|
||||
@JvmStatic
|
||||
public fun main(args: Array<String>) {
|
||||
|
||||
log.info("Kotlin compiler daemon version " + (loadVersionFromResource() ?: "<unknown>"))
|
||||
log.info("daemon JVM args: " + ManagementFactory.getRuntimeMXBean().inputArguments.joinToString(" "))
|
||||
|
||||
@@ -91,7 +91,7 @@ class CompileServiceImpl<Compiler: CLICompiler<*>>(
|
||||
|
||||
// internal implementation stuff
|
||||
|
||||
private @Volatile var _lastUsedSeconds = nowSeconds()
|
||||
@Volatile private var _lastUsedSeconds = nowSeconds()
|
||||
public val lastUsedSeconds: Long get() = if (rwlock.isWriteLocked || rwlock.readLockCount - rwlock.readHoldCount > 0) nowSeconds() else _lastUsedSeconds
|
||||
|
||||
val log by lazy { Logger.getLogger("compiler") }
|
||||
|
||||
Reference in New Issue
Block a user