dependency updates

raamcosta · raamcosta · commit 7b51caafa0d4 · 2023-06-01T00:06:05.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,13 +13,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Setup JDK 18
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 18
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Build
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: wrapper
           arguments: build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,10 +20,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Setup JDK 18
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 18
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Cache
         uses: actions/cache@v3
@@ -36,7 +37,7 @@ jobs:
       - name: Build
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: 7.6
+          gradle-version: wrapper
           arguments: build
 
       - name: Run unit tests
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,6 @@
 // Top-level build file where you can add configuration options common to all subprojects/modules.
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
-// TODO: Remove this after https://youtrack.jetbrains.com/issue/KTIJ-19369 is resolved.
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     alias(libs.plugins.dependencyCheckPlugin)
 }
diff --git a/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/AnimatedNavHostEngine.kt b/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/AnimatedNavHostEngine.kt
@@ -294,11 +294,11 @@ internal class AnimatedNavHostEngine(
         }
     }
 
-    private fun DestinationEnterTransition.toAccompanist(): (AnimatedContentScope<NavBackStackEntry>.() -> EnterTransition) {
+    private fun DestinationEnterTransition.toAccompanist(): (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) {
         return { enter() }
     }
 
-    private fun DestinationExitTransition.toAccompanist(): (AnimatedContentScope<NavBackStackEntry>.() -> ExitTransition) {
+    private fun DestinationExitTransition.toAccompanist(): (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) {
         return { exit() }
     }
 }
diff --git a/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/defaults/DefaultAnimationParams.kt b/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/defaults/DefaultAnimationParams.kt
@@ -3,7 +3,6 @@ package com.ramcosta.composedestinations.animations.defaults
 import androidx.compose.animation.*
 import androidx.compose.animation.core.tween
 
-@ExperimentalAnimationApi
 interface NavGraphDefaultAnimationParams {
     val enterTransition: DestinationEnterTransition?
     val exitTransition: DestinationExitTransition?
@@ -19,7 +18,6 @@ interface NavGraphDefaultAnimationParams {
  *
  * @see [com.google.accompanist.navigation.animation.AnimatedNavHost] for a parameters explanation
  */
-@ExperimentalAnimationApi
 class RootNavGraphDefaultAnimations(
     override val enterTransition: DestinationEnterTransition = DestinationEnterTransition { EnterTransition.None },
     override val exitTransition: DestinationExitTransition = DestinationExitTransition { ExitTransition.None },
@@ -43,7 +41,6 @@ class RootNavGraphDefaultAnimations(
  *
  * @see [com.google.accompanist.navigation.animation.navigation] for a parameters explanation
  */
-@ExperimentalAnimationApi
 class NestedNavGraphDefaultAnimations(
     override val enterTransition: DestinationEnterTransition? = null,
     override val exitTransition: DestinationExitTransition? = null,
diff --git a/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/defaults/DestinationTransitions.kt b/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/defaults/DestinationTransitions.kt
@@ -4,11 +4,9 @@ import androidx.compose.animation.*
 import androidx.navigation.NavBackStackEntry
 
 fun interface DestinationEnterTransition {
-    @ExperimentalAnimationApi
-    fun AnimatedContentScope<NavBackStackEntry>.enter() : EnterTransition
+    fun AnimatedContentTransitionScope<NavBackStackEntry>.enter() : EnterTransition
 }
 
 fun interface DestinationExitTransition {
-    @ExperimentalAnimationApi
-    fun AnimatedContentScope<NavBackStackEntry>.exit() : ExitTransition
+    fun AnimatedContentTransitionScope<NavBackStackEntry>.exit() : ExitTransition
 }
diff --git a/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/manualcomposablecalls/ManualComposableCallsBuilder.kt b/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/animations/manualcomposablecalls/ManualComposableCallsBuilder.kt
@@ -70,7 +70,6 @@ fun <T> ManualComposableCallsBuilder.bottomSheetComposable(
     )
 }
 
-@ExperimentalAnimationApi
 private fun ManualComposableCallsBuilder.validateAnimated(
     destination: DestinationSpec<*>
 ) {
diff --git a/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/spec/AnimationsCoreDestinationStyle.kt b/compose-destinations-animations/src/main/java/com/ramcosta/composedestinations/spec/AnimationsCoreDestinationStyle.kt
@@ -35,7 +35,6 @@ object DestinationStyleBottomSheet : DestinationStyle
  * You will need to create an object which implements this interface
  * and use its KClass in [com.ramcosta.composedestinations.annotation.Destination.style]
  */
-@ExperimentalAnimationApi
 interface DestinationStyleAnimated : DestinationStyle {
 
     fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
diff --git a/compose-destinations-wear/src/main/java/com/ramcosta/composedestinations/wear/WearNavHostEngine.kt b/compose-destinations-wear/src/main/java/com/ramcosta/composedestinations/wear/WearNavHostEngine.kt
@@ -67,7 +67,7 @@ internal class WearNavHostEngine(
         with(defaultNavHostEngine) { navigation(navGraph, builder) }
     }
 
-    @OptIn(ExperimentalAnimationApi::class, InternalDestinationsApi::class)
+    @OptIn(InternalDestinationsApi::class)
     override fun <T> NavGraphBuilder.composable(
         destination: DestinationSpec<T>,
         navController: NavHostController,
diff --git a/compose-destinations/src/main/java/com/ramcosta/composedestinations/DefaultNavHostEngine.kt b/compose-destinations/src/main/java/com/ramcosta/composedestinations/DefaultNavHostEngine.kt
@@ -65,7 +65,7 @@ internal class DefaultNavHostEngine : NavHostEngine {
         )
     }
 
-    @OptIn(ExperimentalAnimationApi::class, InternalDestinationsApi::class)
+    @OptIn(InternalDestinationsApi::class)
     override fun <T> NavGraphBuilder.composable(
         destination: DestinationSpec<T>,
         navController: NavHostController,
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,11 +6,11 @@ targetSdk = "33"
 
 kotlin = "1.8.21"
 dependencyCheckPluginVersion = "0.46.0"
-gradlePluginVersion = "8.0.1"
+gradlePluginVersion = "8.0.2"
 mavenPublishPluginVersion = "0.25.2"
 
 composeViewModel = "2.6.1"
-activityCompose = "1.7.1"
+activityCompose = "1.7.2"
 
 material = "1.9.0"
 lifecycleRuntimeKtx = "2.6.1"
@@ -19,11 +19,11 @@ ksp = "1.8.21-1.0.11"
 
 junit = "4.13.2"
 
-compose = "1.5.0-alpha04"
-composeMaterial = "1.5.0-alpha04"
+compose = "1.5.0-beta01"
+composeMaterial = "1.5.0-beta01"
 composeCompiler = "1.4.7"
-composeNavigation = "2.6.0-rc01"
-accompanist = "0.31.2-alpha"
+composeNavigation = "2.6.0-rc02"
+accompanist = "0.31.3-beta"
 
 ktxSerialization = "1.5.1"
 mockk = "1.13.5"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Aug 23 16:48:14 WEST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/playground/build.gradle.kts b/playground/build.gradle.kts
@@ -1,5 +1,3 @@
-// TODO: Remove this after https://youtrack.jetbrains.com/issue/KTIJ-19369 is resolved.
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("com.android.application")
     kotlin("android")
diff --git a/playground/src/main/java/com/ramcosta/samples/playground/ui/screens/greeting/GreetingTransitions.kt b/playground/src/main/java/com/ramcosta/samples/playground/ui/screens/greeting/GreetingTransitions.kt
@@ -8,7 +8,6 @@ import com.ramcosta.samples.playground.ui.screens.appDestination
 import com.ramcosta.samples.playground.ui.screens.destinations.ProfileScreenDestination
 import com.ramcosta.samples.playground.ui.screens.destinations.SettingsScreenDestination
 
-@OptIn(ExperimentalAnimationApi::class)
 object GreetingTransitions : DestinationStyleAnimated {
 
     override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
diff --git a/playground/src/main/java/com/ramcosta/samples/playground/ui/screens/profile/ProfileTransitions.kt b/playground/src/main/java/com/ramcosta/samples/playground/ui/screens/profile/ProfileTransitions.kt
@@ -7,7 +7,6 @@ import com.ramcosta.composedestinations.spec.DestinationStyleAnimated
 import com.ramcosta.samples.playground.ui.screens.appDestination
 import com.ramcosta.samples.playground.ui.screens.destinations.GreetingScreenDestination
 
-@OptIn(ExperimentalAnimationApi::class)
 object ProfileTransitions : DestinationStyleAnimated {
 
     override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
diff --git a/playground/src/main/java/com/ramcosta/samples/playground/ui/screens/styles/SettingsTransitions.kt b/playground/src/main/java/com/ramcosta/samples/playground/ui/screens/styles/SettingsTransitions.kt
@@ -7,7 +7,6 @@ import com.ramcosta.samples.playground.ui.screens.destinations.GreetingScreenDes
 import com.ramcosta.composedestinations.spec.DestinationStyleAnimated
 import com.ramcosta.samples.playground.ui.screens.appDestination
 
-@OptIn(ExperimentalAnimationApi::class)
 object SettingsTransitions : DestinationStyleAnimated {
 
     override fun AnimatedContentTransitionScope<NavBackStackEntry>.enterTransition(): EnterTransition? {
diff --git a/sample-wear/build.gradle.kts b/sample-wear/build.gradle.kts
@@ -1,5 +1,3 @@
-// TODO: Remove this after https://youtrack.jetbrains.com/issue/KTIJ-19369 is resolved.
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("com.android.application")
     kotlin("android")
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -1,5 +1,3 @@
-// TODO: Remove this after https://youtrack.jetbrains.com/issue/KTIJ-19369 is resolved.
-@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("com.android.application")
     kotlin("android")
diff --git a/sample/src/main/java/com/ramcosta/destinations/sample/ui/composables/TitleConfirmDialog.kt b/sample/src/main/java/com/ramcosta/destinations/sample/ui/composables/TitleConfirmDialog.kt
@@ -12,13 +12,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.platform.LocalTextInputService
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.delay
 
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun TitleConfirmDialog(
     type: String,
@@ -27,7 +29,7 @@ fun TitleConfirmDialog(
     onConfirm: () -> Unit,
 ) {
     val focusRequester = remember { FocusRequester() }
-    val inputService = LocalTextInputService.current
+    val inputService = LocalSoftwareKeyboardController.current
     Column(
         modifier = Modifier
             .background(MaterialTheme.colors.surface)
@@ -53,7 +55,7 @@ fun TitleConfirmDialog(
 
     LaunchedEffect(Unit) {
         delay(300)
-        inputService?.showSoftwareKeyboard()
+        inputService?.show()
         focusRequester.requestFocus()
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`// Top-level build file where you can add configuration options common to all subprojects/modules.`
`2`	`2`	`import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask`
`3`	`3`
`4`		`-// TODO: Remove this after https://youtrack.jetbrains.com/issue/KTIJ-19369 is resolved.`
`5`		`-@Suppress("DSL_SCOPE_VIOLATION")`
`6`	`4`	`plugins {`
`7`	`5`	`alias(libs.plugins.dependencyCheckPlugin)`
`8`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -294,11 +294,11 @@ internal class AnimatedNavHostEngine(`
`294`	`294`	`}`
`295`	`295`	`}`
`296`	`296`
`297`		`- private fun DestinationEnterTransition.toAccompanist(): (AnimatedContentScope<NavBackStackEntry>.() -> EnterTransition) {`
	`297`	`+ private fun DestinationEnterTransition.toAccompanist(): (AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition) {`
`298`	`298`	`return { enter() }`
`299`	`299`	`}`
`300`	`300`
`301`		`- private fun DestinationExitTransition.toAccompanist(): (AnimatedContentScope<NavBackStackEntry>.() -> ExitTransition) {`
	`301`	`+ private fun DestinationExitTransition.toAccompanist(): (AnimatedContentTransitionScope<NavBackStackEntry>.() -> ExitTransition) {`
`302`	`302`	`return { exit() }`
`303`	`303`	`}`
`304`	`304`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,9 @@ import androidx.compose.animation.*`
`4`	`4`	`import androidx.navigation.NavBackStackEntry`
`5`	`5`
`6`	`6`	`fun interface DestinationEnterTransition {`
`7`		`- @ExperimentalAnimationApi`
`8`		`- fun AnimatedContentScope<NavBackStackEntry>.enter() : EnterTransition`
	`7`	`+ fun AnimatedContentTransitionScope<NavBackStackEntry>.enter() : EnterTransition`
`9`	`8`	`}`
`10`	`9`
`11`	`10`	`fun interface DestinationExitTransition {`
`12`		`- @ExperimentalAnimationApi`
`13`		`- fun AnimatedContentScope<NavBackStackEntry>.exit() : ExitTransition`
	`11`	`+ fun AnimatedContentTransitionScope<NavBackStackEntry>.exit() : ExitTransition`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ fun <T> ManualComposableCallsBuilder.bottomSheetComposable(`
`70`	`70`	`)`
`71`	`71`	`}`
`72`	`72`
`73`		`-@ExperimentalAnimationApi`
`74`	`73`	`private fun ManualComposableCallsBuilder.validateAnimated(`
`75`	`74`	`destination: DestinationSpec<*>`
`76`	`75`	`) {`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ internal class WearNavHostEngine(`
`67`	`67`	`with(defaultNavHostEngine) { navigation(navGraph, builder) }`
`68`	`68`	`}`
`69`	`69`
`70`		`- @OptIn(ExperimentalAnimationApi::class, InternalDestinationsApi::class)`
	`70`	`+ @OptIn(InternalDestinationsApi::class)`
`71`	`71`	`override fun <T> NavGraphBuilder.composable(`
`72`	`72`	`destination: DestinationSpec<T>,`
`73`	`73`	`navController: NavHostController,`