List of included changes:

  - Internal change
  - Update sample app's targetSdkVersion to 31
  - na
  - Update Android sample apps' compileSdkVersion to 31
  - Add proguard build type for Entity Extraction and language ID sample apps
  - Update minSdkVersion from 16 to 19

PiperOrigin-RevId: 408440136
Change-Id: I15a36a7aa4deaa9805596e019e541f4fa28a9bb9

android/entityextraction/app/build.gradle

@@ -3,16 +3,24 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         applicationId "com.google.mlkit.samples.nl.entityextraction"
-        minSdkVersion 16
-        targetSdkVersion 30
+        minSdkVersion 19
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }
 
     buildTypes {
+        proguard {
+            debuggable false
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro', 'proguard.cfg'
+            testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro', 'proguard.cfg'
+        }
+        testBuildType "proguard"
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -28,7 +36,7 @@ dependencies {
     implementation project(':internal:chooserx')
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.mlkit:entity-extraction:16.0.0-beta2'
+    implementation 'com.google.mlkit:entity-extraction:16.0.0-beta3'
 
     // Optional dependency used for the Snackbar
     implementation 'com.google.android.material:material:1.2.0'

android/entityextraction/build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.5.0'
 
     repositories {
         google()

android/entityextraction/gradle.properties

@@ -1,2 +1,8 @@
 android.useAndroidX=true
 android.enableJetifier=true
+
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# Uses one worker to build. This helps resolve build OOM issue.
+org.gradle.workers.max=1