Skip to content

Commit a4b04fc

Browse files
Upgrade to Kotlin 1.4.20 (#261)
1 parent c993dd7 commit a4b04fc

File tree

6 files changed

+22
-23
lines changed

6 files changed

+22
-23
lines changed

arrow-libs/core/arrow-continuations/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ apply from: "$DOC_CREATION"
99
apply plugin: 'kotlinx-atomicfu'
1010

1111
dependencies {
12-
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
1312
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$JUNIT_VINTAGE_VERSION"
1413
testCompileOnly "io.kotlintest:kotlintest-runner-junit5:$KOTLIN_TEST_VERSION", excludeArrow
1514
testImplementation project(":arrow-core-test")

arrow-libs/core/arrow-meta/src/main/java/arrow/common/utils/ClassOrPackageDataWrapper.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ package arrow.common.utils
22

33
import me.eugeniomarletti.kotlin.metadata.ClassData
44
import me.eugeniomarletti.kotlin.metadata.PackageData
5-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Constructor
6-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Function
7-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Property
8-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.TypeParameter
9-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.NameResolver
5+
import org.jetbrains.kotlin.metadata.ProtoBuf.Constructor
6+
import org.jetbrains.kotlin.metadata.ProtoBuf.Function
7+
import org.jetbrains.kotlin.metadata.ProtoBuf.Property
8+
import org.jetbrains.kotlin.metadata.ProtoBuf.TypeParameter
9+
import org.jetbrains.kotlin.metadata.deserialization.NameResolver
1010

1111
sealed class ClassOrPackageDataWrapper {
1212
abstract val `package`: String
@@ -19,7 +19,7 @@ sealed class ClassOrPackageDataWrapper {
1919

2020
class Package(
2121
override val nameResolver: NameResolver,
22-
val packageProto: me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Package,
22+
val packageProto: org.jetbrains.kotlin.metadata.ProtoBuf.Package,
2323
override val `package`: String
2424
) : ClassOrPackageDataWrapper() {
2525
override val constructorList: List<Constructor> get() = emptyList()
@@ -31,7 +31,7 @@ sealed class ClassOrPackageDataWrapper {
3131

3232
class Class(
3333
override val nameResolver: NameResolver,
34-
val classProto: me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf.Class,
34+
val classProto: org.jetbrains.kotlin.metadata.ProtoBuf.Class,
3535
override val `package`: String
3636
) : ClassOrPackageDataWrapper() {
3737
override val constructorList: List<Constructor> get() = classProto.constructorList

arrow-libs/core/arrow-meta/src/main/java/arrow/common/utils/ProcessorUtils.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import me.eugeniomarletti.kotlin.metadata.jvm.getJvmMethodSignature
1212
import me.eugeniomarletti.kotlin.metadata.kotlinMetadata
1313
import me.eugeniomarletti.kotlin.metadata.modality
1414
import me.eugeniomarletti.kotlin.metadata.proto
15-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf
16-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.Flags
17-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.TypeTable
18-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.supertypes
19-
import me.eugeniomarletti.kotlin.metadata.shadow.serialization.deserialization.getName
15+
import org.jetbrains.kotlin.metadata.ProtoBuf
16+
import org.jetbrains.kotlin.metadata.deserialization.Flags
17+
import org.jetbrains.kotlin.metadata.deserialization.TypeTable
18+
import org.jetbrains.kotlin.metadata.deserialization.supertypes
19+
import org.jetbrains.kotlin.serialization.deserialization.getName
2020
import java.io.File
2121
import javax.lang.model.element.Element
2222
import javax.lang.model.element.ExecutableElement

arrow-libs/core/arrow-meta/src/main/java/arrow/higherkinds/HigherKindsFileGenerator.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import arrow.common.Package
44
import arrow.common.utils.knownError
55
import arrow.common.utils.typeConstraints
66
import arrow.common.utils.writeSafe
7-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf
7+
import org.jetbrains.kotlin.metadata.ProtoBuf
88
import javax.annotation.processing.Filer
99
import javax.lang.model.element.Name
1010

arrow-libs/core/arrow-meta/src/main/java/arrow/meta/encoder/jvm/KotlinMetatadataEncoder.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import arrow.meta.ast.TypeName
1313
import me.eugeniomarletti.kotlin.metadata.escapedClassName
1414
import me.eugeniomarletti.kotlin.metadata.jvm.jvmMethodSignature
1515
import me.eugeniomarletti.kotlin.metadata.modality
16-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf
17-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.Flags
18-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.NameResolver
19-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.TypeTable
20-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.supertypes
16+
import org.jetbrains.kotlin.metadata.ProtoBuf
17+
import org.jetbrains.kotlin.metadata.deserialization.Flags
18+
import org.jetbrains.kotlin.metadata.deserialization.NameResolver
19+
import org.jetbrains.kotlin.metadata.deserialization.TypeTable
20+
import org.jetbrains.kotlin.metadata.deserialization.supertypes
2121
import javax.lang.model.element.ExecutableElement
2222

2323
interface KotlinMetatadataEncoder {

arrow-libs/core/arrow-meta/src/main/java/arrow/meta/encoder/jvm/TypeElementEncoder.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ import me.eugeniomarletti.kotlin.metadata.jvm.getJvmFieldSignature
2727
import me.eugeniomarletti.kotlin.metadata.jvm.getJvmMethodSignature
2828
import me.eugeniomarletti.kotlin.metadata.jvm.jvmPropertySignature
2929
import me.eugeniomarletti.kotlin.metadata.modality
30-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.ProtoBuf
31-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.TypeTable
32-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.deserialization.hasReceiver
33-
import me.eugeniomarletti.kotlin.metadata.shadow.metadata.jvm.JvmProtoBuf
30+
import org.jetbrains.kotlin.metadata.ProtoBuf
31+
import org.jetbrains.kotlin.metadata.deserialization.TypeTable
32+
import org.jetbrains.kotlin.metadata.deserialization.hasReceiver
33+
import org.jetbrains.kotlin.metadata.jvm.JvmProtoBuf
3434
import me.eugeniomarletti.kotlin.metadata.visibility
3535
import javax.lang.model.element.Element
3636
import javax.lang.model.element.ElementKind

0 commit comments

Comments
 (0)