Skip to content

Commit 14b60b3

Browse files
dturnerdturner
authored
Merge branch 'main' into dependabot/gradle/org.jetbrains.kotlinx-kotlinx-serialization-json-1.6.3
2 parents 0c0addd + 42e9a3a commit 14b60b3

File tree

126 files changed

+859
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+859
-558
lines changed

‎.github/workflows/Build.yaml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
java-version: 17
3838

3939
- name: Setup Gradle
40-
uses: gradle/gradle-build-action@v2
40+
uses: gradle/gradle-build-action@v3
4141

4242
- name: Check build-logic
4343
run: ./gradlew check -p build-logic
@@ -147,6 +147,17 @@ jobs:
147147
api-level: [26, 30]
148148

149149
steps:
150+
- name: Delete unnecessary tools 🔧
151+
uses: jlumbroso/[email protected]
152+
with:
153+
android: false # Don't remove Android tools
154+
tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
155+
dotnet: true # rm -rf /usr/share/dotnet
156+
haskell: true # rm -rf /opt/ghc...
157+
swap-storage: true # rm -f /mnt/swapfile (4GiB)
158+
docker-images: false # Takes 16s, enable if needed in the future
159+
large-packages: false # includes google-cloud-sdk and it's slow
160+
150161
- name: Enable KVM group perms
151162
run: |
152163
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
@@ -167,7 +178,7 @@ jobs:
167178
java-version: 17
168179

169180
- name: Setup Gradle
170-
uses: gradle/gradle-build-action@v2
181+
uses: gradle/gradle-build-action@v3
171182

172183
- name: Build projects before running emulator
173184
run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ tests against _all_ build variants which is both unecessary and will result in f
122122
A screenshot test takes a screenshot of a screen or a UI component within the app, and compares it
123123
with a previously recorded screenshot which is known to be rendered correctly.
124124

