Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Merge branch 'baseline-profile-api-change' of https://github.com/android/nowinandroid into baseline-profile-api-change

Murat Yenerf04652e56c75
diff --cc build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index 287b09cf5,287b09cf5..feffbd68a
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@@ -38,7 -38,7 +38,7 @@@ class AndroidLibraryConventionPlugin :
extensions.configure<LibraryExtension> {
configureKotlinAndroid(this)
-- defaultConfig.targetSdk = 33
++ defaultConfig.targetSdk = 34
configureFlavors(this)
configureGradleManagedDevices(this)
}
diff --cc build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
index 5cdf2f593,5cdf2f593..8c510c017
--- a/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
+++ b/build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt
@@@ -33,7 -33,7 +33,7 @@@ internal fun Project.configureKotlinAnd
commonExtension: CommonExtension<*, *, *, *>,
) {
commonExtension.apply {
-- compileSdk = 33
++ compileSdk = 34
defaultConfig {
minSdk = 21