update to kotlin 2.1

gradle.properties

@@ -11,9 +11,11 @@ kotlin.native.cacheKind=none
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
-kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 org.jetbrains.compose.experimental.macos.enabled=true
 
+dev.dimension.flare.linux=false
+kotlin.native.toolchain.enabled=false
+
 systemProp.javax.xml.parsers.SAXParserFactory=com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl
 systemProp.javax.xml.transform.TransformerFactory=com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl
-systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
+systemProp.javax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl

gradle/libs.versions.toml

@@ -4,15 +4,15 @@ lifecycleViewmodelCompose = "2.8.4"
 minSdk = "24"
 java = "21"
 agp = "8.7.2"
-kotlin = "2.0.21"
+kotlin = "2.1.0"
 core-ktx = "1.15.0"
 junit = "4.13.2"
 androidx-test-ext-junit = "1.2.1"
 espresso-core = "3.6.1"
 lifecycle-runtime-ktx = "2.8.7"
 activity-compose = "1.9.3"
 compose-bom = "2024.11.00"
-ksp = "2.0.21-1.0.28"
+ksp = "2.1.0-1.0.29"
 paging = "3.3.4"
 navigation = "2.8.4"
 kotlinx-datetime = "0.6.1"
@@ -32,7 +32,7 @@ ktlintPlugin = "12.1.2"
 apng-android = "3.0.2"
 ktlint = "1.3.1"
 okio = "3.9.1"
-skie = "0.9.3"
+skie = "0.9.5"
 ksoup = "0.2.0"
 versionUpdate = "0.51.0"
 bluesky = "0.3.0-SNAPSHOT"

settings.gradle.kts

@@ -20,7 +20,10 @@ dependencyResolutionManagement {
 
 rootProject.name = "Flare"
 include(":app")
-include(":linuxApp")
+val enableLinux = providers.gradleProperty("dev.dimension.flare.linux").orNull == "true"
+if (enableLinux) {
+    include(":linuxApp")
+}
 include(":shared")
 include(":shared:ui")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

shared/build.gradle.kts

@@ -12,6 +12,7 @@ plugins {
     alias(libs.plugins.room)
 }
 
+val enableLinux = providers.gradleProperty("dev.dimension.flare.linux").orNull == "true"
 kotlin {
     applyDefaultHierarchyTemplate()
 
@@ -26,11 +27,12 @@ kotlin {
     ).forEach { appleTarget ->
         appleTarget.binaries.framework {
             baseName = "shared"
-            isStatic = true
-            embedBitcode(org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE)
+//            isStatic = true
         }
     }
-    linuxX64()
+    if (enableLinux) {
+        linuxX64()
+    }
     targets.forEach { target ->
         target.name.takeIf {
             it != "metadata"
@@ -93,9 +95,11 @@ kotlin {
                 implementation(libs.stately.iso.collections)
             }
         }
-        val linuxMain by getting {
-            dependencies {
-                implementation(libs.ktor.client.curl)
+        if (enableLinux) {
+            val linuxMain by getting {
+                dependencies {
+                    implementation(libs.ktor.client.curl)
+                }
             }
         }
     }
@@ -146,4 +150,4 @@ afterEvaluate {
     val runKtlintCheckOverCommonMainSourceSet by tasks
     runKtlintFormatOverCommonMainSourceSet.dependsOn("kspCommonMainKotlinMetadata")
     runKtlintCheckOverCommonMainSourceSet.dependsOn("kspCommonMainKotlinMetadata")
-}
+}

shared/ui/build.gradle.kts

@@ -23,8 +23,7 @@ kotlin {
     ).forEach { appleTarget ->
         appleTarget.binaries.framework {
             baseName = "sharedUI"
-            isStatic = true
-            embedBitcode(org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode.DISABLE)
+//            isStatic = true
         }
     }