diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bfcfb0c..e3f28ca 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -6,11 +6,13 @@ plugins { alias(libs.plugins.hilt.android) alias(libs.plugins.kotlinxSerialization) alias(libs.plugins.ksp) + alias(libs.plugins.compose.compiler) } android { namespace = Constants.APP_ID compileSdk = Constants.TARGET_SDK + compileSdkPreview = "VanillaIceCream" androidResources { generateLocaleConfig = true @@ -124,7 +126,6 @@ android { compose = true buildConfig = true } - composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cf86fcb..ce88198 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -80,7 +80,6 @@ diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt index fa187c6..34be774 100644 --- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsScreen.kt @@ -102,7 +102,6 @@ fun SettingsScreen( val scope = rememberCoroutineScope() val scrollState = rememberScrollState() val interactionSource = remember { MutableInteractionSource() } - //val pinExists = remember { mutableStateOf(PinManager.pinExists()) } val uiState by viewModel.uiState.collectAsStateWithLifecycle() val kernelSupport by viewModel.kernelSupport.collectAsStateWithLifecycle() diff --git a/build.gradle.kts b/build.gradle.kts index 2f45261..03272a6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,4 +5,5 @@ plugins { alias(libs.plugins.kotlinxSerialization) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.androidLibrary) apply false + alias(libs.plugins.compose.compiler) apply false } diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index 55f9662..9614602 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -6,8 +6,6 @@ object Constants { const val MIN_SDK = 26 const val APP_ID = "com.zaneschepke.wireguardautotunnel" const val APP_NAME = "wgtunnel" - const val COMPOSE_COMPILER_EXTENSION_VERSION = "1.5.14" - const val STORE_PASS_VAR = "SIGNING_STORE_PASSWORD" const val KEY_ALIAS_VAR = "SIGNING_KEY_ALIAS" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 68de9e1..1501659 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,20 +1,20 @@ [versions] accompanist = "0.34.0" -activityCompose = "1.9.0" +activityCompose = "1.9.1" amneziawgAndroid = "1.2.0" -androidx-junit = "1.1.5" +androidx-junit = "1.2.1" appcompat = "1.7.0" -biometricKtx = "1.2.0-alpha05" +biometricKtx = "1.4.0-alpha01" coreGoogleShortcuts = "1.1.0" coreKtx = "1.13.1" datastorePreferences = "1.1.1" desugar_jdk_libs = "2.0.4" -espressoCore = "3.5.1" +espressoCore = "3.6.1" hiltAndroid = "2.51.1" hiltNavigationCompose = "1.2.0" junit = "4.13.2" -kotlinx-serialization-json = "1.6.3" -lifecycle-runtime-compose = "2.7.0" +kotlinx-serialization-json = "1.7.1" +lifecycle-runtime-compose = "2.8.4" material3 = "1.2.1" multifabVersion = "1.1.0" navigationCompose = "2.7.7" @@ -22,16 +22,15 @@ pinLockCompose = "1.0.3" roomVersion = "2.6.1" timber = "5.0.1" tunnel = "1.0.20230706" -androidGradlePlugin = "8.5.0" -kotlin = "1.9.24" -ksp = "1.9.24-1.0.20" +androidGradlePlugin = "8.5.1" +kotlin = "2.0.0" +ksp = "2.0.0-1.0.23" composeBom = "2024.06.00" compose = "1.6.8" zxingAndroidEmbedded = "4.3.0" coreSplashscreen = "1.0.1" #plugins -gradlePlugins-kotlinxSerialization = "1.9.24" material = "1.12.0" @@ -98,5 +97,6 @@ android-application = { id = "com.android.application", version.ref = "androidGr kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } -kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "gradlePlugins-kotlinxSerialization" } -androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" } \ No newline at end of file +kotlinxSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +androidLibrary = { id = "com.android.library", version.ref = "androidGradlePlugin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } \ No newline at end of file