Skip to content

Commit 70e6ef6

Browse files
authored
Merge pull request #146 from android/yaraki/v0.5.1
Upgrade casa to v0.5.1
2 parents 3e09145 + b8e411e commit 70e6ef6

File tree

12 files changed

+30
-26
lines changed

12 files changed

+30
-26
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ captures
1616
.idea/compiler.xml
1717
.idea/jarRepositories.xml
1818
.idea/deploymentTargetDropDown.xml
19+
.idea/deploymentTargetSelector.xml
1920
.idea/misc.xml
2021
.idea/androidTestResultsUserPreferences.xml
2122
.idea/inspectionProfiles

.idea/kotlinc.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradle/libs.versions.toml

+14-15
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
[versions]
1717
accompanist = "0.32.0"
1818
androidx-datastore = "1.0.0"
19-
androidx-navigation = "2.7.5"
19+
androidx-navigation = "2.7.7"
2020
androidx-window = "1.2.0"
21-
agp = "8.2.1"
22-
casa = "0.5.0"
21+
agp = "8.2.2"
22+
casa = "0.5.1"
2323
coil = "2.4.0"
24-
ksp = "1.9.20-1.0.14"
25-
compose-bom = "2023.10.01"
26-
composeCompiler = "1.5.4"
24+
ksp = "1.9.22-1.0.17"
25+
compose-bom = "2024.02.00"
26+
composeCompiler = "1.5.9"
2727
hilt = "2.48.1"
28-
kotlin = "1.9.20"
28+
kotlin = "1.9.22"
2929
kotlin-serialization = "1.6.0"
3030
ktlint = "0.48.1"
3131
coroutines = "1.7.3"
32-
play-services-location = "21.0.1"
32+
play-services-location = "21.1.0"
3333
junit4 = "4.13.2"
3434
androidxEspresso = "3.5.1"
3535
androidxTestCore = "1.5.0"
@@ -38,9 +38,9 @@ androidxTestExtTruth = "1.5.0"
3838
androidxTestRules = "1.5.0"
3939
androidxTestRunner = "1.5.2"
4040
androidxUiAutomator = "2.2.0"
41-
media3 = "1.2.0"
41+
media3 = "1.2.1"
4242
appcompat = "1.6.1"
43-
material = "1.10.0"
43+
material = "1.11.0"
4444
constraintlayout = "2.1.4"
4545

4646
[libraries]
@@ -53,14 +53,14 @@ androidx-core = "androidx.core:core-ktx:1.12.0"
5353
androidx-appcompat = "androidx.appcompat:appcompat:1.6.1"
5454
androidx-exifinterface = "androidx.exifinterface:exifinterface:1.3.7"
5555
# Fragment 1.7.0 alpha and Transition 1.5.0 alpha are required for predictive back to work with Fragments and transitions
56-
androidx-fragment = "androidx.fragment:fragment-ktx:1.7.0-alpha07"
57-
androidx-transition = "androidx.transition:transition-ktx:1.5.0-alpha05"
56+
androidx-fragment = "androidx.fragment:fragment-ktx:1.7.0-alpha10"
57+
androidx-transition = "androidx.transition:transition-ktx:1.5.0-alpha06"
5858
androidx-activity-compose = "androidx.activity:activity-compose:1.8.2"
5959
androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidx-navigation" }
6060
androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
6161
androidx-navigation-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidx-navigation" }
6262
androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidx-navigation" }
63-
androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2"
63+
androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0"
6464
androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.0.0"
6565

6666
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
@@ -131,7 +131,7 @@ androidx-window = { module = "androidx.window:window", version.ref = "androidx-w
131131
androidx-window-java = { module = "androidx.window:window-java", version.ref = "androidx-window" }
132132
androidx-window-rxjava2 = { module = "androidx.window:window-rxjava2", version.ref = "androidx-window" }
133133
androidx-window-core = { module = "androidx.window:window-core", version.ref = "androidx-window" }
134-
androidx-media = "androidx.media:media:1.6.0"
134+
androidx-media = "androidx.media:media:1.7.0"
135135
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
136136
androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "androidx-datastore" }
137137
androidx-draganddrop = "androidx.draganddrop:draganddrop:1.0.0"
@@ -146,7 +146,6 @@ fresco = "com.facebook.fresco:fresco:3.0.0"
146146
fresco-nativeimagetranscoder = "com.facebook.fresco:nativeimagetranscoder:2.6.0!!"
147147
glide = "com.github.bumptech.glide:glide:4.15.1"
148148

