From 921cfa84df1f03ea5afec56af94dacfe6da1996f Mon Sep 17 00:00:00 2001 From: Pavel Kargashinsky Date: Mon, 3 Apr 2023 11:30:43 +0200 Subject: [PATCH] Revert "[Gradle][Tests][MPP] set compileSdkVersion to 31 in new-mpp-adnroid test-data" This reverts commit 2a336140d2d36d3dd8b0d07dc2798ae65ecb68bd. --- .../resources/testProject/new-mpp-android/app/build.gradle | 6 +++--- .../new-mpp-android/app/src/main/AndroidManifest.xml | 5 +++-- .../resources/testProject/new-mpp-android/lib/build.gradle | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle index 2db4532fb22..37a0bae96d2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/build.gradle @@ -9,12 +9,12 @@ java { } android { - compileSdkVersion 31 + compileSdkVersion 27 namespace 'app.example.com.app_sample' defaultConfig { applicationId "app.example.com.app_sample" - minSdkVersion 26 - targetSdkVersion 31 + minSdkVersion 21 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/src/main/AndroidManifest.xml b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/src/main/AndroidManifest.xml index 35de7fe7cf0..9c7290910cd 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/src/main/AndroidManifest.xml +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ - + - + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle index dd0c3788247..8ba966aa520 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/new-mpp-android/lib/build.gradle @@ -10,12 +10,12 @@ java { } android { - compileSdkVersion 31 + compileSdkVersion 27 namespace 'app.example.com.lib' defaultConfig { - minSdkVersion 26 - targetSdkVersion 31 + minSdkVersion 21 + targetSdkVersion 30 versionCode 1 versionName "1.0"