Merge branch 'develop' into text-view-script

oppia · Dec 29, 2024 · b3247dd · b3247dd
2 parents ecb097e + 11aba3a
commit b3247dd
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 45 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
@@ -72,9 +72,9 @@ runs:
         $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platform-tools"
       shell: bash
 
-    - name: Install SDK 33
+    - name: Install SDK 34
       run: |
-        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-33"
+        $ANDROID_HOME/cmdline-tools/tools/bin/sdkmanager --install "platforms;android-34"
       shell: bash
 
     - name: Install build tools 32.0.0

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,11 +6,6 @@ name: Unit Tests (Robolectric -- Gradle)
 # events or push events in the develop branch.
 on:
   workflow_dispatch:
-  pull_request:
-  push:
-    branches:
-      # Push events on develop branch
-      - develop
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.run_id }}

diff --git a/BUILD.bazel b/BUILD.bazel
@@ -119,14 +119,14 @@ package_group(
             "flavor": "oppia",
             "min_sdk_version": 21,
             "multidex": "native",
-            "target_sdk_version": 33,
+            "target_sdk_version": 34,
         },
         {
             "flavor": "oppia_kitkat",
             "main_dex_list": "//:config/kitkat_main_dex_class_list.txt",
             "min_sdk_version": 21,
             "multidex": "manual_main_dex",
-            "target_sdk_version": 33,
+            "target_sdk_version": 34,
         },
     ]
 ]

