Skip to content

Update Deps + Remove screenshot testing plugin until it works with newer versions of Gradle plugin #182

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.

Sign up for GitHub

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

Merged
riggaroo merged 4 commits into from
Dec 8, 2025
Merged

Update Deps + Remove screenshot testing plugin until it works with newer versions of Gradle plugin #182

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0855873
Remove screenshot testing plugin until it works with newer versions o…
riggaroo Dec 8, 2025
e2e5699
Remove from yml and update BOM, back down from alpha
riggaroo Dec 8, 2025
b25ab22
Change to material alpha
riggaroo Dec 8, 2025
fc68df6
Update more deps
riggaroo Dec 8, 2025
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
9 changes: 2 additions & 7 deletions core/theme/src/main/java/com/android/developers/androidify/theme/Motion.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ import androidx.compose.ui.geometry.Rect
)
val MotionScheme.sharedElementTransitionSpec: BoundsTransform
@Composable
get() = object : BoundsTransform {
override fun transform(
initialBounds: Rect,
targetBounds: Rect,
): FiniteAnimationSpec<Rect> {
return this@sharedElementTransitionSpec.slowSpatialSpec()
}
get() = BoundsTransform { _, _ ->
this@sharedElementTransitionSpec.slowSpatialSpec()
}
9 changes: 1 addition & 8 deletions core/theme/src/main/java/com/android/developers/androidify/theme/SharedElementsConfig.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,7 @@ val LocalAnimateBoundsScope = compositionLocalOf<LookaheadScope?> {
)
val MotionScheme.sharedElementTransitionBounds: BoundsTransform
@Composable
get() = object : BoundsTransform {
override fun transform(
initialBounds: Rect,
targetBounds: Rect,
): FiniteAnimationSpec<Rect> {
return sharedElementTransitionSpec()
}
}
get() = BoundsTransform { _, _ -> sharedElementTransitionSpec() }

fun <T> MotionScheme.sharedElementTransitionSpec(): FiniteAnimationSpec<T> {
return tween(600)
Expand Down
6 changes: 2 additions & 4 deletions feature/camera/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ plugins {
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.composeScreenshot)
}

android {
Expand All @@ -42,8 +41,6 @@ android {
compose = true
}

experimentalProperties["android.experimental.enableScreenshotTest"] = true

testOptions {
targetSdk = 36
}
Expand Down Expand Up @@ -95,5 +92,6 @@ dependencies {
kspAndroidTest(libs.hilt.compiler)

debugImplementation(libs.androidx.ui.test.manifest)
screenshotTestImplementation(libs.androidx.ui.tooling)
// Disable until it works with newer Gradle versions
// screenshotTestImplementation(libs.androidx.ui.tooling)
}
3 changes: 0 additions & 3 deletions feature/creation/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ plugins {
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.composeScreenshot)
}

android {
Expand All @@ -44,8 +43,6 @@ android {
compose = true
}

experimentalProperties["android.experimental.enableScreenshotTest"] = true

testOptions {
unitTests {
isIncludeAndroidResources = true
Expand Down
3 changes: 0 additions & 3 deletions feature/home/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ plugins {
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.composeScreenshot)
}

android {
Expand All @@ -42,8 +41,6 @@ android {
compose = true
}

experimentalProperties["android.experimental.enableScreenshotTest"] = true

testOptions {
targetSdk = 36
}
Expand Down
3 changes: 0 additions & 3 deletions feature/results/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ plugins {
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.composeScreenshot)
}

android {
Expand All @@ -43,8 +42,6 @@ android {
compose = true
}

experimentalProperties["android.experimental.enableScreenshotTest"] = true

testOptions {
targetSdk = 36
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ kotlin.code.style=official
android.nonTransitiveRClass=true
android.disableMinifyLocalDependenciesForLibraries=true
org.gradle.configuration-cache=true
android.experimental.enableScreenshotTest=true
android.experimental.enableScreenshotTest=false
15 changes: 7 additions & 8 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
appVersionCode = "10"
appVersionName = "1.3.0"
appVersionWearOffset = "60000000"
agp = "8.12.0"
bcpkixJdk18on = "1.82"
agp = "8.13.1"
bcpkixJdk18on = "1.83"
compileSdk = "36"
core = "1.7.0"
extensionsXr = "1.1.0"
Expand All @@ -16,14 +16,14 @@ wearMinSdk = "36"

#dependencies
accompanist = "0.37.3"
activityCompose = "1.11.0"
adaptive = "1.1.0"
animationAndroid = "1.9.3"
activityCompose = "1.12.1"
adaptive = "1.2.0"
animationAndroid = "1.10.0"
apksig = "9.0.0-alpha06"
appcompat = "1.7.1"
baselineprofile = "1.4.1"
benchmarkMacroJunit4 = "1.4.1"
camerax = "1.5.1"
camerax = "1.5.2"
coilCompose = "3.3.0"
coilGif = "3.3.0"
composeBom = "2025.10.00"
Expand All @@ -47,7 +47,7 @@ horologist = "0.7.15"
junit = "4.13.2"
junitVersion = "1.3.0"
kotlin = "2.2.0"
ksp = "2.2.0-2.0.2"
ksp = "2.2.20-2.0.3"
kotlinxCoroutines = "1.10.2"
kotlinxSerialization = "2.2.20"
kotlinxSerializationJson = "1.9.0"
Expand Down Expand Up @@ -198,5 +198,4 @@ kotlin-ksp = { id ="com.google.devtools.ksp", version.ref = "ksp" }
serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinxSerialization" }
android-test = { id = "com.android.test", version.ref = "agp" }
baselineprofile = { id = "androidx.baselineprofile", version.ref = "baselineprofile" }
composeScreenshot = { id = "com.android.compose.screenshot", version = "0.0.1-alpha10" }
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
Loading