Skip to content

Update dependencies #13

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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 @@ -28,19 +28,18 @@ import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.ModalBottomSheetLayout
import androidx.compose.material.ModalBottomSheetValue
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.rounded.KeyboardArrowRight
import androidx.compose.material.icons.outlined.Description
import androidx.compose.material.icons.outlined.PushPin
import androidx.compose.material.icons.outlined.Refresh
import androidx.compose.material.icons.outlined.Tune
import androidx.compose.material.icons.rounded.Done
import androidx.compose.material.icons.rounded.KeyboardArrowRight
import androidx.compose.material.icons.rounded.Menu
import androidx.compose.material.icons.rounded.Share
import androidx.compose.material.rememberModalBottomSheetState
import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.DrawerState
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FloatingActionButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -74,7 +73,7 @@ import com.google.android.glance.appwidget.host.requestPin
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch

@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@OptIn(ExperimentalMaterialApi::class)
@Composable
internal fun ViewerScreen(
providers: List<AppWidgetProviderInfo>,
Expand Down Expand Up @@ -130,6 +129,7 @@ internal fun ViewerScreen(
currentSize = currentSize,
onSizeChange = onResize
)

ViewerPanel.Info -> ViewerInfoPanel(selectedProvider)
}
}
Expand Down Expand Up @@ -230,7 +230,6 @@ private suspend fun doExport(
}
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun ViewerBottomBar(
drawerState: DrawerState,
Expand Down Expand Up @@ -318,7 +317,6 @@ private fun ViewerBottomBar(
}

@Composable
@OptIn(ExperimentalMaterial3Api::class)
private fun ViewerDrawer(
providers: List<AppWidgetProviderInfo>,
selectedProvider: AppWidgetProviderInfo,
Expand All @@ -339,7 +337,7 @@ private fun ViewerDrawer(
imageVector = if (selectedProvider == item) {
Icons.Rounded.Done
} else {
Icons.Rounded.KeyboardArrowRight
Icons.AutoMirrored.Rounded.KeyboardArrowRight
},
contentDescription = null
)
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[versions]
composeCompiler = "1.5.3"
composeCompiler = "1.5.14"
composesnapshot = "-" # a single character = no snapshot
androidx-compose-bom = "2023.10.00"
androidx-compose-bom = "2024.05.00"

glance = "1.1.0-SNAPSHOT"
glancesnapshot = "11101881" # a single character = no snapshot

# gradlePlugin and lint need to be updated together
gradlePlugin = "8.1.3"
lintMinCompose = "31.1.2"
gradlePlugin = "8.4.1"
lintMinCompose = "31.4.1"

ktlint = "0.42.1"
kotlin = "1.9.10"
coroutines = "1.7.1"
kotlin = "1.9.24"
coroutines = "1.8.1"

androidxtest-core = "1.5.0"
androidxtest-rules = "1.5.0"
Expand Down Expand Up @@ -41,7 +41,7 @@ compose-material-material3 = { module = "androidx.compose.material3:material3" }

glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glance" }

google-material = "com.google.android.material:material:1.10.0"
google-material = "com.google.android.material:material:1.12.0"

android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "gradlePlugin" }
gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.25.3"
Expand All @@ -58,15 +58,15 @@ kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-te

dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.10"

androidx-core = "androidx.core:core-ktx:1.12.0"
androidx-core = "androidx.core:core-ktx:1.13.1"
androidx-core-remoteviews = "androidx.core:core-remoteviews:1.0.0"
androidx-activity-compose = "androidx.activity:activity-compose:1.8.0"
androidx-activity-compose = "androidx.activity:activity-compose:1.9.0"

androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "androidxtest-core" }
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxtest-runner" }
androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxtest-rules" }
androidx-test-orchestrator = { module = "androidx.test:orchestrator", version.ref = "androidxtest-orchestrator" }
androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.2.0"
androidx-test-uiAutomator = "androidx.test.uiautomator:uiautomator:2.3.0"

# alpha for robolectric x compose fix
androidx-test-espressoCore = "androidx.test.espresso:espresso-core:3.5.1"
Expand All @@ -86,4 +86,4 @@ android-tools-lint-lint = { module = "com.android.tools.lint:lint", version.ref
android-tools-lint-api = { module = "com.android.tools.lint:lint-api", version.ref = "lintMinCompose" }
android-tools-lint-tests = { module = "com.android.tools.lint:lint-tests", version.ref = "lintMinCompose" }
[plugins]
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi"}
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi"}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Thu Aug 25 11:00:02 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading