WIP: core: Upgrade Kotlin to 1.5 (#733)

* core: Upgrade Kotlin to 1.5 * core: Upgrade Kotlin to 1.5.20
permissions-dispatcher · Jun 27, 2021 · c887672 · c887672
1 parent d091f7d
commit c887672
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,5 +17,7 @@ allprojects {
         mavenCentral()
         google()
         jcenter()
+        // TODO: remove after publishing kompile-testing to Maven Central
+        maven { url 'https://jitpack.io' }
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -19,8 +19,8 @@ POM_DEVELOPER_URL       = https://github.com/hotchemi
 DOKKA_VERSION           = 1.4.20
 PUBLISH_PLUGIN_VERSION  = 0.13.0
 GRADLE_PLUGIN_VERSION   = 4.0.0
-KOTLIN_VERSION          = 1.3.50
-KOTLIN_METADATA_VERSION = 0.0.5
+KOTLIN_VERSION          = 1.5.20
+KOTLIN_METADATA_VERSION = 0.3.0
 ANDROIDX_LIBRARY_VERSION= 1.0.0
 LIFECYCLE_VERSION       = 2.2.0
 ARC_TESTING_VERSION     = 1.1.1
@@ -34,7 +34,7 @@ COMPILE_TESTING_VERSION = 0.12
 LINT_VERSION            = 26.3.2
 ROBOLECTRIC_VERSION     = 3.3.2
 COMMONS_IO_VERSION      = 2.6
-KOMPILE_TESTING_VERSION = 0.1.3
+KOMPILE_TESTING_VERSION = 0.1.4
 
 # Android configuration
 COMPILE_SDK_VERSION     = android-29

diff --git a/processor/build.gradle b/processor/build.gradle
@@ -11,9 +11,17 @@ apply plugin: AarToJarConversionPlugin
 // Connect sources & tests to library project
 convertAarsToJar.dependsOn ":library:assembleRelease"
 
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        def requested = details.requested
+        if (requested.group == 'org.jetbrains.kotlin' && requested.name == 'kotlin-reflect') {
+            details.useVersion KOTLIN_VERSION
+        }
+    }
+}
+
 dependencies {
     compile "androidx.annotation:annotation:$ANDROIDX_LIBRARY_VERSION"
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
     compile "org.jetbrains.kotlinx:kotlinx-metadata-jvm:$KOTLIN_METADATA_VERSION"
     compile "com.squareup:javapoet:$JAVAPOET_VERSION"
     compile "com.squareup:kotlinpoet:$KOTLINPOET_VERSION"
@@ -30,5 +38,5 @@ dependencies {
     testCompile "commons-io:commons-io:$COMMONS_IO_VERSION"
     testCompile "com.squareup.okio:okio:2.1.0"
     testCompile "androidx.legacy:legacy-support-v4:$ANDROIDX_LIBRARY_VERSION"
-    testCompile "org.permissionsdispatcher:kompile-testing:$KOMPILE_TESTING_VERSION"
+    testCompile "com.github.permissions-dispatcher:kompile-testing:$KOMPILE_TESTING_VERSION"
 }
diff --git a/processor/src/main/kotlin/permissions/dispatcher/processor/util/Helpers.kt b/processor/src/main/kotlin/permissions/dispatcher/processor/util/Helpers.kt
@@ -29,7 +29,7 @@ fun withPermissionCheckMethodName(e: ExecutableElement) = "${e.simpleString().tr
 
 fun Element.kotlinMetadata(): KotlinClassMetadata? =
         getAnnotation(Metadata::class.java)?.run {
-            KotlinClassMetadata.read(KotlinClassHeader(kind, metadataVersion, bytecodeVersion, data1, data2, extraString, packageName, extraInt))
+            KotlinClassMetadata.read(KotlinClassHeader(kind, metadataVersion, data1, data2, extraString, packageName, extraInt))
         }
 
 val Element.isInternal: Boolean