resolve merge conflicts of 470f5b14fe734bf35294404d02bd2304a30d1c4e to pi-preview1-androidx-dev
BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I45bffee2173ae1f82ad6bf74916334348bbcd3e4
diff --git a/buildSrc/build_dependencies.gradle b/buildSrc/build_dependencies.gradle
index 04975ef..700a1a8 100644
--- a/buildSrc/build_dependencies.gradle
+++ b/buildSrc/build_dependencies.gradle
@@ -16,7 +16,7 @@
def build_versions = [:]
-build_versions.kotlin = '1.2.20'
+build_versions.kotlin = '1.2.41'
rootProject.ext['build_versions'] = build_versions
diff --git a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
index d72d155..01e7588 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
@@ -32,8 +32,8 @@
const val JAVAPOET = "com.squareup:javapoet:1.8.0"
const val JSR250 = "javax.annotation:javax.annotation-api:1.2"
const val JUNIT = "junit:junit:4.12"
-const val KOTLIN_STDLIB = "org.jetbrains.kotlin:kotlin-stdlib:1.2.20"
-const val KOTLIN_METADATA = "me.eugeniomarletti:kotlin-metadata:1.2.1"
+const val KOTLIN_STDLIB = "org.jetbrains.kotlin:kotlin-stdlib:1.2.41"
+const val KOTLIN_METADATA = "me.eugeniomarletti.kotlin.metadata:kotlin-metadata:1.4.0"
const val LINT = "com.android.tools.lint:lint:26.2.0-alpha13"
const val MOCKITO_CORE = "org.mockito:mockito-core:2.7.6"
const val MULTIDEX = "androidx.multidex:multidex:2.0.0"
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
index 8a53b78..49f58d3 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
@@ -267,7 +267,7 @@
fail("not expected")
}
- override fun onChanged(position: Int, count: Int, payload: Any) {
+ override fun onChanged(position: Int, count: Int, payload: Any?) {
fail("not expected")
}
}
@@ -336,7 +336,7 @@
override fun onMoved(fromPosition: Int, toPosition: Int) {}
- override fun onChanged(position: Int, count: Int, payload: Any) {}
+ override fun onChanged(position: Int, count: Int, payload: Any?) {}
}
}
}
diff --git a/room/compiler/src/main/kotlin/androidx/room/ext/KotlinMetadataProcessor.kt b/room/compiler/src/main/kotlin/androidx/room/ext/KotlinMetadataProcessor.kt
index 9177c23..d7f49a2 100644
--- a/room/compiler/src/main/kotlin/androidx/room/ext/KotlinMetadataProcessor.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/ext/KotlinMetadataProcessor.kt
@@ -19,7 +19,8 @@
import me.eugeniomarletti.kotlin.metadata.KotlinClassMetadata
import me.eugeniomarletti.kotlin.metadata.KotlinMetadataUtils
import me.eugeniomarletti.kotlin.metadata.jvm.getJvmConstructorSignature
-import org.jetbrains.kotlin.serialization.ProtoBuf
+import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf
+import me.eugeniomarletti.kotlin.metadata.shadow.serialization.deserialization.getName
import javax.lang.model.element.ExecutableElement
/**
diff --git a/room/compiler/src/main/kotlin/androidx/room/ext/element_ext.kt b/room/compiler/src/main/kotlin/androidx/room/ext/element_ext.kt
index fbe94d4..0e2e365 100644
--- a/room/compiler/src/main/kotlin/androidx/room/ext/element_ext.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/ext/element_ext.kt
@@ -21,7 +21,7 @@
import com.google.auto.common.AnnotationMirrors
import com.google.auto.common.MoreElements
import com.google.auto.common.MoreTypes
-import org.jetbrains.kotlin.load.java.JvmAbi
+import me.eugeniomarletti.kotlin.metadata.shadow.load.java.JvmAbi
import javax.annotation.processing.ProcessingEnvironment
import javax.lang.model.element.AnnotationValue
import javax.lang.model.element.Element
diff --git a/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt b/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt
index 5b6fd10..c2b2017 100644
--- a/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt
+++ b/room/compiler/src/main/kotlin/androidx/room/writer/DaoWriter.kt
@@ -40,7 +40,7 @@
import com.squareup.javapoet.ParameterSpec
import com.squareup.javapoet.TypeName
import com.squareup.javapoet.TypeSpec
-import org.jetbrains.kotlin.load.java.JvmAbi
+import me.eugeniomarletti.kotlin.metadata.shadow.load.java.JvmAbi
import stripNonJava
import javax.annotation.processing.ProcessingEnvironment
import javax.lang.model.element.ElementKind