diff --git a/app/build.gradle b/app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 33
-  buildToolsVersion "30.0.2"
+  compileSdkVersion 34
+  buildToolsVersion "30.0.0"
   defaultConfig {
     applicationId "org.oppia.android"
     minSdkVersion 21
-    targetSdkVersion 33
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
     multiDexEnabled true

diff --git a/app/src/main/AppAndroidManifest.xml b/app/src/main/AppAndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.ui">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/DatabindingAdaptersManifest.xml b/app/src/main/DatabindingAdaptersManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.databinding.adapters">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/DatabindingResourcesManifest.xml b/app/src/main/DatabindingResourcesManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.databinding">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/RecyclerviewAdaptersManifest.xml b/app/src/main/RecyclerviewAdaptersManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.recyclerview.adapters">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/ViewModelManifest.xml b/app/src/main/ViewModelManifest.xml
@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.vm">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/ViewModelsManifest.xml b/app/src/main/ViewModelsManifest.xml
@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.view.models">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/ViewsManifest.xml b/app/src/main/ViewsManifest.xml
@@ -3,5 +3,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.app.views">
   <uses-sdk android:minSdkVersion="19"
-    android:targetSdkVersion="33" />
+    android:targetSdkVersion="34" />
 </manifest>
diff --git a/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt b/app/src/main/java/org/oppia/android/app/utility/FontScaleConfigurationUtil.kt
@@ -21,6 +21,8 @@ class FontScaleConfigurationUtil @Inject constructor() {
     // TODO(#3616): Migrate to the proper SDK 30+ APIs.
     @Suppress("DEPRECATION") // The code is correct for targeted versions of Android.
     windowManager!!.defaultDisplay.getMetrics(metrics)
+    // TODO(#5625): Migrate away from scaledDensity.
+    @Suppress("DEPRECATION")
     metrics.scaledDensity = configuration.fontScale * metrics.density
     context.createConfigurationContext(configuration)
     context.resources.displayMetrics.setTo(metrics)

diff --git a/app/src/test/resources/robolectric.properties b/app/src/test/resources/robolectric.properties
@@ -1,3 +1,3 @@
 # app/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 34
 sdk=30
diff --git a/build_flavors.bzl b/build_flavors.bzl
@@ -44,7 +44,7 @@ _FLAVOR_METADATA = {
     "dev": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 33,
+        "target_sdk_version": 34,
         "multidex": "native",
         "proguard_specs": [],  # Developer builds are not optimized.
         "production_release": False,
@@ -58,7 +58,7 @@ _FLAVOR_METADATA = {
     "dev_kitkat": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 33,
+        "target_sdk_version": 34,
         "multidex": "manual_main_dex",
         "main_dex_list": _MAIN_DEX_LIST_TARGET_KITKAT,
         "proguard_specs": [],  # Developer builds are not optimized.
@@ -73,7 +73,7 @@ _FLAVOR_METADATA = {
     "alpha": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 33,
+        "target_sdk_version": 34,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,
@@ -87,7 +87,7 @@ _FLAVOR_METADATA = {
     "alpha_kitkat": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 33,
+        "target_sdk_version": 34,
         "multidex": "manual_main_dex",
         "main_dex_list": _MAIN_DEX_LIST_TARGET_KITKAT,
         "proguard_specs": [],
@@ -102,7 +102,7 @@ _FLAVOR_METADATA = {
     "beta": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 33,
+        "target_sdk_version": 34,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,
@@ -116,7 +116,7 @@ _FLAVOR_METADATA = {
     "ga": {
         "manifest": "//app:src/main/AndroidManifest.xml",
         "min_sdk_version": 21,
-        "target_sdk_version": 33,
+        "target_sdk_version": 34,
         "multidex": "native",
         "proguard_specs": _PRODUCTION_PROGUARD_SPECS,
         "production_release": True,

diff --git a/build_vars.bzl b/build_vars.bzl
@@ -1,2 +1,2 @@
-BUILD_SDK_VERSION = 33
+BUILD_SDK_VERSION = 34
 BUILD_TOOLS_VERSION = "32.0.0"
diff --git a/config/src/java/org/oppia/android/config/AndroidManifest.xml b/config/src/java/org/oppia/android/config/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.config">
 
-  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
+  <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="34" />
 </manifest>
diff --git a/data/build.gradle b/data/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 33
-  buildToolsVersion "30.0.2"
+  compileSdkVersion 34
+  buildToolsVersion "30.0.0"
 
   defaultConfig {
     minSdkVersion 21
-    targetSdkVersion 33
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/domain/build.gradle b/domain/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 33
-  buildToolsVersion "30.0.2"
+  compileSdkVersion 34
+  buildToolsVersion "30.0.0"
 
   defaultConfig {
     minSdkVersion 21
-    targetSdkVersion 33
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
     javaCompileOptions {

diff --git a/domain/src/main/AndroidManifest.xml b/domain/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.domain">
-  <uses-sdk android:targetSdkVersion="33" />
+  <uses-sdk android:targetSdkVersion="34" />
 </manifest>
diff --git a/domain/src/test/resources/robolectric.properties b/domain/src/test/resources/robolectric.properties
@@ -1,3 +1,3 @@
 # domain/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 34
 sdk=30
diff --git a/scripts/src/javatests/org/oppia/android/scripts/common/AndroidBuildSdkPropertiesTest.kt b/scripts/src/javatests/org/oppia/android/scripts/common/AndroidBuildSdkPropertiesTest.kt
@@ -19,7 +19,7 @@ class AndroidBuildSdkPropertiesTest {
   fun testBuildSdkVersion_isTheCorrectSdkVersion() {
     val properties = AndroidBuildSdkProperties()
 
-    assertThat(properties.buildSdkVersion).isEqualTo(33)
+    assertThat(properties.buildSdkVersion).isEqualTo(34)
   }
 
   @Test

diff --git a/testing/build.gradle b/testing/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 33
-  buildToolsVersion "30.0.2"
+  compileSdkVersion 34
+  buildToolsVersion "30.0.0"
 
   defaultConfig {
     minSdkVersion 21
-    targetSdkVersion 33
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
   }

diff --git a/testing/src/test/resources/robolectric.properties b/testing/src/test/resources/robolectric.properties
@@ -1,3 +1,3 @@
 # testing/src/test/resources/robolectric.properties
-# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 33
+# TODO(#4748): Remove the need for this file after upgrading Robolectric tests to API 34
 sdk=30
diff --git a/utility/build.gradle b/utility/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-  compileSdkVersion 33
-  buildToolsVersion "30.0.2"
+  compileSdkVersion 34
+  buildToolsVersion "30.0.0"
 
   defaultConfig {
     minSdkVersion 21
-    targetSdkVersion 33
+    targetSdkVersion 34
     versionCode 1
     versionName "1.0"
     javaCompileOptions {

diff --git a/utility/src/main/AndroidManifest.xml b/utility/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.oppia.android.util">
-  <uses-sdk android:targetSdkVersion="33" />
+  <uses-sdk android:targetSdkVersion="34" />
 </manifest>