From 912c357300f408f73a2aa4d6e94727c6605d9cdb Mon Sep 17 00:00:00 2001 From: JishnuGoyal Date: Sun, 20 Nov 2022 14:24:39 +0530 Subject: [PATCH] Revert "Fix #4746: Update app to target SDK 31 (#4747)" This reverts commit 7cb38ffa --- .../action.yml | 4 ++-- BUILD.bazel | 4 ++-- WORKSPACE | 2 +- app/build.gradle | 4 ++-- app/src/main/AppAndroidManifest.xml | 2 +- app/src/main/DatabindingAdaptersManifest.xml | 2 +- app/src/main/DatabindingResourcesManifest.xml | 2 +- app/src/main/RecyclerviewAdaptersManifest.xml | 2 +- app/src/main/ViewModelManifest.xml | 2 +- app/src/main/ViewModelsManifest.xml | 2 +- app/src/main/ViewsManifest.xml | 2 +- build_flavors.bzl | 14 +++++++------- .../org/oppia/android/config/AndroidManifest.xml | 2 +- data/build.gradle | 4 ++-- data/src/test/AndroidManifest.xml | 2 +- domain/build.gradle | 4 ++-- domain/src/main/AndroidManifest.xml | 2 +- instrumentation/BUILD.bazel | 2 +- testing/build.gradle | 4 ++-- testing/src/test/AndroidManifest.xml | 2 +- utility/build.gradle | 4 ++-- utility/src/main/AndroidManifest.xml | 2 +- 22 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/actions/set-up-android-bazel-build-environment/action.yml b/.github/actions/set-up-android-bazel-build-environment/action.yml index 6b3f5cf1155..836e327828b 100644 --- a/.github/actions/set-up-android-bazel-build-environment/action.yml +++ b/.github/actions/set-up-android-bazel-build-environment/action.yml @@ -72,9 +72,9 @@ runs: $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platform-tools" shell: bash - - name: Install SDK 31 + - name: Install SDK 30 run: | - $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-31" + $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-30" shell: bash - name: Install build tools 29.0.2 diff --git a/BUILD.bazel b/BUILD.bazel index 5177d895f27..81250077b03 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -117,14 +117,14 @@ package_group( "flavor": "oppia", "min_sdk_version": 21, "multidex": "native", - "target_sdk_version": 31, + "target_sdk_version": 30, }, { "flavor": "oppia_kitkat", "main_dex_list": "//:config/kitkat_main_dex_class_list.txt", "min_sdk_version": 19, "multidex": "manual_main_dex", - "target_sdk_version": 31, + "target_sdk_version": 30, }, ] ] diff --git a/WORKSPACE b/WORKSPACE index c6c1f09af5f..17ac191b294 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -11,7 +11,7 @@ load("//third_party:versions.bzl", "HTTP_DEPENDENCY_VERSIONS", "get_maven_depend # TODO(#1542): Sync Android SDK version with the manifest. android_sdk_repository( name = "androidsdk", - api_level = 31, + api_level = 30, build_tools_version = "29.0.2", ) diff --git a/app/build.gradle b/app/build.gradle index 63ee7549c26..7210225d4e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,12 +6,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 30 buildToolsVersion "29.0.2" defaultConfig { applicationId "org.oppia.android" minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 30 versionCode 1 versionName "1.0" multiDexEnabled true diff --git a/app/src/main/AppAndroidManifest.xml b/app/src/main/AppAndroidManifest.xml index 9a5789e1872..1c8f666190e 100644 --- a/app/src/main/AppAndroidManifest.xml +++ b/app/src/main/AppAndroidManifest.xml @@ -1,5 +1,5 @@ + android:targetSdkVersion="30" /> diff --git a/app/src/main/DatabindingAdaptersManifest.xml b/app/src/main/DatabindingAdaptersManifest.xml index 0974b6b3aa6..1ce9e10c160 100644 --- a/app/src/main/DatabindingAdaptersManifest.xml +++ b/app/src/main/DatabindingAdaptersManifest.xml @@ -1,5 +1,5 @@ + android:targetSdkVersion="30" /> diff --git a/app/src/main/DatabindingResourcesManifest.xml b/app/src/main/DatabindingResourcesManifest.xml index 0c3dd8fa35a..9b1e93c2052 100644 --- a/app/src/main/DatabindingResourcesManifest.xml +++ b/app/src/main/DatabindingResourcesManifest.xml @@ -1,5 +1,5 @@ + android:targetSdkVersion="30" /> diff --git a/app/src/main/RecyclerviewAdaptersManifest.xml b/app/src/main/RecyclerviewAdaptersManifest.xml index f2a3273e765..f20e30062f0 100644 --- a/app/src/main/RecyclerviewAdaptersManifest.xml +++ b/app/src/main/RecyclerviewAdaptersManifest.xml @@ -1,5 +1,5 @@ + android:targetSdkVersion="30" /> diff --git a/app/src/main/ViewModelManifest.xml b/app/src/main/ViewModelManifest.xml index 07603e895d8..fa31c60ce75 100644 --- a/app/src/main/ViewModelManifest.xml +++ b/app/src/main/ViewModelManifest.xml @@ -3,5 +3,5 @@ + android:targetSdkVersion="30" /> diff --git a/app/src/main/ViewModelsManifest.xml b/app/src/main/ViewModelsManifest.xml index 84693784fd8..c44690d380c 100644 --- a/app/src/main/ViewModelsManifest.xml +++ b/app/src/main/ViewModelsManifest.xml @@ -3,5 +3,5 @@ + android:targetSdkVersion="30" /> diff --git a/app/src/main/ViewsManifest.xml b/app/src/main/ViewsManifest.xml index 340e35afe29..10b8d0ef41f 100644 --- a/app/src/main/ViewsManifest.xml +++ b/app/src/main/ViewsManifest.xml @@ -3,5 +3,5 @@ + android:targetSdkVersion="30" /> diff --git a/build_flavors.bzl b/build_flavors.bzl index e141ba1e702..55aec211b65 100644 --- a/build_flavors.bzl +++ b/build_flavors.bzl @@ -46,7 +46,7 @@ _FLAVOR_METADATA = { "dev": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 21, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "native", "proguard_specs": [], # Developer builds are not optimized. "production_release": False, @@ -60,7 +60,7 @@ _FLAVOR_METADATA = { "dev_kitkat": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 19, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "manual_main_dex", "main_dex_list": _MAIN_DEX_LIST_TARGET_KITKAT, "proguard_specs": [], # Developer builds are not optimized. @@ -75,7 +75,7 @@ _FLAVOR_METADATA = { "alpha": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 21, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "native", "proguard_specs": _PRODUCTION_PROGUARD_SPECS, "production_release": True, @@ -89,7 +89,7 @@ _FLAVOR_METADATA = { "alpha_kitkat": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 19, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "manual_main_dex", "main_dex_list": _MAIN_DEX_LIST_TARGET_KITKAT, "proguard_specs": [], # TODO(#3886): Re-add Proguard support to alpha_kitkat. @@ -104,7 +104,7 @@ _FLAVOR_METADATA = { "alpha_kenya": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 21, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "native", "proguard_specs": _PRODUCTION_PROGUARD_SPECS, "production_release": True, @@ -118,7 +118,7 @@ _FLAVOR_METADATA = { "beta": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 21, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "native", "proguard_specs": _PRODUCTION_PROGUARD_SPECS, "production_release": True, @@ -132,7 +132,7 @@ _FLAVOR_METADATA = { "ga": { "manifest": "//app:src/main/AndroidManifest.xml", "min_sdk_version": 21, - "target_sdk_version": 31, + "target_sdk_version": 30, "multidex": "native", "proguard_specs": _PRODUCTION_PROGUARD_SPECS, "production_release": True, diff --git a/config/src/java/org/oppia/android/config/AndroidManifest.xml b/config/src/java/org/oppia/android/config/AndroidManifest.xml index 1d3f57544f1..e1c019cb70c 100644 --- a/config/src/java/org/oppia/android/config/AndroidManifest.xml +++ b/config/src/java/org/oppia/android/config/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/data/build.gradle b/data/build.gradle index d51015b8c24..b90bcc469fc 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 30 buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 30 versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/data/src/test/AndroidManifest.xml b/data/src/test/AndroidManifest.xml index 2078d324983..5fd4f17f291 100644 --- a/data/src/test/AndroidManifest.xml +++ b/data/src/test/AndroidManifest.xml @@ -1,5 +1,5 @@ + android:maxSdkVersion="30" /> diff --git a/domain/build.gradle b/domain/build.gradle index b0e246d6e27..861ea4ae207 100644 --- a/domain/build.gradle +++ b/domain/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 30 buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 30 versionCode 1 versionName "1.0" javaCompileOptions { diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml index 483a96cc057..9cdbbca1e9e 100644 --- a/domain/src/main/AndroidManifest.xml +++ b/domain/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/instrumentation/BUILD.bazel b/instrumentation/BUILD.bazel index 22a68271e54..528eec6a433 100644 --- a/instrumentation/BUILD.bazel +++ b/instrumentation/BUILD.bazel @@ -18,7 +18,7 @@ android_binary( manifest_values = { "applicationId": "org.oppia.android", "minSdkVersion": "19", - "targetSdkVersion": "31", + "targetSdkVersion": "30", "versionCode": "0", "versionName": "0.1-test", }, diff --git a/testing/build.gradle b/testing/build.gradle index 9e502acee95..25123a4dd84 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 30 buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 30 versionCode 1 versionName "1.0" } diff --git a/testing/src/test/AndroidManifest.xml b/testing/src/test/AndroidManifest.xml index 4682f548b88..be2a6519fab 100644 --- a/testing/src/test/AndroidManifest.xml +++ b/testing/src/test/AndroidManifest.xml @@ -1,5 +1,5 @@ + android:maxSdkVersion="30" /> diff --git a/utility/build.gradle b/utility/build.gradle index 4ffcde26c70..353ea924239 100644 --- a/utility/build.gradle +++ b/utility/build.gradle @@ -4,12 +4,12 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' android { - compileSdkVersion 31 + compileSdkVersion 30 buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 19 - targetSdkVersion 31 + targetSdkVersion 30 versionCode 1 versionName "1.0" javaCompileOptions { diff --git a/utility/src/main/AndroidManifest.xml b/utility/src/main/AndroidManifest.xml index 5a8bce58b67..f16271049d7 100644 --- a/utility/src/main/AndroidManifest.xml +++ b/utility/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - +