build tool update

kotlin 1.3.61 to 1.3.71
gradle 6.0.1 to 6.3
replase @Experimental with @OptIn

bbootimg/build.gradle.kts

@@ -1,5 +1,7 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
-    id("org.jetbrains.kotlin.jvm").version("1.3.61")
+    id("org.jetbrains.kotlin.jvm").version("1.3.71")
     application
 }
 
@@ -31,6 +33,10 @@ application {
     mainClassName = "cfig.packable.PackableLauncherKt"
 }
 
+tasks.withType<KotlinCompile>().all {
+    kotlinOptions.freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
+}
+
 tasks {
     jar {
         manifest {

bbootimg/src/main/kotlin/Helper.kt

@@ -20,8 +20,8 @@ import java.util.zip.GZIPInputStream
 import java.util.zip.GZIPOutputStream
 import javax.crypto.Cipher
 
+@OptIn(ExperimentalUnsignedTypes::class)
 class Helper {
-    @ExperimentalUnsignedTypes
     companion object {
         fun joinWithNulls(vararg source: ByteArray?): ByteArray {
             val baos = ByteArrayOutputStream()

bbootimg/src/main/kotlin/ParamConfig.kt

@@ -1,6 +1,6 @@
 package cfig
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 data class ParamConfig(
         //file input
         var kernel: String = UnifiedConfig.workDir + "kernel",

bbootimg/src/main/kotlin/Signer.kt

@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory
 import java.io.File
 
 class Signer {
-    @ExperimentalUnsignedTypes
+    @OptIn(ExperimentalUnsignedTypes::class)
     companion object {
         private val log = LoggerFactory.getLogger(Signer::class.java)
 

bbootimg/src/main/kotlin/UnifiedConfig.kt

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.ObjectMapper
 import java.io.File
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 data class UnifiedConfig(
         var info: MiscInfo = MiscInfo(),
@@ -22,7 +22,6 @@ data class UnifiedConfig(
             var size: String = "0",
             var loadOffset: String = "0")
 
-    @ExperimentalUnsignedTypes
     data class MiscInfo(
             var output: String = "",
             var headerVersion: UInt = 0U,

bbootimg/src/main/kotlin/avb/AVBInfo.kt

@@ -8,7 +8,7 @@ import avb.blob.Header
 /*
     a wonderfaul base64 encoder/decoder: https://cryptii.com/base64-to-hex
  */
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class AVBInfo(var header: Header? = null,
               var authBlob: AuthBlob? = null,
               var auxBlob: AuxBlob? = null,

bbootimg/src/main/kotlin/avb/Avb.kt

@@ -19,7 +19,7 @@ import java.nio.file.Files
 import java.nio.file.Paths
 import java.nio.file.StandardOpenOption
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class Avb {
     private val MAX_VBMETA_SIZE = 64 * 1024
     private val MAX_FOOTER_SIZE = 4096

bbootimg/src/main/kotlin/avb/alg/Algorithms.kt

@@ -3,7 +3,7 @@ package avb.alg
 import cfig.io.Struct3
 
 class Algorithms {
-    @ExperimentalUnsignedTypes
+    @OptIn(ExperimentalUnsignedTypes::class)
     companion object {
         private val algMap = mutableMapOf<String, Algorithm>()
         fun get(name: String): Algorithm? {

bbootimg/src/main/kotlin/avb/blob/AuthBlob.kt

@@ -6,7 +6,7 @@ import cfig.io.Struct3
 import org.slf4j.LoggerFactory
 import java.security.MessageDigest
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 data class AuthBlob(
         var offset: ULong = 0U,
         var size: ULong = 0U,

bbootimg/src/main/kotlin/avb/blob/AuxBlob.kt

@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory
 import java.nio.file.Files
 import java.nio.file.Paths
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 @JsonIgnoreProperties("descriptorSize")
 class AuxBlob(
         var pubkey: PubKeyInfo? = null,

bbootimg/src/main/kotlin/avb/blob/Footer.kt

@@ -23,7 +23,7 @@ https://github.com/cfig/Android_boot_image_editor/blob/master/doc/layout.md#32-a
 +---------------------------------------+-------------------------+ --> partition_size
  */
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 data class Footer constructor(
         var versionMajor: UInt = FOOTER_VERSION_MAJOR,
         var versionMinor: UInt = FOOTER_VERSION_MINOR,

bbootimg/src/main/kotlin/avb/blob/Header.kt

@@ -5,7 +5,7 @@ import cfig.io.Struct3
 import java.io.InputStream
 
 //avbtool::AvbVBMetaHeader
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 data class Header(
         var required_libavb_version_major: UInt = Avb.AVB_VERSION_MAJOR,
         var required_libavb_version_minor: UInt = 0U,
@@ -78,8 +78,8 @@ data class Header(
 
     //toplevel flags
     enum class AvbVBMetaImageFlags(val inFlags: Int) {
-        AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED(1),
-        AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED(2 shl 1)
+        AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED(1),          //disable hashtree image verification, for system/vendor/product etc.
+        AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED(2 shl 1) //disable all verification, do not parse descriptors
     }
 
     //verify flags

bbootimg/src/main/kotlin/avb/desc/ChainPartitionDescriptor.kt

@@ -6,7 +6,7 @@ import java.io.InputStream
 import java.security.MessageDigest
 import java.util.*
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class ChainPartitionDescriptor(
         var rollback_index_location: UInt = 0U,
         var partition_name_len: UInt = 0U,

bbootimg/src/main/kotlin/avb/desc/Descriptor.kt

@@ -1,6 +1,6 @@
 package avb.desc
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 abstract class Descriptor(var tag: ULong, var num_bytes_following: ULong, var sequence: Int = 0) {
     abstract fun encode(): ByteArray
 }

bbootimg/src/main/kotlin/avb/desc/HashDescriptor.kt

@@ -10,7 +10,7 @@ import java.io.FileInputStream
 import java.io.InputStream
 import java.security.MessageDigest
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class HashDescriptor(var flags: UInt = 0U,
                      var partition_name: String = "",
                      var hash_algorithm: String = "",

bbootimg/src/main/kotlin/avb/desc/HashTreeDescriptor.kt

@@ -6,7 +6,7 @@ import cfig.io.Struct3
 import java.io.InputStream
 import java.util.*
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class HashTreeDescriptor(
         var flags: UInt = 0U,
         var dm_verity_version: UInt = 0u,

bbootimg/src/main/kotlin/avb/desc/KernelCmdlineDescriptor.kt

@@ -4,7 +4,7 @@ import cfig.Helper
 import cfig.io.Struct3
 import java.io.InputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class KernelCmdlineDescriptor(
         var flags: UInt = 0U,
         var cmdlineLength: UInt = 0U,

bbootimg/src/main/kotlin/avb/desc/PropertyDescriptor.kt

@@ -4,7 +4,7 @@ import cfig.Helper
 import cfig.io.Struct3
 import java.io.InputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class PropertyDescriptor(
         var key: String = "",
         var value: String = "") : Descriptor(TAG, 0U, 0) {

bbootimg/src/main/kotlin/avb/desc/UnknownDescriptor.kt

@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream
 import java.io.InputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class UnknownDescriptor(var data: ByteArray = byteArrayOf()) : Descriptor(0U, 0U, 0) {
     @Throws(IllegalArgumentException::class)
     constructor(stream: InputStream, seq: Int = 0) : this() {

bbootimg/src/main/kotlin/bootimg/BootImgHeader.kt

@@ -13,7 +13,7 @@ import java.security.MessageDigest
 import java.util.regex.Pattern
 import kotlin.math.pow
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 open class BootImgHeader(
         var kernelLength: UInt = 0U,
         var kernelOffset: UInt = 0U,

bbootimg/src/main/kotlin/bootimg/BootImgInfo.kt

@@ -4,7 +4,7 @@ import cfig.ParamConfig
 import org.apache.commons.exec.CommandLine
 import java.io.InputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class BootImgInfo(iS: InputStream?) : BootImgHeader(iS) {
     constructor() : this(null)
 

bbootimg/src/main/kotlin/bootimg/Packer.kt

@@ -11,7 +11,7 @@ import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.security.MessageDigest
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class Packer {
     private val log = LoggerFactory.getLogger("Packer")
 

bbootimg/src/main/kotlin/bootimg/Parser.kt

@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory
 import java.io.File
 import java.io.FileInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class Parser {
     private fun verifiedWithAVB(fileName: String): Boolean {
         val expectedBf = "AVBf".toByteArray()

bbootimg/src/main/kotlin/bootloader_message/BootloaderMsg.kt

@@ -7,7 +7,7 @@ import java.io.FileInputStream
 import java.io.FileOutputStream
 import java.lang.IllegalStateException
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 data class BootloaderMsg(
         var command: String = "",
         var status: String = "",

bbootimg/src/main/kotlin/cfig/io/Struct3.kt

@@ -31,7 +31,7 @@ import java.util.*
 import java.util.regex.Pattern
 import kotlin.random.Random
 
-@ExperimentalUnsignedTypes
+@OptIn(kotlin.ExperimentalUnsignedTypes::class)
 class Struct3 {
     private val log = LoggerFactory.getLogger(Struct3::class.java)
     private val formatString: String

bbootimg/src/main/kotlin/init/Reboot.kt

@@ -12,7 +12,7 @@ class Reboot {
         ANDROID_RB_THERMOFF
     }
 
-    @ExperimentalUnsignedTypes
+    @OptIn(ExperimentalUnsignedTypes::class)
     companion object {
         private val log = LoggerFactory.getLogger(Reboot::class.java)
         const val dynamicPartitionKey = "ro.boot.dynamic_partitions"

bbootimg/src/main/kotlin/packable/BootImgParser.kt

@@ -11,7 +11,7 @@ import java.io.File
 import java.io.FileInputStream
 import java.lang.IllegalArgumentException
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class BootImgParser() : IPackable {
     override val loopNo: Int
         get() = 0

bbootimg/src/main/kotlin/packable/DtboParser.kt

@@ -10,7 +10,7 @@ import java.io.File
 import java.io.FileInputStream
 import java.util.*
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class DtboParser(val workDir: File) : IPackable {
     override val loopNo: Int
         get() = 0

bbootimg/src/main/kotlin/packable/IPackable.kt

@@ -7,7 +7,7 @@ import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 interface IPackable {
     val loopNo: Int
     fun capabilities(): List<String> {

bbootimg/src/main/kotlin/packable/PackableLauncher.kt

@@ -11,7 +11,7 @@ import kotlin.system.exitProcess
 
 class PackableLauncher
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 fun main(args: Array<String>) {
     val log = LoggerFactory.getLogger(PackableLauncher::class.java)
     val packablePool = mutableMapOf<List<String>, KClass<IPackable>>()

bbootimg/src/main/kotlin/packable/VBMetaParser.kt

@@ -4,7 +4,7 @@ import cfig.Avb
 import cfig.UnifiedConfig
 import java.io.File
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class VBMetaParser: IPackable {
     override val loopNo: Int
         get() = 1

bbootimg/src/main/kotlin/sparse_util/SparseImgParser.kt

@@ -5,7 +5,7 @@ import cfig.packable.IPackable
 import org.slf4j.LoggerFactory
 import cfig.Helper.Companion.check_call
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class SparseImgParser : IPackable {
     override val loopNo: Int
         get() = 0

bbootimg/src/test/kotlin/AvbTest.kt

@@ -7,7 +7,7 @@ import org.junit.Assert.*
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class AvbTest {
     private val log = LoggerFactory.getLogger(AvbTest::class.java)
 

bbootimg/src/test/kotlin/HelperTest.kt

@@ -23,7 +23,7 @@ import java.security.spec.RSAPrivateKeySpec
 import java.security.PrivateKey
 
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class HelperTest {
     @Test
     fun rawSignTest() {

bbootimg/src/test/kotlin/KeyUtilTest.kt

@@ -7,7 +7,7 @@ import java.io.FileInputStream
 import java.nio.file.Files
 import java.nio.file.Paths
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class KeyUtilTest {
     @Test
     fun parseKeys() {

bbootimg/src/test/kotlin/avb/BlobTest.kt

@@ -6,7 +6,7 @@ import org.apache.commons.codec.binary.Hex
 import org.junit.Assert.assertEquals
 import org.junit.Test
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class BlobTest {
     @Test
     fun testEncodedKey2048() {

bbootimg/src/test/kotlin/avb/FooterTest.kt

@@ -7,7 +7,7 @@ import org.junit.Test
 import org.junit.Assert.*
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class FooterTest {
 
     @Test

bbootimg/src/test/kotlin/avb/HeaderTest.kt

@@ -5,7 +5,7 @@ import org.apache.commons.codec.binary.Hex
 import org.junit.Test
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class HeaderTest {
 
     @Test

bbootimg/src/test/kotlin/avb/alg/AlgorithmsTest.kt

@@ -5,7 +5,7 @@ import cfig.Helper
 import org.junit.Assert
 import org.junit.Test
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class AlgorithmsTest {
     @Test
     fun test1() {

bbootimg/src/test/kotlin/avb/desc/HashDescriptorTest.kt

@@ -6,7 +6,7 @@ import org.junit.Test
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class HashDescriptorTest {
     private val log = LoggerFactory.getLogger(HashDescriptorTest::class.java)
 

bbootimg/src/test/kotlin/avb/desc/HashTreeDescriptorTest.kt

@@ -7,7 +7,7 @@ import org.junit.Test
 import org.junit.Assert.*
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class HashTreeDescriptorTest {
 
     @Test

bbootimg/src/test/kotlin/avb/desc/KernelCmdlineDescriptorTest.kt

@@ -5,7 +5,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class KernelCmdlineDescriptorTest {
     @Test
     fun encode() {

bbootimg/src/test/kotlin/avb/desc/UnknownDescriptorTest.kt

@@ -6,7 +6,7 @@ import org.junit.Test
 import org.slf4j.LoggerFactory
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class UnknownDescriptorTest {
     private val log = LoggerFactory.getLogger(UnknownDescriptorTest::class.java)
 

bbootimg/src/test/kotlin/bootloader_message/BootloaderMsgTest.kt

@@ -6,7 +6,7 @@ import org.junit.Test
 import org.junit.Assert.*
 import org.slf4j.LoggerFactory
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class BootloaderMsgTest {
     private val log = LoggerFactory.getLogger(BootloaderMsgTest::class.java)
 

bbootimg/src/test/kotlin/cfig/io/Struct3Test.kt

@@ -5,7 +5,7 @@ import org.junit.Assert
 import org.junit.Test
 import java.io.ByteArrayInputStream
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class Struct3Test {
     private fun getConvertedFormats(inStruct: Struct3): ArrayList<Map<String, Int>> {
         val f = inStruct.javaClass.getDeclaredField("formats")

bbootimg/src/test/kotlin/init/RebootTest.kt

@@ -5,7 +5,7 @@ import cfig.init.Reboot
 import org.junit.Test
 import java.util.*
 
-@ExperimentalUnsignedTypes
+@OptIn(ExperimentalUnsignedTypes::class)
 class RebootTest {
     @Test
     fun testDifferentModes() {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists