From ce5e7e73ef366f44d647be23cd650b1af3dc1826 Mon Sep 17 00:00:00 2001
From: czp3009 <czp3009@gmail.com>
Date: Thu, 9 Apr 2020 16:07:40 +0800
Subject: [PATCH] optimize build

---
 build.gradle                                              | 6 +++++-
 .../kotlin/com/hiczp/bilibili/api/CollectionExtension.kt  | 2 +-
 src/main/kotlin/com/hiczp/bilibili/api/IOExtension.kt     | 8 ++++----
 .../com/hiczp/bilibili/api/live/websocket/LiveClient.kt   | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1dbf3bd..fe7b56e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ dependencies {
 compileKotlin {
     kotlinOptions {
         jvmTarget = jvm_target
-        freeCompilerArgs = ["-Xjvm-default=enable", "-Xuse-experimental=kotlin.Experimental", "-XXLanguage:+InlineClasses"]
+        freeCompilerArgs = ["-Xjvm-default=enable", "-Xopt-in=kotlin.RequiresOptIn", "-XXLanguage:+InlineClasses"]
     }
 }
 compileTestKotlin {
@@ -149,3 +149,7 @@ publishing {
 signing {
     sign publishing.publications.mavenJava
 }
+
+gradle.taskGraph.whenReady { taskGraph ->
+    tasks.signMavenJavaPublication.onlyIf { taskGraph.hasTask tasks.publish }
+}
diff --git a/src/main/kotlin/com/hiczp/bilibili/api/CollectionExtension.kt b/src/main/kotlin/com/hiczp/bilibili/api/CollectionExtension.kt
index 171781d..1785422 100644
--- a/src/main/kotlin/com/hiczp/bilibili/api/CollectionExtension.kt
+++ b/src/main/kotlin/com/hiczp/bilibili/api/CollectionExtension.kt
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api
 
 import kotlin.experimental.ExperimentalTypeInference
 
-@UseExperimental(ExperimentalTypeInference::class)
+@OptIn(ExperimentalTypeInference::class)
 internal inline fun <T> list(@BuilderInference block: MutableList<T>.() -> Unit): List<T> {
     val list = ArrayList<T>()
     block(list)
diff --git a/src/main/kotlin/com/hiczp/bilibili/api/IOExtension.kt b/src/main/kotlin/com/hiczp/bilibili/api/IOExtension.kt
index e2d1438..209c413 100644
--- a/src/main/kotlin/com/hiczp/bilibili/api/IOExtension.kt
+++ b/src/main/kotlin/com/hiczp/bilibili/api/IOExtension.kt
@@ -32,7 +32,7 @@ fun InputStream.readFully(length: Int): ByteArray {
 /**
  * 以大端模式从流中读取一个 int
  */
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 fun InputStream.readInt(): Int {
     val byteArray = readFully(4)
     return (byteArray[0].toUByte().toInt() shl 24) or
@@ -44,13 +44,13 @@ fun InputStream.readInt(): Int {
 /**
  * 以大端模式从流中读取一个 unsigned int
  */
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 fun InputStream.readUInt() = readInt().toUInt()
 
 fun InputStream.bounded(size: Long) = BoundedInputStream(this, size)
 
-@UseExperimental(ExperimentalUnsignedTypes::class)
+@OptIn(ExperimentalUnsignedTypes::class)
 fun InputStream.bounded(size: UInt) = bounded(size.toLong())
 
-@UseExperimental(InternalAPI::class)
+@OptIn(InternalAPI::class)
 internal fun ByteArray.toPrettyPrintString() = joinToString(prefix = "[", postfix = "]") { "0x%02x".format(it) }
diff --git a/src/main/kotlin/com/hiczp/bilibili/api/live/websocket/LiveClient.kt b/src/main/kotlin/com/hiczp/bilibili/api/live/websocket/LiveClient.kt
index 7405a8b..0a3165e 100644
--- a/src/main/kotlin/com/hiczp/bilibili/api/live/websocket/LiveClient.kt
+++ b/src/main/kotlin/com/hiczp/bilibili/api/live/websocket/LiveClient.kt
@@ -49,7 +49,7 @@ class LiveClient(
     /**
      * 开启连接
      */
-    @UseExperimental(KtorExperimentalAPI::class, ObsoleteCoroutinesApi::class, InternalAPI::class)
+    @OptIn(KtorExperimentalAPI::class, ObsoleteCoroutinesApi::class, InternalAPI::class)
     fun launch() = GlobalScope.launch(CoroutineExceptionHandler { _, throwable ->
         callback.onError?.invoke(this, throwable) ?: logger.error(throwable)
     }) {