From 07ce283acd2cb0549053cb8fd48f496fb6a685ad Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Tue, 15 Jun 2021 11:13:09 -0700
Subject: Bump targetSdkVersion to "30"

With this CL, versionCode, targetSdkVersion and minSdkVersion will be
bumped/set as follows:

       versionCode: 28 -> 30
  targetSdkVersion: 28 -> 30
     minSdkVersion: 21

As far as we know, there should be no user-visible behavior change on
supported OS versions.

Fix: 189558760
Test: manually verified that LatinIME still is functional
Change-Id: I3a7deb452960b370f5290f3d1bac9c79fe935303
Merged-In: I4bf7588c62fb77bf78d4afcb665e9bfbbef53966
(cherry picked from commit 360052f3044eee612af1cbfcd1f2e202096e3541)
---
 java/Android.bp          | 4 ++--
 java/AndroidManifest.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'java')

diff --git a/java/Android.bp b/java/Android.bp
index e3e644cf3..613b45148 100644
--- a/java/Android.bp
+++ b/java/Android.bp
@@ -53,8 +53,8 @@ android_app {
     // 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,
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 9b149287a..ac84c3388 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"/>
-- 
cgit v1.2.3-83-g751a