Merge pull request zacharee#5 from zacharee/master

Fork Sync: Update from parent repository
errr-maxx-builds · Jun 28, 2024 · de8a336 · de8a336
2 parents 0a77349 + 85a202b
commit de8a336
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 263 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,8 +1,7 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.pm20.util.archivesName
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.bugsnag)
 }
 
@@ -17,11 +16,11 @@ android {
         versionCode = 13
         versionName = "1.3.2"
 
+        setProperty("archivesBaseName", "WiFiList_$versionName")
+
         vectorDrawables {
             useSupportLibrary = true
         }
-
-        archivesName = "WiFiList_${versionName}"
     }
 
     compileOptions {

diff --git a/app/src/main/java/tk/zwander/wifilist/MainActivity.kt b/app/src/main/java/tk/zwander/wifilist/MainActivity.kt
@@ -234,12 +234,10 @@ class MainActivity : AppCompatActivity(),
         }
 
         @Suppress("UNCHECKED_CAST")
-        val privilegedConfigsList = if (privilegedConfigs != null) {
-            privilegedConfigs::class.java.getMethod("getList")
-                .invoke(privilegedConfigs) as List<WifiConfiguration>
-        } else {
-            listOf()
-        }
+        val privilegedConfigsList = privilegedConfigs?.let {
+            it::class.java.getMethod("getList")
+                .invoke(it) as List<WifiConfiguration>
+        } ?: listOf()
 
         val items = privilegedConfigsList
             .sortedBy { it.SSID.lowercase() }

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.bugsnag) apply false
     alias(libs.plugins.kotlin) apply false
+    alias(libs.plugins.kotlin.compose) apply false
 }
 
 tasks.register<Delete>("clean") {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,20 +2,20 @@
 activityCompose = "1.9.0"
 androidGradlePlugin = "8.3.2"
 shizuku = "13.1.5"
-bugsnagAndroid = "6.4.0"
+bugsnagAndroid = "6.6.0"
 bugsnagGradlePlugin = "8.1.0"
-compose = "1.7.0-alpha07"
-composeCompiler = "1.5.12"
-compose-material3 = "1.3.0-alpha05"
-coreKtx = "1.13.0"
-datastorePreferences = "1.1.0"
+compose = "1.7.0-beta04"
+composeCompiler = "1.5.14"
+compose-material3 = "1.3.0-beta04"
+coreKtx = "1.13.1"
+datastorePreferences = "1.1.1"
 fastcsv = "3.1.0"
-fragmentKtx = "1.8.0-alpha02"
-gson = "2.10.1"
+fragmentKtx = "1.8.1"
+gson = "2.11.0"
 hiddenapibypass = "4.3"
-kotlin = "1.9.23"
-lifecycleRuntimeKtx = "2.8.0-beta01"
-material = "1.13.0-alpha01"
+kotlin = "2.0.0"
+lifecycleRuntimeKtx = "2.8.2"
+material = "1.13.0-alpha03"
 patreonsupportersretrieval = "8436bbdbdc"
 relinker = "1.4.5"
 
@@ -42,3 +42,4 @@ shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizu
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 bugsnag = { id = "com.bugsnag.android.gradle", version.ref = "bugsnagGradlePlugin" }
 kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }