Skip to content
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.

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

Ignore unsupported previews #2

Merged
merged 7 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions app-nia-catalog/dependencies/releaseRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ androidx.window.extensions.core:core:1.0.0
androidx.window:window-core-android:1.3.0-beta01
androidx.window:window-core:1.3.0-beta01
androidx.window:window:1.3.0-beta01
com.emergetools.snapshots:snapshots-annotations:1.0.0
com.google.accompanist:accompanist-drawablepainter:0.32.0
com.google.code.findbugs:jsr305:3.0.2
com.google.dagger:dagger-lint-aar:2.51
Expand All @@ -119,4 +120,9 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.5.1
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.5.1
org.jetbrains.kotlinx:kotlinx-serialization-core:1.5.1
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.5.1
org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1
org.jetbrains:annotations:23.0.0
1 change: 1 addition & 0 deletions app/dependencies/prodReleaseRuntimeClasspath.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ androidx.window:window:1.3.0-beta01
androidx.work:work-runtime-ktx:2.9.0
androidx.work:work-runtime:2.9.0
com.caverock:androidsvg-aar:1.4
com.emergetools.snapshots:snapshots-annotations:1.0.0
com.google.accompanist:accompanist-drawablepainter:0.32.0
com.google.accompanist:accompanist-permissions:0.34.0
com.google.android.datatransport:transport-api:3.0.0
Expand Down
2 changes: 1 addition & 1 deletion app/prodRelease-badging.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package: name='com.google.samples.apps.nowinandroid' versionCode='8' versionName='0.1.2' platformBuildVersionName='14' platformBuildVersionCode='34' compileSdkVersion='34' compileSdkVersionCodename='14'
sdkVersion:'21'
sdkVersion:'23'
targetSdkVersion:'34'
uses-permission: name='android.permission.INTERNET'
uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ internal fun Project.configureKotlinAndroid(
compileSdk = 34

defaultConfig {
minSdk = 21
minSdk = 23
}

compileOptions {
Expand Down
2 changes: 2 additions & 0 deletions core/ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ dependencies {
implementation(libs.coil.kt)
implementation(libs.coil.kt.compose)

implementation(libs.emerge.snapshots.annotations)

androidTestImplementation(projects.core.testing)
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import androidx.compose.ui.tooling.preview.Devices
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import com.emergetools.snapshots.annotations.IgnoreEmergeSnapshot
import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource
Expand Down Expand Up @@ -124,6 +125,7 @@ sealed interface NewsFeedUiState {
) : NewsFeedUiState
}

@IgnoreEmergeSnapshot
@Preview
@Composable
private fun NewsFeedLoadingPreview() {
Expand Down
2 changes: 2 additions & 0 deletions feature/settings/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ dependencies {
implementation(libs.google.oss.licenses)
implementation(projects.core.data)

implementation(libs.emerge.snapshots.annotations)

testImplementation(projects.core.testing)

androidTestImplementation(projects.core.testing)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.emergetools.snapshots.annotations.IgnoreEmergeSnapshot
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTextButton
import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
Expand Down Expand Up @@ -284,6 +285,7 @@ private fun LinksPanel() {
}
}

@IgnoreEmergeSnapshot
@Preview
@Composable
private fun PreviewSettingsDialog() {
Expand All @@ -304,6 +306,7 @@ private fun PreviewSettingsDialog() {
}
}

@IgnoreEmergeSnapshot
@Preview
@Composable
private fun PreviewSettingsDialogLoading() {
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ androidxWindowManager = "1.3.0-alpha03"
androidxWork = "2.9.0"
coil = "2.6.0"
dependencyGuard = "0.5.0"
emergeSnapshots = "1.0.0"
firebaseBom = "32.4.0"
firebaseCrashlyticsPlugin = "2.9.9"
firebasePerfPlugin = "1.4.2"
Expand Down Expand Up @@ -109,6 +110,7 @@ androidx-work-testing = { group = "androidx.work", name = "work-testing", versio
coil-kt = { group = "io.coil-kt", name = "coil", version.ref = "coil" }
coil-kt-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
coil-kt-svg = { group = "io.coil-kt", name = "coil-svg", version.ref = "coil" }
emerge-snapshots-annotations = { module = "com.emergetools.snapshots:snapshots-annotations", version.ref = "emergeSnapshots" }
firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics-ktx" }
firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebaseBom" }
firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-messaging-ktx" }
Expand Down
Loading