default -> companion: default object -> class object in project code, builtins and libs code
Original commit: 2a6facaef6
This commit is contained in:
@@ -21,7 +21,7 @@ public class CompilerSettings {
|
||||
public var copyJsLibraryFiles: Boolean = true
|
||||
public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY
|
||||
|
||||
default object {
|
||||
class object {
|
||||
private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version"
|
||||
private val DEFAULT_OUTPUT_DIRECTORY = "lib"
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure
|
||||
import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider
|
||||
|
||||
public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
|
||||
default object {
|
||||
class object {
|
||||
public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder"
|
||||
|
||||
private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession")
|
||||
|
||||
@@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin"
|
||||
|
||||
|
||||
class CacheFormatVersion(targetDataRoot: File) {
|
||||
default object {
|
||||
class object {
|
||||
// Change this when incremental cache format changes
|
||||
private val INCREMENTAL_CACHE_OWN_VERSION = 2
|
||||
private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION
|
||||
@@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) {
|
||||
}
|
||||
|
||||
public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache {
|
||||
default object {
|
||||
class object {
|
||||
val PROTO_MAP = "proto.tab"
|
||||
val CONSTANTS_MAP = "constants.tab"
|
||||
val INLINE_FUNCTIONS = "inline-functions.tab"
|
||||
|
||||
@@ -29,7 +29,7 @@ class LocalFileKotlinClass private(
|
||||
innerClasses: FileBasedKotlinClass.InnerClassesInfo
|
||||
) : FileBasedKotlinClass(className, classHeader, innerClasses) {
|
||||
|
||||
default object {
|
||||
class object {
|
||||
fun create(file: File): LocalFileKotlinClass? {
|
||||
val fileContents = file.readBytes()
|
||||
return FileBasedKotlinClass.create(fileContents) {
|
||||
|
||||
@@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus
|
||||
import org.jetbrains.jps.builders.java.dependencyView.Callbacks
|
||||
|
||||
public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
|
||||
default object {
|
||||
class object {
|
||||
val COMPILATION_FAILED = "COMPILATION FAILED"
|
||||
|
||||
// change to "/tmp" or anything when default is too long (for easier debugging)
|
||||
|
||||
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.utils.PathUtil
|
||||
* with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime
|
||||
*/
|
||||
public class ClasspathOrderTest : TestCaseWithTmpdir() {
|
||||
default object {
|
||||
class object {
|
||||
val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile()
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user