Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency com.facebook:ktfmt to v0.49 #1398

Merged
merged 3 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ constructor(

private enum class LogsShareResult {
SHARE,
DISMISS
DISMISS,
}

@CircuitInject(DebugSettingsScreen::class, AppScope::class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,5 @@ private enum class ScaffoldLayoutContent {
MainContent,
Snackbar,
Fab,
BottomBar
BottomBar,
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ParameterizedOkioAtomicFileTests(
FINISH,
FAIL,
ABORT,
READ_FINISH
READ_FINISH,
}

private val existingFileNames: Array<String>? = parameters.existingFileNames
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ import com.squareup.moshi.JsonClass
internal enum class RedditKind(val derivedClass: Class<out RedditObject>) {
@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),
}