[pull] main from gkd-kit:main

.github/workflows/Build-Apk.yml

@@ -8,7 +8,7 @@ on:
       - '**'
     paths-ignore:
       - 'LICENSE'
-      - 'README.md'
+      - '*.md'
       - '.github/**'
 
 jobs:

app/src/main/kotlin/li/songe/gkd/util/NetworkExt.kt

@@ -4,11 +4,11 @@ import java.net.NetworkInterface
 
 fun getIpAddressInLocalNetwork(): List<String> {
     val networkInterfaces = try {
-        // android.system.ErrnoException: getifaddrs failed: EACCES (Permission denied)
-        NetworkInterface.getNetworkInterfaces().iterator().asSequence()
+        NetworkInterface.getNetworkInterfaces().asSequence()
     } catch (e: Exception) {
+        // android.system.ErrnoException: getifaddrs failed: EACCES (Permission denied)
         toast("获取host失败:" + e.message)
-        emptySequence()
+        return emptyList()
     }
     val localAddresses = networkInterfaces.flatMap {
         it.inetAddresses.asSequence().filter { inetAddress ->
@@ -17,4 +17,4 @@ fun getIpAddressInLocalNetwork(): List<String> {
         }.map { inetAddress -> inetAddress.hostAddress }
     }
     return localAddresses.toList()
-}
+}

selector/build.gradle.kts

@@ -1,12 +1,14 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.kotlin.serialization)
 }
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = JavaVersion.VERSION_17.majorVersion
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
 //    https://kotlinlang.org/docs/js-to-kotlin-interop.html#kotlin-types-in-javascript
@@ -20,12 +22,16 @@ kotlin {
         all {
             languageSettings.optIn("kotlin.js.ExperimentalJsExport")
         }
-    }
-    sourceSets["commonMain"].dependencies {
-        implementation(libs.kotlin.stdlib.common)
-    }
-    sourceSets["jvmTest"].dependencies {
-        implementation(libs.kotlinx.serialization.json)
-        implementation(libs.junit)
+        commonMain {
+            dependencies {
+                implementation(libs.kotlin.stdlib.common)
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation(libs.kotlinx.serialization.json)
+                implementation(libs.junit)
+            }
+        }
     }
 }

wasm_matches/build.gradle.kts

@@ -1,11 +1,13 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
 }
 
 kotlin {
     jvm {
-        compilations.all {
-            kotlinOptions.jvmTarget = JavaVersion.VERSION_17.majorVersion
+        compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_17)
         }
     }
     wasmJs {
@@ -18,8 +20,10 @@ kotlin {
         all {
             languageSettings.optIn("kotlin.js.ExperimentalJsExport")
         }
-    }
-    sourceSets["commonMain"].dependencies {
-        implementation(libs.kotlin.stdlib.common)
+        commonMain {
+            dependencies {
+                implementation(libs.kotlin.stdlib.common)
+            }
+        }
     }
 }