Skip to content

Commit b2cd980

Browse files
SimonMarquisSimonMarquis
committed
Merge remote-tracking branch 'origin/main' into resource-prefix
2 parents ebfe01a + e40fb79 commit b2cd980

File tree

257 files changed

+2
-2
lines changed

Some content is hidden

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

257 files changed

+2
-2
lines changed

app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/NiaCatalogActivity.kt renamed to app-nia-catalog/src/main/kotlin/com/google/samples/apps/niacatalog/NiaCatalogActivity.kt

File renamed without changes.

app-nia-catalog/src/main/java/com/google/samples/apps/niacatalog/ui/Catalog.kt renamed to app-nia-catalog/src/main/kotlin/com/google/samples/apps/niacatalog/ui/Catalog.kt

File renamed without changes.

‎app/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ dependencies {
128128
testImplementation(project(":core:network"))
129129
testImplementation(libs.androidx.navigation.testing)
130130
testImplementation(libs.accompanist.testharness)
131+
testImplementation(libs.work.testing)
131132
testImplementation(kotlin("test"))
132-
implementation(libs.work.testing)
133133
kaptTest(libs.hilt.compiler)
134134

135135
}

app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt renamed to app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

File renamed without changes.

app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt renamed to app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt

File renamed without changes.

app/src/androidTest/java/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt renamed to app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt

File renamed without changes.

app/src/main/java/com/google/samples/apps/nowinandroid/MainActivity.kt renamed to app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt

File renamed without changes.

app/src/main/java/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt renamed to app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivityViewModel.kt

File renamed without changes.

app/src/main/java/com/google/samples/apps/nowinandroid/NiaApplication.kt renamed to app/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaApplication.kt

File renamed without changes.

app/src/main/java/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt renamed to app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt

File renamed without changes.

0 commit comments

Comments
 (0)