commit c7fa63d4c5fc1ebf5b0827bc26d7f60bfe659743
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 15 06:35:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 15 06:35:05 2021 +0000
tree e4444dfce56d9b592a8c7edf3c81a4220690e537
parent 16a01e7c0d69d393c8e903e4a7c9f8391a0e4398
parent c880212a59823aa8306a11088d4168fe3fc2007e

Merge "Bump targetSdkVersion to "30"" am: c880212a59

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1737355

Change-Id: I63caa1f35eeda340064f05c0310d3a5eccbb1690

java/Android.bp

diff --git a/java/Android.bp b/java/Android.bp
index e3e644c..613b451 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -53,8 +53,8 @@
     // Include all the resources regardless of system supported locales
     aapt_include_all_resources: true,
 
-    min_sdk_version: "14",
-    target_sdk_version: "23",
+    min_sdk_version: "21",
+    target_sdk_version: "30",
     sdk_version: "current",
 
     product_specific: true,

java/AndroidManifest.xml

diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 9b14928..ac84c33 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -17,10 +17,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      coreApp="true"
      package="com.android.inputmethod.latin"
-     android:versionCode="28">
+     android:versionCode="30">
 
     <uses-sdk android:minSdkVersion="21"
-         android:targetSdkVersion="28"/>
+         android:targetSdkVersion="30"/>
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"/>

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index e1db354..4c5b74a 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -50,6 +50,6 @@
     instrumentation_for: "LatinIME",
 
     min_sdk_version: "14",
-    target_sdk_version: "21",
+    target_sdk_version: "30",
     sdk_version: "current",
 }

tests/AndroidManifest.xml

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index e788e0b..95ddb0a 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -16,9 +16,9 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.inputmethod.latin.tests"
-    android:versionCode="28">
+    android:versionCode="30">
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
 
     <uses-permission android:name="android.permission.READ_CONTACTS" />