msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-17 08:37:03 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #191

Browse source 
191: Update Compose, Dagger and KSP r=msfjarvis a=msfjarvis

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
bors[bot] 2021-04-08 00:46:15 +00:00 • committed by GitHub
commit 1e09ce7a65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/build.gradle.kts
View file

@ -1,6 +1,6 @@
plugins {
kotlin("jvm")
id("com.google.devtools.ksp") version "1.4.31-1.0.0-alpha06"
id("com.google.devtools.ksp") version Dependencies.KSP_VERSION
`lobsters-plugin`
}

2
app/build.gradle.kts
View file

@ -3,7 +3,7 @@ plugins {
kotlin("android")
kotlin("kapt")
id("dagger.hilt.android.plugin")
id("org.jetbrains.compose") version "0.4.0-build179"
id("org.jetbrains.compose") version Dependencies.JB_COMPOSE_VERSION
id("shot")
`versioning-plugin`
`lobsters-plugin`

10
app/src/main/java/dev/msfjarvis/lobsters/ui/settings/Options.kt
View file

@ -1,7 +1,7 @@
package dev.msfjarvis.lobsters.ui.settings
import android.content.Context
import androidx.activity.compose.registerForActivityResult
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.Composable
import dev.msfjarvis.lobsters.data.backup.BackupHandler
@ -20,8 +20,8 @@ fun BackupOption(
coroutineScope: CoroutineScope,
) {
val result =
registerForActivityResult(ActivityResultContracts.CreateDocument()) { uri ->
if (uri == null) return@registerForActivityResult
rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument()) { uri ->
if (uri == null) return@rememberLauncherForActivityResult
context.contentResolver.openOutputStream(uri)?.let {
coroutineScope.launch(Dispatchers.IO) {
it.write(backupHandler.exportSavedPosts())
@ -43,8 +43,8 @@ fun RestoreOption(
coroutineScope: CoroutineScope,
) {
val result =
registerForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri == null) return@registerForActivityResult
rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
if (uri == null) return@rememberLauncherForActivityResult
context.contentResolver.openInputStream(uri)?.let {
coroutineScope.launch(Dispatchers.IO) {
backupHandler.importSavedPosts(it.readBytes())

14
buildSrc/src/main/java/Dependencies.kt
View file

@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-3.0-only
*/
private const val DAGGER_HILT_VERSION = "2.33-beta"
private const val DAGGER_HILT_VERSION = "2.34-beta"
object Plugins {
const val android = "com.android.tools.build:gradle:7.0.0-alpha13"
@ -16,7 +16,9 @@ object Plugins {
}
object Dependencies {
const val COMPOSE_VERSION = "1.0.0-beta03"
const val COMPOSE_VERSION = "1.0.0-beta04"
const val KSP_VERSION = "1.4.32-1.0.0-alpha07"
const val JB_COMPOSE_VERSION = "0.4.0-build179"
object Kotlin {
@ -38,13 +40,13 @@ object Dependencies {
object Compose {
const val activity = "androidx.activity:activity-compose:1.3.0-alpha05"
const val activity = "androidx.activity:activity-compose:1.3.0-alpha06"
const val compiler = "androidx.compose.compiler:compiler:$COMPOSE_VERSION"
const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION"
const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION"
const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha03"
const val lifecycleViewModel = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha04"
const val material = "androidx.compose.material:material:$COMPOSE_VERSION"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha09"
const val navigation = "androidx.navigation:navigation-compose:1.0.0-alpha10"
const val paging = "androidx.paging:paging-compose:1.0.0-alpha08"
const val runtime = "androidx.compose.runtime:runtime:$COMPOSE_VERSION"
const val ui = "androidx.compose.ui:ui:$COMPOSE_VERSION"
@ -67,7 +69,7 @@ object Dependencies {
object ThirdParty {
private const val accompanistVersion = "0.7.0"
private const val accompanistVersion = "0.7.1"
const val accompanistCoil = "com.google.accompanist:accompanist-coil:$accompanistVersion"
const val accompanistFlow = "com.google.accompanist:accompanist-flowlayout:$accompanistVersion"
const val kamel = "com.alialbaali.kamel:kamel-image:0.2.0"

2
common/build.gradle.kts
View file

@ -1,7 +1,7 @@
plugins {
kotlin("multiplatform")
id("com.android.library")
id("org.jetbrains.compose") version "0.4.0-build179"
id("org.jetbrains.compose") version Dependencies.JB_COMPOSE_VERSION
`lobsters-plugin`
}

2
desktop/build.gradle.kts
View file

@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
plugins {
kotlin("jvm")
id("org.jetbrains.compose") version "0.4.0-build179"
id("org.jetbrains.compose") version Dependencies.JB_COMPOSE_VERSION
`lobsters-plugin`
}