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

Include collection type aliases into mock-runtime as they are used extremely often in tests

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-11-16 23:37:57 +03:00
parent 6a70761783
commit 491ca582b3
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+2
View File
@@ -1254,6 +1254,8 @@
<mkdir dir="${output}/mock-runtime-src"/> <mkdir dir="${output}/mock-runtime-src"/>
<copy file="${basedir}/core/runtime.jvm/src/kotlin/TypeAliases.kt" todir="${output}/mock-runtime-src"/> <copy file="${basedir}/core/runtime.jvm/src/kotlin/TypeAliases.kt" todir="${output}/mock-runtime-src"/>
<copy file="${basedir}/core/runtime.jvm/src/kotlin/text/TypeAliases.kt" todir="${output}/mock-runtime-src/text"/> <copy file="${basedir}/core/runtime.jvm/src/kotlin/text/TypeAliases.kt" todir="${output}/mock-runtime-src/text"/>
<copy file="${basedir}/libraries/stdlib/src/kotlin/collections/TypeAliases.kt" todir="${output}/mock-runtime-src/collections"/>
<copy file="${basedir}/libraries/stdlib/src/kotlin/jvm/JvmVersion.kt" todir="${output}/mock-runtime-src"/>
<copy file="${basedir}/libraries/stdlib/src/kotlin/util/Standard.kt" todir="${output}/mock-runtime-src"/> <copy file="${basedir}/libraries/stdlib/src/kotlin/util/Standard.kt" todir="${output}/mock-runtime-src"/>
<copy file="${basedir}/libraries/stdlib/src/kotlin/internal/Annotations.kt" todir="${output}/mock-runtime-src"/> <copy file="${basedir}/libraries/stdlib/src/kotlin/internal/Annotations.kt" todir="${output}/mock-runtime-src"/>
compiler/testData/diagnostics/tests/PackageQualified.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ package foobar.a
val a : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<Int><!>? = null val a : <!PLATFORM_CLASS_MAPPED_TO_KOTLIN!>java.util.List<Int><!>? = null
val a2 : <!UNRESOLVED_REFERENCE!>util<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>? = null val a2 : <!UNRESOLVED_REFERENCE!>util<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>List<!><Int>? = null
val a3 : <!UNRESOLVED_REFERENCE!>ArrayList<!><Int>? = null val a3 : <!UNRESOLVED_REFERENCE!>LinkedList<!><Int>? = null
// FILE: b.kt // FILE: b.kt
package foobar package foobar
compiler/testData/diagnostics/tests/PackageQualified.txt
Vendored
+1 -1
View File
@@ -60,7 +60,7 @@ package foobar {
package foobar.a { package foobar.a {
public val a: java.util.List<kotlin.Int>? = null public val a: java.util.List<kotlin.Int>? = null
public val a2: [ERROR : util.List<Int>]<kotlin.Int>? public val a2: [ERROR : util.List<Int>]<kotlin.Int>?
public val a3: [ERROR : ArrayList<Int>]<kotlin.Int>? public val a3: [ERROR : LinkedList<Int>]<kotlin.Int>?
public val b: kotlin.collections.List<kotlin.Int>? = null public val b: kotlin.collections.List<kotlin.Int>? = null
public val b1: [ERROR : util.List<Int>]<kotlin.Int>? public val b1: [ERROR : util.List<Int>]<kotlin.Int>?
} }