149-
mdc = "com.google.android.material:material:1.10.0"
150149
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
151150
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
152151
constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }

samples/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ buildSpannedString is useful for quickly building a rich text.
109109
- [UltraHDR Image Capture](camera/camera2/src/main/java/com/example/platform/camera/imagecapture/Camera2UltraHDRCapture.kt):
110110
This sample demonstrates how to capture a 10-bit compressed still image and
111111
- [UltraHDR to HDR Video](media/ultrahdr/src/main/java/com/example/platform/media/ultrahdr/video/UltraHDRToHDRVideo.kt):
112-
This sample demonstrates converting a series of UltraHDR images into a HDR
112+
This sample demonstrates converting a series of UltraHDR images into a HDR
113113
- [UltraHDR x OpenGLES SurfaceView](graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt):
114-
This sample demonstrates displaying an UltraHDR image via and OpenGL Pipeline
114+
This sample demonstrates displaying an UltraHDR image via and OpenGL Pipeline
115115
- [Video Composition using Media3 Transformer](media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt):
116-
This sample demonstrates concatenation of two video assets using Media3
116+
This sample demonstrates concatenation of two video assets using Media3
117117
- [Visualizing an UltraHDR Gainmap](graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/display/VisualizingAnUltraHDRGainmap.kt):
118118
This sample demonstrates visualizing the underlying gainmap of an UltraHDR
119119
- [WindowInsetsAnimation](user-interface/window-insets/src/main/java/com/example/platform/ui/insets/WindowInsetsAnimation.kt):

samples/user-interface/appwidgets/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ dependencies {
3535
implementation(libs.androidx.glance.material3)
3636
// Recommended to use WorkManager to load data for widgets
3737
implementation(libs.androidx.work.runtime.ktx)
38-
implementation(libs.mdc)
38+
implementation(libs.material)
3939
}

samples/user-interface/constraintlayout/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ android {
2727

2828
dependencies {
2929
implementation(libs.androidx.constraintlayout)
30-
implementation(libs.mdc)
30+
implementation(libs.material)
3131
implementation(libs.lottie)
3232
}

samples/user-interface/draganddrop/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
}
2727

2828
dependencies {
29-
implementation(libs.mdc)
29+
implementation(libs.material)
3030
implementation(libs.androidx.constraintlayout)
3131
implementation(libs.androidx.draganddrop)
3232
}

samples/user-interface/predictiveback/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ android {
3131
dependencies {
3232
implementation(libs.androidx.appcompat)
3333
implementation(libs.androidx.constraintlayout)
34-
implementation(libs.mdc)
34+
implementation(libs.material)
3535
implementation(libs.androidx.navigation.fragment)
3636
implementation(libs.androidx.navigation.ui)
3737
implementation(libs.androidx.fragment)

samples/user-interface/text/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ android {
2828

2929
dependencies {
3030
implementation(libs.androidx.constraintlayout)
31-
implementation(libs.mdc)
31+
implementation(libs.material)
3232
}

samples/user-interface/window-insets/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ android {
2626
}
2727

2828
dependencies {
29-
implementation(libs.mdc)
29+
implementation(libs.material)
3030
implementation(libs.androidx.dynamicanimation)
3131
}

samples/user-interface/windowmanager/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ android {
2727
}
2828

2929
dependencies {
30-
implementation(libs.mdc)
30+
implementation(libs.material)
3131
implementation(libs.androidx.window)
3232
implementation(libs.androidx.window.java)
3333
implementation(libs.androidx.window.rxjava2)

settings.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ pluginManagement {
2222
google()
2323
mavenCentral()
2424
gradlePluginPortal()
25+
// Uncomment this to use a snapshot version of casa-android.
26+
// maven("https://oss.sonatype.org/content/repositories/snapshots/")
2527
}
2628
}
2729

@@ -30,6 +32,8 @@ dependencyResolutionManagement {
3032
repositories {
3133
google()
3234
mavenCentral()
35+
// Uncomment this to use a snapshot version of casa-android.
36+
// maven("https://oss.sonatype.org/content/repositories/snapshots/")
3337
}
3438
}
3539

0 commit comments

Comments
 (0)