Update dependency com.github.alorma:compose-settings-storage-base to v2

.github/workflows/sarif-filter.main.kts

@@ -9,14 +9,14 @@ import com.github.ajalt.clikt.parameters.options.required
 import com.github.ajalt.clikt.parameters.types.path
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
-import okio.buffer
-import okio.sink
-import okio.source
 import kotlin.io.path.createFile
 import kotlin.io.path.createParentDirectories
 import kotlin.io.path.deleteIfExists
 import kotlin.io.path.exists
 import kotlin.io.path.readLines
+import okio.buffer
+import okio.sink
+import okio.source
 
 @Suppress("UNCHECKED_CAST")
 class SarifCleaner :

app-scaffold/src/debug/kotlin/catchup/app/ui/debug/DebugSettingsScreen.kt

@@ -77,8 +77,6 @@ import catchup.di.AppScope
 import catchup.di.DataMode
 import catchup.util.truncateAt
 import com.alorma.compose.settings.storage.base.SettingValueState
-import com.alorma.compose.settings.storage.base.getValue
-import com.alorma.compose.settings.storage.base.setValue
 import com.jakewharton.processphoenix.ProcessPhoenix
 import com.slack.circuit.codegen.annotations.CircuitInject
 import com.slack.circuit.overlay.LocalOverlayHost

app-scaffold/src/main/kotlin/catchup/app/ui/activity/SettingsScreen.kt

@@ -56,8 +56,6 @@ import catchup.util.clearCache
 import catchup.util.clearFiles
 import catchup.util.injection.qualifiers.ApplicationContext
 import com.alorma.compose.settings.storage.base.SettingValueState
-import com.alorma.compose.settings.storage.base.getValue
-import com.alorma.compose.settings.storage.base.setValue
 import com.google.android.material.snackbar.Snackbar
 import com.jakewharton.byteunits.BinaryByteUnit
 import com.slack.circuit.codegen.annotations.CircuitInject

app/build.gradle.kts

@@ -18,21 +18,21 @@ import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapter
-import okio.buffer
-import okio.sink
-import okio.source
 import java.io.ByteArrayOutputStream
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
+import okio.buffer
+import okio.sink
+import okio.source
 
 plugins {
   alias(libs.plugins.android.application)
   alias(libs.plugins.kotlin.android)
   alias(libs.plugins.sgp.base)
   alias(libs.plugins.licensee)
   alias(libs.plugins.bugsnag)
-//  alias(libs.plugins.baselineprofile) apply false
+  //  alias(libs.plugins.baselineprofile) apply false
   //  alias(libs.plugins.playPublisher)
 }
 
