Usages of Array.plus: return type changed.
This commit is contained in:
@@ -172,7 +172,7 @@ public class PropertyReferenceCodegen(
|
||||
|
||||
if (!target.isVar()) return
|
||||
|
||||
val setterParameters = (getterParameters + arrayOf(OBJECT_TYPE)).toTypedArray()
|
||||
val setterParameters = (getterParameters + arrayOf(OBJECT_TYPE)).toList().toTypedArray()
|
||||
generateAccessor(method("set", Type.VOID_TYPE, *setterParameters)) { value ->
|
||||
// Hard-coded 1 or 2 is safe here because there's only java/lang/Object in the signature, no double/long parameters
|
||||
value.store(StackValue.local(if (receiverType != null) 2 else 1, OBJECT_TYPE), this)
|
||||
|
||||
@@ -25,7 +25,8 @@ private val KOTLIN_STDLIB_FILTER = "kotlin.*"
|
||||
public fun addKotlinStdlibDebugFilterIfNeeded() {
|
||||
if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) {
|
||||
val settings = DebuggerSettings.getInstance()!!
|
||||
val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toTypedArray()
|
||||
// TODO: Remove toList().toTypedArray() after bootstrap
|
||||
val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toList().toTypedArray()
|
||||
|
||||
settings.setSteppingFilters(newFilters)
|
||||
|
||||
|
||||
+2
-2
@@ -228,7 +228,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
|
||||
}
|
||||
|
||||
public fun addLibraryFiles(vararg fs: String) {
|
||||
kotlinOptions.libraryFiles = (kotlinOptions.libraryFiles + (fs as Array<String>)).copyToArray()
|
||||
kotlinOptions.libraryFiles += fs
|
||||
}
|
||||
|
||||
public fun addLibraryFiles(vararg fs: File) {
|
||||
@@ -261,7 +261,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
|
||||
.filter { LibraryUtils.isKotlinJavascriptLibrary(it) }
|
||||
.map { it.getAbsolutePath() }
|
||||
|
||||
args.libraryFiles = (kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies).copyToArray()
|
||||
args.libraryFiles = kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies
|
||||
args.target = kotlinOptions.target
|
||||
args.sourceMap = kotlinOptions.sourceMap
|
||||
|
||||
|
||||
+1
-1
@@ -96,7 +96,7 @@ abstract class BaseGradleIT {
|
||||
|
||||
private fun Project.createCommand(params: Array<out String>): List<String> {
|
||||
val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath()
|
||||
val tailParameters = params +
|
||||
val tailParameters = params.asList() +
|
||||
listOf(pathToKotlinPlugin, "--no-daemon", "--${minLogLevel.name().toLowerCase()}", "-Pkotlin.gradle.test=true")
|
||||
|
||||
return if (isWindows())
|
||||
|
||||
Reference in New Issue
Block a user