diff --git a/app-scaffold/src/debug/kotlin/catchup/app/ui/debug/DebugSettingsScreen.kt b/app-scaffold/src/debug/kotlin/catchup/app/ui/debug/DebugSettingsScreen.kt index 2519e1978..28c69c478 100644 --- a/app-scaffold/src/debug/kotlin/catchup/app/ui/debug/DebugSettingsScreen.kt +++ b/app-scaffold/src/debug/kotlin/catchup/app/ui/debug/DebugSettingsScreen.kt @@ -331,7 +331,7 @@ constructor( private enum class LogsShareResult { SHARE, - DISMISS + DISMISS, } @CircuitInject(DebugSettingsScreen::class, AppScope::class) diff --git a/app-scaffold/src/main/kotlin/catchup/app/service/ServiceScreen.kt b/app-scaffold/src/main/kotlin/catchup/app/service/ServiceScreen.kt index 10466fde9..278b38250 100644 --- a/app-scaffold/src/main/kotlin/catchup/app/service/ServiceScreen.kt +++ b/app-scaffold/src/main/kotlin/catchup/app/service/ServiceScreen.kt @@ -121,7 +121,7 @@ data class ServiceScreen(val serviceKey: String) : Screen { data class ItemActionClicked(val item: CatchUpItem, val action: Action) : Event { enum class Action { SHARE, - SUMMARIZE + SUMMARIZE, } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 63febd64f..d4b9f90e2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ kotlin = "1.9.23" kotlinx-metadata = "0.7.0" kotlinx-serialization = "1.6.3" ksp = "1.9.23-1.0.20" -ktfmt = "0.47" +ktfmt = "0.49" leakcanary = "2.14" lifecycle = "2.8.0-beta01" markwon = "4.6.2" diff --git a/libraries/auth/src/commonMain/kotlin/catchup/auth/TokenStorage.kt b/libraries/auth/src/commonMain/kotlin/catchup/auth/TokenStorage.kt index 29f261b11..dab7172df 100644 --- a/libraries/auth/src/commonMain/kotlin/catchup/auth/TokenStorage.kt +++ b/libraries/auth/src/commonMain/kotlin/catchup/auth/TokenStorage.kt @@ -17,6 +17,7 @@ import okio.Path interface TokenStorage { /** Updates the current stored auth data. */ suspend fun updateAuthData(authData: AuthData) + /** Returns the current auth data or null if none are stored. */ suspend fun getAuthData(): AuthData? diff --git a/libraries/base-ui/src/main/kotlin/catchup/base/ui/BackPressNavButton.kt b/libraries/base-ui/src/main/kotlin/catchup/base/ui/BackPressNavButton.kt index 2d908dc09..03abd3ee9 100644 --- a/libraries/base-ui/src/main/kotlin/catchup/base/ui/BackPressNavButton.kt +++ b/libraries/base-ui/src/main/kotlin/catchup/base/ui/BackPressNavButton.kt @@ -19,7 +19,7 @@ import catchup.ui.core.R enum class NavButtonType(val icon: ImageVector, @StringRes val contentDescription: Int) { BACK(Icons.AutoMirrored.Filled.ArrowBack, R.string.catchup_baseui_back), - CLOSE(Icons.Filled.Close, R.string.catchup_baseui_close) + CLOSE(Icons.Filled.Close, R.string.catchup_baseui_close), } @Composable diff --git a/libraries/base-ui/src/main/kotlin/catchup/base/ui/NestedScaffold.kt b/libraries/base-ui/src/main/kotlin/catchup/base/ui/NestedScaffold.kt index b8dba1f16..9ab641911 100644 --- a/libraries/base-ui/src/main/kotlin/catchup/base/ui/NestedScaffold.kt +++ b/libraries/base-ui/src/main/kotlin/catchup/base/ui/NestedScaffold.kt @@ -230,5 +230,5 @@ private enum class ScaffoldLayoutContent { MainContent, Snackbar, Fab, - BottomBar + BottomBar, } diff --git a/libraries/util/src/test/kotlin/catchup/util/io/ParameterizedOkioAtomicFileTests.kt b/libraries/util/src/test/kotlin/catchup/util/io/ParameterizedOkioAtomicFileTests.kt index f7066e9b2..61f58ee96 100644 --- a/libraries/util/src/test/kotlin/catchup/util/io/ParameterizedOkioAtomicFileTests.kt +++ b/libraries/util/src/test/kotlin/catchup/util/io/ParameterizedOkioAtomicFileTests.kt @@ -42,7 +42,7 @@ class ParameterizedOkioAtomicFileTests( FINISH, FAIL, ABORT, - READ_FINISH + READ_FINISH, } private val existingFileNames: Array? = parameters.existingFileNames @@ -199,6 +199,7 @@ class ParameterizedOkioAtomicFileTests( ) } } + // JUnit on API 17 somehow turns null parameters into the string "null". Wrapping the parameters // inside a class solves this problem. class Parameters diff --git a/services/reddit/src/main/kotlin/catchup/service/reddit/model/RedditKind.kt b/services/reddit/src/main/kotlin/catchup/service/reddit/model/RedditKind.kt index a17329615..3a2b00242 100644 --- a/services/reddit/src/main/kotlin/catchup/service/reddit/model/RedditKind.kt +++ b/services/reddit/src/main/kotlin/catchup/service/reddit/model/RedditKind.kt @@ -24,5 +24,5 @@ import com.squareup.moshi.JsonClass internal enum class RedditKind(val derivedClass: Class) { @Json(name = "t1") T1(RedditComment::class.java), @Json(name = "t3") T3(RedditLink::class.java), - @Json(name = "Listing") LISTING(RedditListing::class.java) + @Json(name = "Listing") LISTING(RedditListing::class.java), }