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

Murat Yener · Murat Yener · commit f04652e56c75 · 2023-06-22T16:12:59.000-07:00
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -38,7 +38,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
 
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
-                defaultConfig.targetSdk = 33
+                defaultConfig.targetSdk = 34
                 configureFlavors(this)
                 configureGradleManagedDevices(this)
             }
diff --git 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 @@ internal fun Project.configureKotlinAndroid(
     commonExtension: CommonExtension<*, *, *, *>,
 ) {
     commonExtension.apply {
-        compileSdk = 33
+        compileSdk = 34
 
         defaultConfig {
             minSdk = 21

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {`
`38`	`38`
`39`	`39`	`extensions.configure<LibraryExtension> {`
`40`	`40`	`configureKotlinAndroid(this)`
`41`		`- defaultConfig.targetSdk = 33`
	`41`	`+ defaultConfig.targetSdk = 34`
`42`	`42`	`configureFlavors(this)`
`43`	`43`	`configureGradleManagedDevices(this)`
`44`	`44`	`}`