Update to 1.3.0-rc-6. (#2050)

Interop/Runtime/src/main/kotlin/kotlinx/cinterop/Generated.kt

@@ -134,16 +134,13 @@ inline operator fun <T : UByteVarOf<*>> CPointer<T>?.plus(index: Int): CPointer<
 inline operator fun <T : UByte> CPointer<UByteVarOf<T>>.get(index: Int): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$UByte")
 inline operator fun <T : UByte> CPointer<UByteVarOf<T>>.set(index: Int, value: T) {
     (this + index)!!.pointed.value = value
 }
 
-@JvmName("get\$UByte")
 inline operator fun <T : UByte> CPointer<UByteVarOf<T>>.get(index: Long): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$UByte")
 inline operator fun <T : UByte> CPointer<UByteVarOf<T>>.set(index: Long, value: T) {
     (this + index)!!.pointed.value = value
 }
@@ -160,7 +157,6 @@ inline operator fun <T : UShortVarOf<*>> CPointer<T>?.plus(index: Int): CPointer
 inline operator fun <T : UShort> CPointer<UShortVarOf<T>>.get(index: Int): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$UShort")
 inline operator fun <T : UShort> CPointer<UShortVarOf<T>>.set(index: Int, value: T) {
     (this + index)!!.pointed.value = value
 }
@@ -169,7 +165,6 @@ inline operator fun <T : UShort> CPointer<UShortVarOf<T>>.set(index: Int, value:
 inline operator fun <T : UShort> CPointer<UShortVarOf<T>>.get(index: Long): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$UShort")
 inline operator fun <T : UShort> CPointer<UShortVarOf<T>>.set(index: Long, value: T) {
     (this + index)!!.pointed.value = value
 }
@@ -186,7 +181,6 @@ inline operator fun <T : UIntVarOf<*>> CPointer<T>?.plus(index: Int): CPointer<T
 inline operator fun <T : UInt> CPointer<UIntVarOf<T>>.get(index: Int): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$UInt")
 inline operator fun <T : UInt> CPointer<UIntVarOf<T>>.set(index: Int, value: T) {
     (this + index)!!.pointed.value = value
 }
@@ -195,7 +189,6 @@ inline operator fun <T : UInt> CPointer<UIntVarOf<T>>.set(index: Int, value: T)
 inline operator fun <T : UInt> CPointer<UIntVarOf<T>>.get(index: Long): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$UInt")
 inline operator fun <T : UInt> CPointer<UIntVarOf<T>>.set(index: Long, value: T) {
     (this + index)!!.pointed.value = value
 }
@@ -212,7 +205,6 @@ inline operator fun <T : ULongVarOf<*>> CPointer<T>?.plus(index: Int): CPointer<
 inline operator fun <T : ULong> CPointer<ULongVarOf<T>>.get(index: Int): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$ULong")
 inline operator fun <T : ULong> CPointer<ULongVarOf<T>>.set(index: Int, value: T) {
     (this + index)!!.pointed.value = value
 }
@@ -221,7 +213,6 @@ inline operator fun <T : ULong> CPointer<ULongVarOf<T>>.set(index: Int, value: T
 inline operator fun <T : ULong> CPointer<ULongVarOf<T>>.get(index: Long): T =
         (this + index)!!.pointed.value
 
-@JvmName("set\$ULong")
 inline operator fun <T : ULong> CPointer<ULongVarOf<T>>.set(index: Long, value: T) {
     (this + index)!!.pointed.value = value
 }

backend.native/build.gradle

@@ -183,6 +183,7 @@ targetList.each { target ->
                 '-Xmulti-platform', '-Xuse-experimental=kotlin.Experimental',
                 '-Xuse-experimental=kotlin.contracts.ExperimentalContracts',
                 '-Xuse-experimental=kotlin.ExperimentalMultiplatform',
+                '-Xallow-result-return-type',
                 commonSrc.absolutePath,
                 project(':Interop:Runtime').file('src/main/kotlin'),
                 project(':Interop:Runtime').file('src/native/kotlin'),

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/irasdescriptors/FakeIrUtils.kt

@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.backend.konan.irasdescriptors
 
 import org.jetbrains.kotlin.backend.konan.*
 import org.jetbrains.kotlin.backend.konan.llvm.llvmSymbolOrigin
-import org.jetbrains.kotlin.idea.MainFunctionDetector
 import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.types.IrType
 import org.jetbrains.kotlin.ir.types.toKotlinType
@@ -38,7 +37,5 @@ internal fun IrFunction.isExternalObjCClassMethod() = this.descriptor.isExternal
 
 internal val IrDeclaration.llvmSymbolOrigin get() = this.descriptor.llvmSymbolOrigin
 
-internal fun IrFunction.isMain() = MainFunctionDetector.isMain(this.descriptor)
-
 internal fun IrType.isObjCObjectType() = this.toKotlinType().isObjCObjectType()
 

backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmDeclarations.kt

@@ -407,7 +407,7 @@ private class DeclarationsGeneratorVisitor(override val context: Context) :
         } else {
             val symbolName = if (descriptor.isExported()) {
                 descriptor.symbolName.also {
-                    if (!descriptor.isMain()) {
+                    if (descriptor.name.asString() != "main") {
                         assert(LLVMGetNamedFunction(context.llvm.llvmModule, it) == null) { it }
                     } else {
                         // As a workaround, allow `main` functions to clash because frontend accepts this.

backend.native/tests/build.gradle

@@ -43,7 +43,7 @@ repositories {
 
 dependencies {
     cli_bc project(path: ':backend.native', configuration: 'cli_bc')
-    update_tests (group: 'org',  name: 'Kotlin_dev_CompilerAllPlugins', version: testKotlinVersion) {
+    update_tests (group: 'org',  name: 'Kotlin_130_Compiler', version: testKotlinVersion) {
         artifact {
             name = 'internal/kotlin-test-data'
             type = 'zip'

gradle.properties

@@ -15,13 +15,13 @@
 #
 
 # A version of the Kotlin "toolchain" (compiler, runtime, stdlib etc) used by the build script.
-buildKotlinVersion=1.3-M2
+buildKotlinVersion=1.3.0-rc-6
-buildKotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-eap
+buildKotlinCompilerRepo=http://dl.bintray.com/kotlin/kotlin-dev
 remoteRoot=konan_tests
 testDataVersion=1226829:id
-kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_dev_CompilerAllPlugins),number:1.3.0-dev-391,tag:kotlin-native,pinned:true,branch:(default:any)/artifacts/content/maven
+kotlinCompilerRepo=https://teamcity.jetbrains.com/guestAuth/app/rest/builds/buildType:(id:Kotlin_130_Compiler),number:1.3.0-rc-6,branch:(default:any)/artifacts/content/maven
-kotlinVersion=1.3.0-dev-391
+kotlinVersion=1.3.0-rc-6
-testKotlinVersion=1.3.0-dev-391
+testKotlinVersion=1.3.0-rc-6
 konanVersion=0.9
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.workers.max=4

runtime/src/main/kotlin/kotlin/Exceptions.kt

@@ -172,3 +172,13 @@ public open class IllegalCharacterConversionException : IllegalArgumentException
 
     constructor(message: String?) : super(message)
 }
+
+public actual open class ConcurrentModificationException actual constructor(message: String?, cause: Throwable?) :
+        RuntimeException(message, cause) {
+
+    actual constructor() : this(null, null)
+
+    actual constructor(message: String?) : this(message, null)
+
+    actual constructor(cause: Throwable?) : this(null, cause)
+}

runtime/src/main/kotlin/kotlin/coroutines/intrinsics/IntrinsicsNative.kt

@@ -181,11 +181,3 @@ private inline fun <T> createCoroutineFromSuspendFunction(
                     }
         }
 }
-
-/**
- * This value is used as a return value of [suspendCoroutineOrReturn] `block` argument to state that
- * the execution was suspended and will not return any result immediately.
- */
-@SinceKotlin("1.3")
-public actual val COROUTINE_SUSPENDED: Any
-    get() = CoroutineSingletons.COROUTINE_SUSPENDED

runtime/src/main/kotlin/kotlin/reflect/KCallable.kt

@@ -12,8 +12,7 @@ import kotlin.native.internal.FixmeReflection
  *
  * @param R return type of the callable.
  */
-@FixmeReflection
+public actual interface KCallable<out R> : KAnnotatedElement {
-public interface KCallable<out R> : KAnnotatedElement {
     /**
      * The name of this callable as it was declared in the source code.
      * If the callable has no name, a special invented name is created.
@@ -22,7 +21,7 @@ public interface KCallable<out R> : KAnnotatedElement {
      * - property accessors: the getter for a property named "foo" will have the name "<get-foo>",
      *   the setter, similarly, will have the name "<set-foo>".
      */
-    public val name: String
+    public actual val name: String
 
     /**
      * The type of values returned by this callable.

runtime/src/main/kotlin/kotlin/reflect/KClass.kt

@@ -13,12 +13,12 @@ package kotlin.reflect
  *
  * @param T the type of the class.
  */
-public interface KClass<T : Any> : KDeclarationContainer, KAnnotatedElement, KClassifier {
+public actual interface KClass<T : Any> : KDeclarationContainer, KAnnotatedElement, KClassifier {
     /**
      * The simple name of the class as it was declared in the source code,
      * or `null` if the class has no name (if, for example, it is an anonymous object literal).
      */
-    public val simpleName: String?
+    public actual val simpleName: String?
 
     /**
      * The fully qualified dot-separated name of the class,

runtime/src/main/kotlin/kotlin/reflect/KProperty.kt

@@ -15,48 +15,40 @@ import kotlin.native.internal.FixmeReflection
  *
  * @param R the type of the property.
  */
-@FixmeReflection
+public actual interface KProperty<out R> : KCallable<R>
-public interface KProperty<out R> : KCallable<R>
 
-@FixmeReflection
+public actual interface KProperty0<out R> : kotlin.reflect.KProperty<R>, () -> R {
-public interface KProperty0<out R> : kotlin.reflect.KProperty<R>, () -> R {
 
-    public abstract fun get(): R
+    public actual fun get(): R
 
     public override abstract operator fun invoke(): R
 }
 
-@FixmeReflection
+public actual interface KProperty1<T, out R> : kotlin.reflect.KProperty<R>, (T) -> R {
-public interface KProperty1<T, out R> : kotlin.reflect.KProperty<R>, (T) -> R {
+    public actual fun get(receiver: T): R
-    public abstract fun get(p1: T): R
 
-    public override abstract operator fun invoke(p1: T): R
+    public override operator fun invoke(p1: T): R
 }
 
-@FixmeReflection
+public actual interface KProperty2<T1, T2, out R> : kotlin.reflect.KProperty<R>, (T1, T2) -> R {
-public interface KProperty2<T1, T2, out R> : kotlin.reflect.KProperty<R>, (T1, T2) -> R {
+    public actual fun get(receiver1: T1, receiver2: T2): R
-    public abstract fun get(p1: T1, p2: T2): R
 
-    public override abstract operator fun invoke(p1: T1, p2: T2): R
+    public override operator fun invoke(p1: T1, p2: T2): R
 }
 
 /**
  * Represents a property declared as a `var`.
  */
-@FixmeReflection
+public actual interface KMutableProperty<R> : KProperty<R>
-public interface KMutableProperty<R> : KProperty<R>
 
-@FixmeReflection
+public actual interface KMutableProperty0<R> : KProperty0<R>, KMutableProperty<R> {
-public interface KMutableProperty0<R> : KProperty0<R>, KMutableProperty<R> {
+    public actual fun set(value: R)
-    public abstract fun set(value: R)
 }
 
-@FixmeReflection
+public actual interface KMutableProperty1<T, R> : KProperty1<T, R>, KMutableProperty<R> {
-public interface KMutableProperty1<T, R> : KProperty1<T, R>, KMutableProperty<R> {
+    public actual fun set(receiver: T, value: R)
-    public abstract fun set(receiver: T, value: R)
 }
 
-@FixmeReflection
+public actual interface KMutableProperty2<T1, T2, R> : KProperty2<T1, T2, R>, KMutableProperty<R> {
-public interface KMutableProperty2<T1, T2, R> : KProperty2<T1, T2, R>, KMutableProperty<R> {
+    public actual fun set(receiver1: T1, receiver2: T2, value: R)
-    public abstract fun set(receiver1: T1, receiver2: T2, value: R)
 }

samples/calculator/android/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3-M2'
+    ext.kotlin_version = '1.3.0-rc-6'
 
     repositories {
         google()

samples/calculator/build.gradle

@@ -1,12 +1,12 @@
 allprojects {
     buildscript {
         repositories {
-            maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
+            maven { url "http://dl.bintray.com/kotlin/kotlin-dev" }
         }
     }
 
     repositories {
-        maven { url "http://dl.bintray.com/kotlin/kotlin-eap" }
+        maven { url "http://dl.bintray.com/kotlin/kotlin-dev" }
     }
 }
 

samples/calculator/common/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3-M2'
+    ext.kotlin_version = '1.3.0-rc-6'
 
     repositories {
         mavenCentral()

samples/calculator/jvm/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.3-M2'
+    ext.kotlin_version = '1.3.0-rc-6'
 
     repositories {
         mavenCentral()

tools/kotlin-native-gradle-plugin/build.gradle

@@ -79,8 +79,8 @@ dependencies {
     bundleDependencies "org.jetbrains.kotlin:kotlin-native-shared:$konanVersion"
 
     testImplementation 'junit:junit:4.12'
-    testImplementation "org.jetbrains.kotlin:kotlin-test:1.3-M2"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:1.3.0-rc-6"
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.3-M2"
+    testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.3.0-rc-6"
     testImplementation "org.tools4j:tools4j-spockito:1.6"
     testImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
         exclude module: 'groovy-all'