Przeglądaj źródła

Fix deprecation in buildscripts

Him188 3 lat temu
rodzic
commit
3e28cb57b6

+ 2 - 1
buildSrc/src/main/kotlin/PublishingGpgSign.kt

@@ -32,7 +32,7 @@ open class GPGSignMavenArtifact(
 }
 
 class NameCounter(val name: String) {
-    var counter = 0
+    private var counter = 0
     val nextName: String
         get() = name + if (counter == 0) {
             counter = 1; ""
@@ -44,6 +44,7 @@ class NameCounter(val name: String) {
 object PublishingAccess {
     fun getMetadataArtifacts(publication: MavenPublication): Collection<MavenArtifact> {
         if (publication is DefaultMavenPublication) {
+            @Suppress("UNCHECKED_CAST")
             return DefaultMavenPublication::class.java.getDeclaredField("metadataArtifacts")
                 .also { it.isAccessible = true }
                 .get(publication) as Collection<MavenArtifact>

+ 2 - 3
buildSrc/src/main/kotlin/analyzes/AndroidApiLevelCheck.kt

@@ -12,9 +12,7 @@
 package analyzes
 
 import groovy.util.Node
-import groovy.util.XmlParser
 import org.gradle.api.Project
-import org.objectweb.asm.ClassReader
 import org.objectweb.asm.Type
 import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.FieldInsnNode
@@ -212,7 +210,8 @@ object AndroidApiLevelCheck {
         val apiVersionsFile =
             project.rootProject.projectDir.resolve("buildSrc/src/main/resources/androidutil/api-versions.xml")
         val classesInfos = mutableMapOf<String, ClassInfo>()
-        XmlParser().parse(apiVersionsFile).children().forEach { classNode ->
+        @Suppress("DEPRECATION")
+        groovy.util.XmlParser().parse(apiVersionsFile).children().forEach { classNode ->
             classNode as Node
             if (classNode.name() == "class") {
                 val fieldInfos = mutableMapOf<String, ClassInfo.MemberInfo>()