Merge pull request #343 from andreban/target-sdk-31

Updates libraries and demos to target SDK 31
GoogleChrome · Nov 8, 2021 · 6be9bb7 · 6be9bb7
2 parents dce4f4b + dcedab8
commit 6be9bb7
Show file tree

Hide file tree

Showing 34 changed files with 71 additions and 50 deletions.
diff --git a/demos/custom-tabs-example-app/build.gradle b/demos/custom-tabs-example-app/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "org.chromium.customtabsdemos"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/custom-tabs-example-app/src/main/AndroidManifest.xml b/demos/custom-tabs-example-app/src/main/AndroidManifest.xml
@@ -22,7 +22,8 @@
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar">
 
         <activity android:name=".DemoListActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -71,7 +72,6 @@
         </activity>
 
         <receiver android:name=".ActionBroadcastReceiver" />
-
     </application>
 
     <queries>

diff --git a/demos/custom-tabs-headers/build.gradle b/demos/custom-tabs-headers/build.gradle
@@ -23,7 +23,7 @@ android {
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsheaders"
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/demos/custom-tabs-headers/src/main/AndroidManifest.xml b/demos/custom-tabs-headers/src/main/AndroidManifest.xml
@@ -27,7 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/demos/custom-tabs-navigation-callbacks/build.gradle b/demos/custom-tabs-navigation-callbacks/build.gradle
@@ -23,7 +23,7 @@ android {
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks"
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/demos/custom-tabs-navigation-callbacks/src/main/AndroidManifest.xml b/demos/custom-tabs-navigation-callbacks/src/main/AndroidManifest.xml
@@ -27,7 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/demos/custom-tabs-oauth/build.gradle b/demos/custom-tabs-oauth/build.gradle
@@ -23,7 +23,7 @@ android {
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsoauth"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/custom-tabs-oauth/src/main/AndroidManifest.xml b/demos/custom-tabs-oauth/src/main/AndroidManifest.xml
@@ -25,7 +25,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/demos/custom-tabs-session/build.gradle b/demos/custom-tabs-session/build.gradle
@@ -23,7 +23,7 @@ android {
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabssession"
         minSdkVersion 25
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/demos/custom-tabs-session/src/main/AndroidManifest.xml b/demos/custom-tabs-session/src/main/AndroidManifest.xml
@@ -27,7 +27,9 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/demos/twa-basic/build.gradle b/demos/twa-basic/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_basic"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-basic/src/main/AndroidManifest.xml b/demos/twa-basic/src/main/AndroidManifest.xml
@@ -27,7 +27,8 @@
             android:resource="@string/asset_statements" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://airhorner.com" />
 

diff --git a/demos/twa-custom-launcher/build.gradle b/demos/twa-custom-launcher/build.gradle
@@ -18,11 +18,11 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/demos/twa-custom-launcher/src/main/AndroidManifest.xml b/demos/twa-custom-launcher/src/main/AndroidManifest.xml
@@ -26,7 +26,8 @@
 
         <activity
             android:name="com.google.androidbrowserhelper.launchtwa.LaunchTwaActivity"
-            android:label="@string/launch_twa">
+            android:label="@string/launch_twa"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/demos/twa-firebase-analytics/build.gradle b/demos/twa-firebase-analytics/build.gradle
@@ -33,7 +33,7 @@ android {
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.twa_firebase_analytics"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-firebase-analytics/src/main/AndroidManifest.xml b/demos/twa-firebase-analytics/src/main/AndroidManifest.xml
@@ -27,7 +27,8 @@
 
         <activity android:name=".FirebaseAnalyticsLauncherActivity"
             android:label="@string/app_name"
-            android:screenOrientation="landscape">
+            android:screenOrientation="landscape"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://airhorner.com" />
 

diff --git a/demos/twa-location-delegation/build.gradle b/demos/twa-location-delegation/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_location_delegation"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-location-delegation/src/main/AndroidManifest.xml b/demos/twa-location-delegation/src/main/AndroidManifest.xml
@@ -40,7 +40,8 @@
             android:resource="@string/asset_statements" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://pwa.eirage.com/Location/index.html" />
 

diff --git a/demos/twa-multi-domain/build.gradle b/demos/twa-multi-domain/build.gradle
@@ -18,13 +18,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_multi_domain"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-multi-domain/src/main/AndroidManifest.xml b/demos/twa-multi-domain/src/main/AndroidManifest.xml
@@ -27,7 +27,8 @@
             android:resource="@string/asset_statements" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
 
             <!-- Additional origins to be validated with Digital AssetLinks are listed under
                 this meta-tag, which points to a string-array in strings.xml -->

diff --git a/demos/twa-notification-delegation/build.gradle b/demos/twa-notification-delegation/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.twa_notification_delegation"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-notification-delegation/src/main/AndroidManifest.xml b/demos/twa-notification-delegation/src/main/AndroidManifest.xml
@@ -26,7 +26,8 @@
             android:resource="@string/asset_statements" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://twa-tests.firebaseapp.com" />
 

diff --git a/demos/twa-offline-first/build.gradle b/demos/twa-offline-first/build.gradle
@@ -24,7 +24,7 @@ android {
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.twa_offline_first"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/demos/twa-offline-first/src/main/AndroidManifest.xml b/demos/twa-offline-first/src/main/AndroidManifest.xml
@@ -23,7 +23,8 @@
         android:theme="@style/Theme.Design.NoActionBar">
 
         <activity android:name=".OfflineFirstTWALauncherActivity"
-            android:theme="@style/Theme.Design.NoActionBar">
+            android:theme="@style/Theme.Design.NoActionBar"
+            android:exported="true">
 
             <!-- Edit android:value to change the url opened by the Trusted Web Activity -->
             <intent-filter>

diff --git a/demos/twa-orientation/build.gradle b/demos/twa-orientation/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_orientation"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-orientation/src/main/AndroidManifest.xml b/demos/twa-orientation/src/main/AndroidManifest.xml
@@ -26,7 +26,8 @@
             android:resource="@string/asset_statements" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://tulip-forest-limpet.glitch.me" />
 

diff --git a/demos/twa-play-billing/build.gradle b/demos/twa-play-billing/build.gradle
@@ -22,11 +22,11 @@ def appId = "com.google.androidbrowserhelper.demos.playbilling"
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId appId
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 13
         versionName "13.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/demos/twa-play-billing/src/main/AndroidManifest.xml b/demos/twa-play-billing/src/main/AndroidManifest.xml
@@ -24,7 +24,8 @@
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -42,7 +43,8 @@
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://beer.conn.dev" />
 

diff --git a/demos/twa-web-share-target/build.gradle b/demos/twa-web-share-target/build.gradle
@@ -18,12 +18,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.webshare"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
     }

diff --git a/demos/twa-web-share-target/src/main/AndroidManifest.xml b/demos/twa-web-share-target/src/main/AndroidManifest.xml
@@ -21,7 +21,8 @@
         android:supportsRtl="true">
 
         <activity
-            android:name="com.google.androidbrowserhelper.webshare.MainActivity">
+            android:name="com.google.androidbrowserhelper.webshare.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -31,7 +32,8 @@
         <activity
             android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
             android:label="@string/app_name"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:exported="true">
 
             <!--
                 Intent filter to receive shares.

diff --git a/demos/twa-webview-fallback/build.gradle b/demos/twa-webview-fallback/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 31
-    buildToolsVersion "29.0.3"
+    buildToolsVersion "30.0.3"
 
 
     defaultConfig {
         applicationId "com.google.browser.examples.twawebviewfallback"
         minSdkVersion 26
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 

diff --git a/demos/twa-webview-fallback/src/main/AndroidManifest.xml b/demos/twa-webview-fallback/src/main/AndroidManifest.xml
@@ -14,7 +14,8 @@
             android:resource="@string/asset_statements" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                 android:value="https://pwa-directory.appspot.com" />