125-
For example, Now in Android has [screenshot tests](https://github.com/android/nowinandroid/blob/main/app/src/testDemoDebug/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt)
125+
For example, Now in Android has [screenshot tests](https://github.com/android/nowinandroid/blob/main/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt)
126126
to verify that the navigation is displayed correctly on different screen sizes
127-
([known correct screenshots](https://github.com/android/nowinandroid/tree/main/app/src/testDemoDebug/screenshots)).
127+
([known correct screenshots](https://github.com/android/nowinandroid/tree/main/app/src/testDemo/screenshots)).
128128

129129
Now In Android uses [Roborazzi](https://github.com/takahirom/roborazzi) to run screenshot tests
130130
of certain screens and UI components. When working with screenshot tests the following gradle tasks are useful:

‎app-nia-catalog/dependencies/releaseRuntimeClasspath.txt‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,58 @@
11
androidx.activity:activity-compose:1.8.0
22
androidx.activity:activity-ktx:1.8.0
33
androidx.activity:activity:1.8.0
4-
androidx.annotation:annotation-experimental:1.3.1
4+
androidx.annotation:annotation-experimental:1.4.0
55
androidx.annotation:annotation-jvm:1.7.0
66
androidx.annotation:annotation:1.7.0
77
androidx.appcompat:appcompat-resources:1.6.1
88
androidx.arch.core:core-common:2.2.0
99
androidx.arch.core:core-runtime:2.2.0
1010
androidx.autofill:autofill:1.0.0
1111
androidx.browser:browser:1.6.0
12-
androidx.collection:collection-jvm:1.3.0
13-
androidx.collection:collection:1.3.0
14-
androidx.compose.animation:animation-android:1.5.4
15-
androidx.compose.animation:animation-core-android:1.5.4
16-
androidx.compose.animation:animation-core:1.5.4
17-
androidx.compose.animation:animation:1.5.4
18-
androidx.compose.foundation:foundation-android:1.5.4
19-
androidx.compose.foundation:foundation-layout-android:1.5.4
20-
androidx.compose.foundation:foundation-layout:1.5.4
21-
androidx.compose.foundation:foundation:1.5.4
22-
androidx.compose.material3:material3:1.1.2
23-
androidx.compose.material:material-icons-core-android:1.5.4
24-
androidx.compose.material:material-icons-core:1.5.4
25-
androidx.compose.material:material-icons-extended-android:1.5.4
26-
androidx.compose.material:material-icons-extended:1.5.4
27-
androidx.compose.material:material-ripple-android:1.5.4
28-
androidx.compose.material:material-ripple:1.5.4
29-
androidx.compose.runtime:runtime-android:1.5.4
30-
androidx.compose.runtime:runtime-saveable-android:1.5.4
31-
androidx.compose.runtime:runtime-saveable:1.5.4
32-
androidx.compose.runtime:runtime:1.5.4
33-
androidx.compose.ui:ui-android:1.5.4
34-
androidx.compose.ui:ui-geometry-android:1.5.4
35-
androidx.compose.ui:ui-geometry:1.5.4
36-
androidx.compose.ui:ui-graphics-android:1.5.4
37-
androidx.compose.ui:ui-graphics:1.5.4
38-
androidx.compose.ui:ui-text-android:1.5.4
39-
androidx.compose.ui:ui-text:1.5.4
40-
androidx.compose.ui:ui-tooling-preview-android:1.5.4
41-
androidx.compose.ui:ui-tooling-preview:1.5.4
42-
androidx.compose.ui:ui-unit-android:1.5.4
43-
androidx.compose.ui:ui-unit:1.5.4
44-
androidx.compose.ui:ui-util-android:1.5.4
45-
androidx.compose.ui:ui-util:1.5.4
46-
androidx.compose.ui:ui:1.5.4
47-
androidx.compose:compose-bom:2023.10.01
12+
androidx.collection:collection-jvm:1.4.0
13+
androidx.collection:collection-ktx:1.4.0
14+
androidx.collection:collection:1.4.0
15+
androidx.compose.animation:animation-android:1.6.1
16+
androidx.compose.animation:animation-core-android:1.6.1
17+
androidx.compose.animation:animation-core:1.6.1
18+
androidx.compose.animation:animation:1.6.1
19+
androidx.compose.foundation:foundation-android:1.6.1
20+
androidx.compose.foundation:foundation-layout-android:1.6.1
21+
androidx.compose.foundation:foundation-layout:1.6.1
22+
androidx.compose.foundation:foundation:1.6.1
23+
androidx.compose.material3:material3-android:1.2.0
24+
androidx.compose.material3:material3:1.2.0
25+
androidx.compose.material:material-icons-core-android:1.6.1
26+
androidx.compose.material:material-icons-core:1.6.1
27+
androidx.compose.material:material-icons-extended-android:1.6.1
28+
androidx.compose.material:material-icons-extended:1.6.1
29+
androidx.compose.material:material-ripple-android:1.6.1
30+
androidx.compose.material:material-ripple:1.6.1
31+
androidx.compose.runtime:runtime-android:1.6.1
32+
androidx.compose.runtime:runtime-saveable-android:1.6.1
33+
androidx.compose.runtime:runtime-saveable:1.6.1
34+
androidx.compose.runtime:runtime:1.6.1
35+
androidx.compose.ui:ui-android:1.6.1
36+
androidx.compose.ui:ui-geometry-android:1.6.1
37+
androidx.compose.ui:ui-geometry:1.6.1
38+
androidx.compose.ui:ui-graphics-android:1.6.1
39+
androidx.compose.ui:ui-graphics:1.6.1
40+
androidx.compose.ui:ui-text-android:1.6.1
41+
androidx.compose.ui:ui-text:1.6.1
42+
androidx.compose.ui:ui-tooling-preview-android:1.6.1
43+
androidx.compose.ui:ui-tooling-preview:1.6.1
44+
androidx.compose.ui:ui-unit-android:1.6.1
45+
androidx.compose.ui:ui-unit:1.6.1
46+
androidx.compose.ui:ui-util-android:1.6.1
47+
androidx.compose.ui:ui-util:1.6.1
48+
androidx.compose.ui:ui:1.6.1
49+
androidx.compose:compose-bom:2024.02.00
4850
androidx.concurrent:concurrent-futures:1.1.0
4951
androidx.core:core-ktx:1.12.0
5052
androidx.core:core:1.12.0
5153
androidx.customview:customview-poolingcontainer:1.0.0
5254
androidx.customview:customview:1.0.0
53-
androidx.emoji2:emoji2:1.4.0
55+
androidx.emoji2:emoji2:1.3.0
5456
androidx.exifinterface:exifinterface:1.3.6
5557
androidx.fragment:fragment:1.5.1
5658
androidx.interpolator:interpolator:1.0.0
@@ -78,10 +80,10 @@ androidx.versionedparcelable:versionedparcelable:1.1.1
7880
androidx.viewpager:viewpager:1.0.0
7981
com.google.accompanist:accompanist-drawablepainter:0.32.0
8082
com.google.code.findbugs:jsr305:3.0.2
81-
com.google.dagger:dagger-lint-aar:2.50
82-
com.google.dagger:dagger:2.50
83-
com.google.dagger:hilt-android:2.50
84-
com.google.dagger:hilt-core:2.50
83+
com.google.dagger:dagger-lint-aar:2.51
84+
com.google.dagger:dagger:2.51
85+
com.google.dagger:hilt-android:2.51
86+
com.google.dagger:hilt-core:2.51
8587
com.google.guava:listenablefuture:1.0
8688
com.squareup.okhttp3:okhttp:4.12.0
8789
com.squareup.okio:okio-jvm:3.6.0
@@ -91,10 +93,10 @@ io.coil-kt:coil-compose-base:2.5.0
9193
io.coil-kt:coil-compose:2.5.0
9294
io.coil-kt:coil:2.5.0
9395
javax.inject:javax.inject:1
94-
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.21
96+
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22
9597
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
9698
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
97-
org.jetbrains.kotlin:kotlin-stdlib:1.9.21
99+
org.jetbrains.kotlin:kotlin-stdlib:1.9.22
98100
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
99101
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
100102
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3

‎app/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ android {
4545
debug {
4646
applicationIdSuffix = NiaBuildType.DEBUG.applicationIdSuffix
4747
}
48-
val release = getByName("release") {
48+
release {
4949
isMinifyEnabled = true
5050
applicationIdSuffix = NiaBuildType.RELEASE.applicationIdSuffix
5151
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
@@ -93,6 +93,7 @@ dependencies {
9393
implementation(libs.androidx.core.splashscreen)
9494
implementation(libs.androidx.tracing.ktx)
9595
implementation(libs.androidx.lifecycle.runtimeCompose)
96+
implementation(libs.androidx.compose.runtime.tracing)
9697
implementation(libs.androidx.compose.material3.windowSizeClass)
9798
implementation(libs.androidx.navigation.compose)
9899
implementation(libs.androidx.profileinstaller)
@@ -112,10 +113,12 @@ dependencies {
112113

113114
testDemoImplementation(libs.robolectric)
114115
testDemoImplementation(libs.roborazzi)
116+
testDemoImplementation(projects.core.screenshotTesting)
115117

116118
androidTestImplementation(projects.core.testing)
117119
androidTestImplementation(projects.core.dataTest)
118120
androidTestImplementation(projects.core.datastoreTest)
121+
androidTestImplementation(libs.androidx.test.espresso.core)
119122
androidTestImplementation(libs.androidx.navigation.testing)
120123
androidTestImplementation(libs.accompanist.testharness)
121124
androidTestImplementation(libs.hilt.android.testing)

‎app/dependencies/prodReleaseRuntimeClasspath.txt‎

Lines changed: 63 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
androidx.activity:activity-compose:1.8.0
22
androidx.activity:activity-ktx:1.8.0
33
androidx.activity:activity:1.8.0
4-
androidx.annotation:annotation-experimental:1.3.1
4+
androidx.annotation:annotation-experimental:1.4.0
55
androidx.annotation:annotation-jvm:1.7.0
66
androidx.annotation:annotation:1.7.0
77
androidx.appcompat:appcompat-resources:1.6.1
@@ -10,44 +10,47 @@ androidx.arch.core:core-common:2.2.0
1010
androidx.arch.core:core-runtime:2.2.0
1111
androidx.autofill:autofill:1.0.0
1212
androidx.browser:browser:1.6.0
13-
androidx.collection:collection-jvm:1.3.0
14-
androidx.collection:collection-ktx:1.3.0
15-
androidx.collection:collection:1.3.0
16-
androidx.compose.animation:animation-android:1.5.4
17-
androidx.compose.animation:animation-core-android:1.5.4
18-
androidx.compose.animation:animation-core:1.5.4
19-
androidx.compose.animation:animation:1.5.4
20-
androidx.compose.foundation:foundation-android:1.5.4
21-
androidx.compose.foundation:foundation-layout-android:1.5.4
22-
androidx.compose.foundation:foundation-layout:1.5.4
23-
androidx.compose.foundation:foundation:1.5.4
24-
androidx.compose.material3:material3-window-size-class:1.1.2
25-
androidx.compose.material3:material3:1.1.2
26-
androidx.compose.material:material-icons-core-android:1.5.4
27-
androidx.compose.material:material-icons-core:1.5.4
28-
androidx.compose.material:material-icons-extended-android:1.5.4
29-
androidx.compose.material:material-icons-extended:1.5.4
30-
androidx.compose.material:material-ripple-android:1.5.4
31-
androidx.compose.material:material-ripple:1.5.4
32-
androidx.compose.runtime:runtime-android:1.5.4
33-
androidx.compose.runtime:runtime-saveable-android:1.5.4
34-
androidx.compose.runtime:runtime-saveable:1.5.4
35-
androidx.compose.runtime:runtime:1.5.4
36-
androidx.compose.ui:ui-android:1.5.4
37-
androidx.compose.ui:ui-geometry-android:1.5.4
38-
androidx.compose.ui:ui-geometry:1.5.4
39-
androidx.compose.ui:ui-graphics-android:1.5.4
40-
androidx.compose.ui:ui-graphics:1.5.4
41-
androidx.compose.ui:ui-text-android:1.5.4
42-
androidx.compose.ui:ui-text:1.5.4
43-
androidx.compose.ui:ui-tooling-preview-android:1.5.4
44-
androidx.compose.ui:ui-tooling-preview:1.5.4
45-
androidx.compose.ui:ui-unit-android:1.5.4
46-
androidx.compose.ui:ui-unit:1.5.4
47-
androidx.compose.ui:ui-util-android:1.5.4
48-
androidx.compose.ui:ui-util:1.5.4
49-
androidx.compose.ui:ui:1.5.4
50-
androidx.compose:compose-bom:2023.10.01
13+
androidx.collection:collection-jvm:1.4.0
14+
androidx.collection:collection-ktx:1.4.0
15+
androidx.collection:collection:1.4.0
16+
androidx.compose.animation:animation-android:1.6.1
17+
androidx.compose.animation:animation-core-android:1.6.1
18+
androidx.compose.animation:animation-core:1.6.1
19+
androidx.compose.animation:animation:1.6.1
20+
androidx.compose.foundation:foundation-android:1.6.1
21+
androidx.compose.foundation:foundation-layout-android:1.6.1
22+
androidx.compose.foundation:foundation-layout:1.6.1
23+
androidx.compose.foundation:foundation:1.6.1
24+
androidx.compose.material3:material3-android:1.2.0
25+
androidx.compose.material3:material3-window-size-class-android:1.2.0
26+
androidx.compose.material3:material3-window-size-class:1.2.0
27+
androidx.compose.material3:material3:1.2.0
28+
androidx.compose.material:material-icons-core-android:1.6.1
29+
androidx.compose.material:material-icons-core:1.6.1
30+
androidx.compose.material:material-icons-extended-android:1.6.1
31+
androidx.compose.material:material-icons-extended:1.6.1
32+
androidx.compose.material:material-ripple-android:1.6.1
33+
androidx.compose.material:material-ripple:1.6.1
34+
androidx.compose.runtime:runtime-android:1.6.1
35+
androidx.compose.runtime:runtime-saveable-android:1.6.1
36+
androidx.compose.runtime:runtime-saveable:1.6.1
37+
androidx.compose.runtime:runtime-tracing:1.0.0-beta01
38+
androidx.compose.runtime:runtime:1.6.1
39+
androidx.compose.ui:ui-android:1.6.1
40+
androidx.compose.ui:ui-geometry-android:1.6.1
41+
androidx.compose.ui:ui-geometry:1.6.1
42+
androidx.compose.ui:ui-graphics-android:1.6.1
43+
androidx.compose.ui:ui-graphics:1.6.1
44+
androidx.compose.ui:ui-text-android:1.6.1
45+
androidx.compose.ui:ui-text:1.6.1
46+
androidx.compose.ui:ui-tooling-preview-android:1.6.1
47+
androidx.compose.ui:ui-tooling-preview:1.6.1
48+
androidx.compose.ui:ui-unit-android:1.6.1
49+
androidx.compose.ui:ui-unit:1.6.1
50+
androidx.compose.ui:ui-util-android:1.6.1
51+
androidx.compose.ui:ui-util:1.6.1
52+
androidx.compose.ui:ui:1.6.1
53+
androidx.compose:compose-bom:2024.02.00
5154
androidx.concurrent:concurrent-futures:1.1.0
5255
androidx.core:core-ktx:1.12.0
5356
androidx.core:core-splashscreen:1.0.1
@@ -61,8 +64,8 @@ androidx.datastore:datastore-preferences:1.0.0
6164
androidx.datastore:datastore:1.0.0
6265
androidx.documentfile:documentfile:1.0.0
6366
androidx.drawerlayout:drawerlayout:1.0.0
64-
androidx.emoji2:emoji2-views-helper:1.4.0
65-
androidx.emoji2:emoji2:1.4.0
67+
androidx.emoji2:emoji2-views-helper:1.3.0
68+
androidx.emoji2:emoji2:1.3.0
6669
androidx.exifinterface:exifinterface:1.3.6
6770
androidx.fragment:fragment:1.5.1
6871
androidx.hilt:hilt-common:1.1.0
@@ -71,19 +74,20 @@ androidx.hilt:hilt-navigation:1.0.0
7174
androidx.hilt:hilt-work:1.1.0
7275
androidx.interpolator:interpolator:1.0.0
7376
androidx.legacy:legacy-support-core-utils:1.0.0
74-
androidx.lifecycle:lifecycle-common-java8:2.6.2
75-
androidx.lifecycle:lifecycle-common:2.6.2
76-
androidx.lifecycle:lifecycle-livedata-core:2.6.2
77-
androidx.lifecycle:lifecycle-livedata:2.6.2
78-
androidx.lifecycle:lifecycle-process:2.6.2
79-
androidx.lifecycle:lifecycle-runtime-compose:2.6.2
80-
androidx.lifecycle:lifecycle-runtime-ktx:2.6.2
81-
androidx.lifecycle:lifecycle-runtime:2.6.2
82-
androidx.lifecycle:lifecycle-service:2.6.2
83-
androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2
84-
androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2
85-
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2
86-
androidx.lifecycle:lifecycle-viewmodel:2.6.2
77+
androidx.lifecycle:lifecycle-common-java8:2.7.0
78+
androidx.lifecycle:lifecycle-common:2.7.0
79+
androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0
80+
androidx.lifecycle:lifecycle-livedata-core:2.7.0
81+
androidx.lifecycle:lifecycle-livedata:2.7.0
82+
androidx.lifecycle:lifecycle-process:2.7.0
83+
androidx.lifecycle:lifecycle-runtime-compose:2.7.0
84+
androidx.lifecycle:lifecycle-runtime-ktx:2.7.0
85+
androidx.lifecycle:lifecycle-runtime:2.7.0
86+
androidx.lifecycle:lifecycle-service:2.7.0
87+
androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0
88+
androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0
89+
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0
90+
androidx.lifecycle:lifecycle-viewmodel:2.7.0
8791
androidx.loader:loader:1.0.0
8892
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
8993
androidx.metrics:metrics-performance:1.0.0-alpha04
@@ -106,6 +110,7 @@ androidx.sqlite:sqlite-framework:2.4.0
106110
androidx.sqlite:sqlite:2.4.0
107111
androidx.startup:startup-runtime:1.1.1
108112
androidx.tracing:tracing-ktx:1.3.0-alpha02
113+
androidx.tracing:tracing-perfetto:1.0.0
109114
androidx.tracing:tracing:1.3.0-alpha02
110115
androidx.vectordrawable:vectordrawable-animated:1.1.0
111116
androidx.vectordrawable:vectordrawable:1.1.0
@@ -134,10 +139,10 @@ com.google.android.gms:play-services-oss-licenses:17.0.1
134139
com.google.android.gms:play-services-stats:17.0.2
135140
com.google.android.gms:play-services-tasks:18.0.2
136141
com.google.code.findbugs:jsr305:3.0.2
137-
com.google.dagger:dagger-lint-aar:2.50
138-
com.google.dagger:dagger:2.50
139-
com.google.dagger:hilt-android:2.50
140-
com.google.dagger:hilt-core:2.50
142+
com.google.dagger:dagger-lint-aar:2.51
143+
com.google.dagger:dagger:2.51
144+
com.google.dagger:hilt-android:2.51
145+
com.google.dagger:hilt-core:2.51
141146
com.google.errorprone:error_prone_annotations:2.11.0
142147
com.google.firebase:firebase-abt:21.1.1
143148
com.google.firebase:firebase-analytics-ktx:21.4.0

0 commit comments

Comments
 (0)