@@ -73,7 +73,8 @@ android {
       versionNameSuffix = "-dev"
     }
     getByName("release") {
-      manifestPlaceholders["BUGSNAG_API_KEY"] = providers.gradleProperty("catchup_bugsnag_key").getOrElse("")
+      manifestPlaceholders["BUGSNAG_API_KEY"] =
+        providers.gradleProperty("catchup_bugsnag_key").getOrElse("")
       signingConfig = signingConfigs.getByName(if (useDebugSigning) "debug" else "release")
       proguardFiles += file("proguard-rules.pro")
       isMinifyEnabled = true
@@ -116,7 +117,7 @@ abstract class CutChangelogTask : DefaultTask() {
         if (it.length > 500) {
           logger.log(
             LogLevel.WARN,
-            "Changelog length (${it.length}) exceeds 500 char max. Truncating..."
+            "Changelog length (${it.length}) exceeds 500 char max. Truncating...",
           )
           val warning = "\n(Truncated due to store restrictions. Full changelog in app!)"
           val warningLength = warning.length
@@ -213,14 +214,11 @@ fun getChangelog(): String {
 
 abstract class UpdateVersion
 @Inject
-constructor(
-  providers: ProviderFactory,
-  private val execOps: ExecOperations,
-) : DefaultTask() {
+constructor(providers: ProviderFactory, private val execOps: ExecOperations) : DefaultTask() {
 
   @get:Option(
     option = "updateType",
-    description = "Configures the version update type. Can be (major|minor|patch)."
+    description = "Configures the version update type. Can be (major|minor|patch).",
   )
   @get:Input
   abstract val type: Property<String>
@@ -269,7 +267,7 @@ constructor(
           "-a",
           latestVersionString,
           "-m",
-          "\"Version $latestVersionString.\""
+          "\"Version $latestVersionString.\"",
         )
         standardOutput = os
         errorOutput = os
@@ -406,14 +404,12 @@ androidComponents {
   }
 }
 
-//baselineProfile {
+// baselineProfile {
 //  // TODO enable this only when cutting a new release?
 ////  automaticGenerationDuringBuild = true
 //  saveInSrc = true
 //  dexLayoutOptimization = true
 //  from(projects.benchmark.dependencyProject)
-//}
+// }
 
-dependencies {
-  implementation(projects.appScaffold)
-}
+dependencies { implementation(projects.appScaffold) }

build.gradle.kts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import com.autonomousapps.DependencyAnalysisExtension
 
 plugins {
   alias(libs.plugins.kotlin.jvm) apply false
@@ -48,7 +47,8 @@ buildscript {
   }
 }
 
-val useProjectIsolation = System.getProperty("org.gradle.unsafe.isolated-projects", "false").toBoolean()
+val useProjectIsolation =
+  System.getProperty("org.gradle.unsafe.isolated-projects", "false").toBoolean()
 
 if (!useProjectIsolation) {
   apply(plugin = libs.plugins.doctor.get().pluginId)
@@ -62,11 +62,7 @@ skippy {
   global {
     applyDefaults()
     // Glob patterns of files to include in computing
-    includePatterns.addAll(
-      "**/schemas/**",
-      "app/proguard-rules.pro",
-      "**/src/**/graphql/**",
-    )
+    includePatterns.addAll("**/schemas/**", "app/proguard-rules.pro", "**/src/**/graphql/**")
     // Glob patterns of files that, if changed, should result in not skipping anything in the build
     neverSkipPatterns.addAll(
       ".github/workflows/**",
@@ -79,14 +75,14 @@ skippy {
 
 if (!useProjectIsolation) {
   // https://github.com/autonomousapps/dependency-analysis-gradle-plugin/issues/1111
-//  apply(plugin = libs.plugins.dependencyAnalysis.get().pluginId)
-//  configure<DependencyAnalysisExtension> {
-//    structure {
-//      bundle("compose-ui") {
-//        primary("androidx.compose.ui:ui")
-//        includeGroup("androidx.compose.ui")
-//        // TODO exclude ui-tooling
-//      }
-//    }
-//  }
+  //  apply(plugin = libs.plugins.dependencyAnalysis.get().pluginId)
+  //  configure<DependencyAnalysisExtension> {
+  //    structure {
+  //      bundle("compose-ui") {
+  //        primary("androidx.compose.ui:ui")
+  //        includeGroup("androidx.compose.ui")
+  //        // TODO exclude ui-tooling
+  //      }
+  //    }
+  //  }
 }

gradle/libs.versions.toml

@@ -247,7 +247,7 @@ misc-debug-processPhoenix = "com.jakewharton:process-phoenix:2.2.0"
 misc-debug-telescope = "com.mattprecious.telescope:telescope:2.3.0"
 
 misc-composeSettings = "com.github.alorma:compose-settings-ui-m3:1.0.3"
-misc-composeSettings-base = "com.github.alorma:compose-settings-storage-base:1.3.0"
+misc-composeSettings-base = "com.github.alorma:compose-settings-storage-base:2.0.0"
 misc-composeSettings-datastore = "com.github.alorma:compose-settings-storage-datastore:0.27.0"
 misc-javaxInject = "org.glassfish:javax.annotation:10.0-b28"
 misc-jsoup = "org.jsoup:jsoup:1.17.2"