kotlin: upgrade to 1.5

4 years ago · 9dcf014a39
parent 66c264b504
commit 9dcf014a39
50 changed files with 2 additions and 50 deletions
--- a/bbootimg/build.gradle.kts
+++ b/bbootimg/build.gradle.kts
@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
-    kotlin("jvm") version "1.4.31"
+    kotlin("jvm") version "1.5.20-RC"
    application
 }

--- a/bbootimg/src/main/kotlin/avb/AVBInfo.kt
+++ b/bbootimg/src/main/kotlin/avb/AVBInfo.kt
@ -22,7 +22,6 @@ import avb.blob.Header
 /*
    a wonderfaul base64 encoder/decoder: https://cryptii.com/base64-to-hex
 */
-@OptIn(ExperimentalUnsignedTypes::class)
 class AVBInfo(var header: Header? = null,
              var authBlob: AuthBlob? = null,
              var auxBlob: AuxBlob? = null,
--- a/bbootimg/src/main/kotlin/avb/Avb.kt
+++ b/bbootimg/src/main/kotlin/avb/Avb.kt
@ -39,7 +39,6 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardOpenOption

-@OptIn(ExperimentalUnsignedTypes::class)
 class Avb {
    private val MAX_VBMETA_SIZE = 64 * 1024
    private val MAX_FOOTER_SIZE = 4096
--- a/bbootimg/src/main/kotlin/avb/alg/Algorithms.kt
+++ b/bbootimg/src/main/kotlin/avb/alg/Algorithms.kt
@ -17,7 +17,6 @@ package avb.alg
 import cfig.io.Struct3

 class Algorithms {
-    @OptIn(ExperimentalUnsignedTypes::class)
    companion object {
        private val algMap = mutableMapOf<String, Algorithm>()
        fun get(name: String): Algorithm? {
--- a/bbootimg/src/main/kotlin/avb/blob/AuthBlob.kt
+++ b/bbootimg/src/main/kotlin/avb/blob/AuthBlob.kt
@ -25,7 +25,6 @@ import java.nio.file.Paths
 import java.security.MessageDigest
 import java.security.PrivateKey

-@OptIn(ExperimentalUnsignedTypes::class)
 data class AuthBlob(
    var offset: Long = 0,
    var size: Long = 0,
--- a/bbootimg/src/main/kotlin/avb/blob/AuxBlob.kt
+++ b/bbootimg/src/main/kotlin/avb/blob/AuxBlob.kt
@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory
 import java.nio.file.Files
 import java.nio.file.Paths

-@OptIn(ExperimentalUnsignedTypes::class)
@JsonIgnoreProperties("descriptorSize")
 class AuxBlob(
    var pubkey: PubKeyInfo? = null,
--- a/bbootimg/src/main/kotlin/avb/blob/Footer.kt
+++ b/bbootimg/src/main/kotlin/avb/blob/Footer.kt
@ -37,7 +37,6 @@ https://github.com/cfig/Android_boot_image_editor/blob/master/doc/layout.md#32-a
 +---------------------------------------+-------------------------+ --> partition_size
 */

-@OptIn(ExperimentalUnsignedTypes::class)
 data class Footer constructor(
        var versionMajor: Int = FOOTER_VERSION_MAJOR,
        var versionMinor: Int = FOOTER_VERSION_MINOR,
--- a/bbootimg/src/main/kotlin/avb/blob/Header.kt
+++ b/bbootimg/src/main/kotlin/avb/blob/Header.kt
@ -19,7 +19,6 @@ import cfig.io.Struct3
 import java.io.InputStream

 //avbtool::AvbVBMetaHeader
-@OptIn(ExperimentalUnsignedTypes::class)
 data class Header(
        var required_libavb_version_major: Int = Avb.AVB_VERSION_MAJOR,
        var required_libavb_version_minor: Int = 0,
--- a/bbootimg/src/main/kotlin/avb/desc/ChainPartitionDescriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/ChainPartitionDescriptor.kt
@ -22,7 +22,6 @@ import java.io.InputStream
 import java.security.MessageDigest
 import org.slf4j.LoggerFactory

-@OptIn(ExperimentalUnsignedTypes::class)
 class ChainPartitionDescriptor(
        var rollback_index_location: Int = 0,
        var partition_name_len: Int = 0,
--- a/bbootimg/src/main/kotlin/avb/desc/Descriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/Descriptor.kt
@ -14,7 +14,6 @@

 package avb.desc

-@OptIn(ExperimentalUnsignedTypes::class)
 abstract class Descriptor(var tag: Long, var num_bytes_following: Long, var sequence: Int = 0) {
    abstract fun encode(): ByteArray
 }
--- a/bbootimg/src/main/kotlin/avb/desc/HashDescriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/HashDescriptor.kt
@ -24,7 +24,6 @@ import java.io.FileInputStream
 import java.io.InputStream
 import java.security.MessageDigest

-@OptIn(ExperimentalUnsignedTypes::class)
 class HashDescriptor(var flags: Int = 0,
                     var partition_name: String = "",
                     var hash_algorithm: String = "",
--- a/bbootimg/src/main/kotlin/avb/desc/HashTreeDescriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/HashTreeDescriptor.kt
@ -23,7 +23,6 @@ import java.io.*
 import java.security.MessageDigest
 import java.util.*

-@OptIn(ExperimentalUnsignedTypes::class)
 class HashTreeDescriptor(
    var flags: Int = 0,
    var dm_verity_version: Int = 0,
--- a/bbootimg/src/main/kotlin/avb/desc/KernelCmdlineDescriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/KernelCmdlineDescriptor.kt
@ -18,7 +18,6 @@ import cfig.helper.Helper
 import cfig.io.Struct3
 import java.io.InputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class KernelCmdlineDescriptor(
        var flags: Int = 0,
        var cmdlineLength: Int = 0,
--- a/bbootimg/src/main/kotlin/avb/desc/PropertyDescriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/PropertyDescriptor.kt
@ -18,7 +18,6 @@ import cfig.helper.Helper
 import cfig.io.Struct3
 import java.io.InputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class PropertyDescriptor(
        var key: String = "",
        var value: String = "") : Descriptor(TAG, 0, 0) {
--- a/bbootimg/src/main/kotlin/avb/desc/UnknownDescriptor.kt
+++ b/bbootimg/src/main/kotlin/avb/desc/UnknownDescriptor.kt
@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream
 import java.io.InputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class UnknownDescriptor(var data: ByteArray = byteArrayOf()) : Descriptor(0, 0, 0) {
    @Throws(IllegalArgumentException::class)
    constructor(stream: InputStream, seq: Int = 0) : this() {
--- a/bbootimg/src/main/kotlin/bootimg/Common.kt
+++ b/bbootimg/src/main/kotlin/bootimg/Common.kt
@ -37,7 +37,6 @@ import java.nio.ByteOrder
 import java.security.MessageDigest
 import java.util.regex.Pattern

-@OptIn(ExperimentalUnsignedTypes::class)
 class Common {
    data class VeritySignature(
        var type: String = "dm-verity",
--- a/bbootimg/src/main/kotlin/bootimg/Signer.kt
+++ b/bbootimg/src/main/kotlin/bootimg/Signer.kt
@ -27,7 +27,6 @@ import java.io.File
 import cfig.EnvironmentVerifier

 class Signer {
-    @OptIn(ExperimentalUnsignedTypes::class)
    companion object {
        private val log = LoggerFactory.getLogger(Signer::class.java)

--- a/bbootimg/src/main/kotlin/bootimg/v2/BootHeaderV2.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v2/BootHeaderV2.kt
@ -21,7 +21,6 @@ import org.slf4j.LoggerFactory
 import java.io.InputStream
 import kotlin.math.pow

-@OptIn(ExperimentalUnsignedTypes::class)
 open class BootHeaderV2(
        var kernelLength: Int = 0,
        var kernelOffset: Long = 0L, //UInt
--- a/bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v2/BootV2.kt
@ -32,7 +32,6 @@ import java.io.FileOutputStream
 import java.nio.ByteBuffer
 import java.nio.ByteOrder

-@OptIn(ExperimentalUnsignedTypes::class)
 data class BootV2(
    var info: MiscInfo = MiscInfo(),
    var kernel: CommArgs = CommArgs(),
--- a/bbootimg/src/main/kotlin/bootimg/v3/BootHeaderV3.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v3/BootHeaderV3.kt
@ -19,7 +19,6 @@ import cfig.io.Struct3
 import org.slf4j.LoggerFactory
 import java.io.InputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class BootHeaderV3(
    var kernelSize: Int = 0,
    var ramdiskSize: Int = 0,
--- a/bbootimg/src/main/kotlin/bootimg/v3/BootV3.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v3/BootV3.kt
@ -33,7 +33,6 @@ import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import cfig.bootimg.Common as C

-@OptIn(ExperimentalUnsignedTypes::class)
 data class BootV3(
    var info: MiscInfo = MiscInfo(),
    var kernel: CommArgs = CommArgs(),
--- a/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v3/VendorBoot.kt
@ -34,7 +34,6 @@ import cfig.EnvironmentVerifier
 import cfig.io.Struct3
 import java.io.InputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 data class VendorBoot(
    var info: MiscInfo = MiscInfo(),
    var ramdisk: CommArgs = CommArgs(),
--- a/bbootimg/src/main/kotlin/bootimg/v3/VendorBootHeader.kt
+++ b/bbootimg/src/main/kotlin/bootimg/v3/VendorBootHeader.kt
@ -18,7 +18,6 @@ import cfig.io.Struct3
 import org.slf4j.LoggerFactory
 import java.io.InputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class VendorBootHeader(
    var headerVersion: Int = 0,
    var pageSize: Int = 0,
--- a/bbootimg/src/main/kotlin/bootloader_message/BootloaderMsg.kt
+++ b/bbootimg/src/main/kotlin/bootloader_message/BootloaderMsg.kt
@ -21,7 +21,6 @@ import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.lang.IllegalStateException

-@OptIn(ExperimentalUnsignedTypes::class)
 data class BootloaderMsg(//offset 0, size 2k
        var command: String = "",
        var status: String = "",
--- a/bbootimg/src/main/kotlin/bootloader_message/BootloaderMsgAB.kt
+++ b/bbootimg/src/main/kotlin/bootloader_message/BootloaderMsgAB.kt
@ -18,7 +18,6 @@ import cfig.io.Struct3
 import org.slf4j.LoggerFactory
 import java.io.FileInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class BootloaderMsgAB( //offset 2k, size 2k
        var slotSuffix: String = "",
        var updateChannel: String = "",
--- a/bbootimg/src/main/kotlin/bootloader_message/VirtualABMsg.kt
+++ b/bbootimg/src/main/kotlin/bootloader_message/VirtualABMsg.kt
@ -18,7 +18,6 @@ import cfig.io.Struct3
 import org.slf4j.LoggerFactory
 import java.io.FileInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 data class VirtualABMsg(
        var version: Int = 0,
        var magic: ByteArray = byteArrayOf(),
--- a/bbootimg/src/main/kotlin/init/Reboot.kt
+++ b/bbootimg/src/main/kotlin/init/Reboot.kt
@ -26,7 +26,6 @@ class Reboot {
        ANDROID_RB_THERMOFF
    }

-    @OptIn(ExperimentalUnsignedTypes::class)
    companion object {
        private val log = LoggerFactory.getLogger(Reboot::class.java)
        const val dynamicPartitionKey = "ro.boot.dynamic_partitions"
--- a/bbootimg/src/main/kotlin/packable/BootImgParser.kt
+++ b/bbootimg/src/main/kotlin/packable/BootImgParser.kt
@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class BootImgParser() : IPackable {
    override val loopNo: Int
        get() = 0
--- a/bbootimg/src/main/kotlin/packable/DtboParser.kt
+++ b/bbootimg/src/main/kotlin/packable/DtboParser.kt
@ -27,7 +27,6 @@ import java.io.File
 import java.io.FileInputStream
 import java.util.*

-@OptIn(ExperimentalUnsignedTypes::class)
 class DtboParser(val workDir: File) : IPackable {
    override val loopNo: Int
        get() = 0
--- a/bbootimg/src/main/kotlin/packable/IPackable.kt
+++ b/bbootimg/src/main/kotlin/packable/IPackable.kt
@ -22,7 +22,6 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File

-@OptIn(ExperimentalUnsignedTypes::class)
 interface IPackable {
    val loopNo: Int
    fun capabilities(): List<String> {
--- a/bbootimg/src/main/kotlin/packable/PackableLauncher.kt
+++ b/bbootimg/src/main/kotlin/packable/PackableLauncher.kt
@ -25,7 +25,6 @@ import kotlin.system.exitProcess

 class PackableLauncher

-@OptIn(ExperimentalUnsignedTypes::class)
 fun main(args: Array<String>) {
    val log = LoggerFactory.getLogger(PackableLauncher::class.java)
    val packablePool = mutableMapOf<List<String>, KClass<IPackable>>()
--- a/bbootimg/src/main/kotlin/packable/VBMetaParser.kt
+++ b/bbootimg/src/main/kotlin/packable/VBMetaParser.kt
@ -18,7 +18,6 @@ import cfig.Avb
 import cfig.helper.Helper
 import java.io.File

-@OptIn(ExperimentalUnsignedTypes::class)
 class VBMetaParser: IPackable {
    override val loopNo: Int
        get() = 1
--- a/bbootimg/src/main/kotlin/sparse_util/SparseImgParser.kt
+++ b/bbootimg/src/main/kotlin/sparse_util/SparseImgParser.kt
@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import avb.blob.Footer
 import cfig.Avb

-@OptIn(ExperimentalUnsignedTypes::class)
 class SparseImgParser : IPackable {
    override val loopNo: Int
        get() = 0
--- a/bbootimg/src/test/kotlin/AvbTest.kt
+++ b/bbootimg/src/test/kotlin/AvbTest.kt
@ -21,7 +21,6 @@ import org.junit.Assert.*
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class AvbTest {
    private val log = LoggerFactory.getLogger(AvbTest::class.java)

--- a/bbootimg/src/test/kotlin/KeyUtilTest.kt
+++ b/bbootimg/src/test/kotlin/KeyUtilTest.kt
@ -31,7 +31,6 @@ import java.security.spec.PKCS8EncodedKeySpec
 import java.security.spec.X509EncodedKeySpec
 import javax.crypto.Cipher

-@OptIn(ExperimentalUnsignedTypes::class)
 class KeyUtilTest {
    @Test
    fun parseKeys() {
--- a/bbootimg/src/test/kotlin/avb/BlobTest.kt
+++ b/bbootimg/src/test/kotlin/avb/BlobTest.kt
@ -24,7 +24,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class BlobTest {
    @Test
    fun testEncodedKey2048() {
--- a/bbootimg/src/test/kotlin/avb/FooterTest.kt
+++ b/bbootimg/src/test/kotlin/avb/FooterTest.kt
@ -20,7 +20,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class FooterTest {
    @Test
    fun readAVBfooter() {
--- a/bbootimg/src/test/kotlin/avb/HeaderTest.kt
+++ b/bbootimg/src/test/kotlin/avb/HeaderTest.kt
@ -19,7 +19,6 @@ import org.apache.commons.codec.binary.Hex
 import org.junit.Test
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class HeaderTest {

    @Test
--- a/bbootimg/src/test/kotlin/avb/alg/AlgorithmsTest.kt
+++ b/bbootimg/src/test/kotlin/avb/alg/AlgorithmsTest.kt
@ -18,7 +18,6 @@ import cfig.helper.Helper
 import org.junit.Assert
 import org.junit.Test

-@OptIn(ExperimentalUnsignedTypes::class)
 class AlgorithmsTest {
    @Test
    fun test1() {
--- a/bbootimg/src/test/kotlin/avb/desc/HashDescriptorTest.kt
+++ b/bbootimg/src/test/kotlin/avb/desc/HashDescriptorTest.kt
@ -20,7 +20,6 @@ import org.junit.Test
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class HashDescriptorTest {
    private val log = LoggerFactory.getLogger(HashDescriptorTest::class.java)

--- a/bbootimg/src/test/kotlin/avb/desc/HashTreeDescriptorTest.kt
+++ b/bbootimg/src/test/kotlin/avb/desc/HashTreeDescriptorTest.kt
@ -22,7 +22,6 @@ import org.junit.Test
 import java.io.ByteArrayInputStream
 import java.security.MessageDigest

-@OptIn(ExperimentalUnsignedTypes::class)
 class HashTreeDescriptorTest {

    @Test
--- a/bbootimg/src/test/kotlin/avb/desc/KernelCmdlineDescriptorTest.kt
+++ b/bbootimg/src/test/kotlin/avb/desc/KernelCmdlineDescriptorTest.kt
@ -19,7 +19,6 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class KernelCmdlineDescriptorTest {
    @Test
    fun encode() {
--- a/bbootimg/src/test/kotlin/avb/desc/UnknownDescriptorTest.kt
+++ b/bbootimg/src/test/kotlin/avb/desc/UnknownDescriptorTest.kt
@ -20,7 +20,6 @@ import org.junit.Test
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class UnknownDescriptorTest {
    private val log = LoggerFactory.getLogger(UnknownDescriptorTest::class.java)

--- a/bbootimg/src/test/kotlin/bootloader_message/BootloaderMsgTest.kt
+++ b/bbootimg/src/test/kotlin/bootloader_message/BootloaderMsgTest.kt
@ -21,7 +21,6 @@ import org.junit.Test
 import org.slf4j.LoggerFactory
 import java.io.File

-@OptIn(ExperimentalUnsignedTypes::class)
 class BootloaderMsgTest {
    private val log = LoggerFactory.getLogger(BootloaderMsgTest::class.java)

--- a/bbootimg/src/test/kotlin/init/RebootTest.kt
+++ b/bbootimg/src/test/kotlin/init/RebootTest.kt
@ -23,7 +23,6 @@ import cfig.init.Reboot
 import cfig.bootimg.Common.Companion.deleleIfExists
 import org.slf4j.LoggerFactory

-@OptIn(ExperimentalUnsignedTypes::class)
 class RebootTest {
    private val log = LoggerFactory.getLogger(RebootTest::class.java)

--- a/helper/build.gradle.kts
+++ b/helper/build.gradle.kts
@ -15,7 +15,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

 plugins {
-    id("org.jetbrains.kotlin.jvm") version "1.4.31"
+    id("org.jetbrains.kotlin.jvm") version "1.5.20-RC"
    `java-library`
 }

--- a/helper/src/main/kotlin/cfig/helper/Helper.kt
+++ b/helper/src/main/kotlin/cfig/helper/Helper.kt
@ -30,7 +30,6 @@ import kotlin.math.pow
 import java.text.StringCharacterIterator
 import java.text.CharacterIterator

-@OptIn(ExperimentalUnsignedTypes::class)
 class Helper {
    data class Slice(
        var srcFile: String,
--- a/helper/src/main/kotlin/cfig/helper/KeyHelper.kt
+++ b/helper/src/main/kotlin/cfig/helper/KeyHelper.kt
@ -35,7 +35,6 @@ import java.util.*
 https://docs.oracle.com/javase/9/security/java-pki-programmers-guide.htm#JSSEC-GUID-650D0D53-B617-4055-AFD3-AF5C2629CBBF
 https://www.baeldung.com/java-read-pem-file-keys
 */
-@OptIn(ExperimentalUnsignedTypes::class)
 class KeyHelper {
    companion object {
        private val log = LoggerFactory.getLogger(KeyHelper::class.java)
--- a/helper/src/main/kotlin/cfig/io/Struct3.kt
+++ b/helper/src/main/kotlin/cfig/io/Struct3.kt
@ -45,7 +45,6 @@ import java.util.*
 import java.util.regex.Pattern
 import kotlin.random.Random

-@OptIn(kotlin.ExperimentalUnsignedTypes::class)
 class Struct3 {
    private val log = LoggerFactory.getLogger(Struct3::class.java)
    private val formatString: String
--- a/helper/src/test/kotlin/cfig/io/Struct3Test.kt
+++ b/helper/src/test/kotlin/cfig/io/Struct3Test.kt
@ -19,7 +19,6 @@ import org.junit.Assert
 import org.junit.Test
 import java.io.ByteArrayInputStream

-@OptIn(ExperimentalUnsignedTypes::class)
 class Struct3Test {
    private fun getConvertedFormats(inStruct: Struct3): ArrayList<Map<String, Int>> {
        val f = inStruct.javaClass.getDeclaredField("formats")