Update stable branch up to release 2.6.1

.github/workflows/android.yml

@@ -9,9 +9,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: set up JDK 1.8
+    - name: set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 17
     - name: Build with Gradle
       run: ./gradlew build

README.md

@@ -1,6 +1,6 @@
 # Android Browser Helper
 
-![CI Status Badge](https://github.com/GoogleChrome/android-browser-helper/workflows/Android%20CI/badge.svg)
+![CI Status Badge](https://github.com/GoogleChrome/android-browser-helper/actions/workflows/android.yml/badge.svg?branch=main)
 
 The Android Browser Helper library helps developers use Custom Tabs and Trusted
 Web Activities on top of the AndroidX browser support library.
@@ -19,7 +19,7 @@ Android Browser helper is available on the Google Maven. To use it, modify your
 ```gradle
 dependencies {
     //...
-    implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.3.0'
+    implementation 'com.google.androidbrowserhelper:androidbrowserhelper:2.4.0'
 }
 
 ``` 

androidbrowserhelper/build.gradle

@@ -17,17 +17,24 @@
 apply plugin: 'com.android.library'
 apply plugin: 'maven-publish'
 
-def VERSION = "2.4.0";
+// Before 2.6.1, the version code was unused and was kept at 1.
+// This is now being used to report metrics, and should be bumped with
+// every version bump.
+def VERSION = "2.6.1";
+def VERSION_CODE = 1;
 
 android {
-    compileSdkVersion 31
+    namespace "com.google.androidbrowserhelper"
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
+        compileSdk 36
         targetSdkVersion 31
-        versionCode 1
+        versionCode VERSION_CODE
         versionName VERSION
 
+        buildConfigField "int", "LIBRARY_VERSION", "${versionCode}"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -38,9 +45,13 @@ android {
         }
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     testOptions {
@@ -51,16 +62,21 @@ android {
 }
 
 dependencies {
-    api 'androidx.browser:browser:1.4.0'
+    // Force newest versions of kotlin and coroutines to avoid duplicate classes in kotlin-stdlib
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
+    implementation(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
+
+    api 'androidx.browser:browser:1.9.0-alpha04'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.core:core:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:3.0.0'
-    testImplementation 'org.robolectric:robolectric:4.4'
+    testImplementation 'org.robolectric:robolectric:4.12.2'
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'

androidbrowserhelper/src/androidTest/AndroidManifest.xml

@@ -14,10 +14,22 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.customtabs">
+    xmlns:tools="http://schemas.android.com/tools">
     <uses-sdk android:minSdkVersion="16"/>
 
     <application>
+        <activity android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
+            android:exported="true"
+            tools:node="merge"
+            tools:replace="android:exported" />
+        <activity android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
+            android:exported="true"
+            tools:node="merge"
+            tools:replace="android:exported" />
+        <activity android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
+            android:exported="true"
+            tools:node="merge"
+            tools:replace="android:exported" />
 
         <activity android:name="com.google.androidbrowserhelper.trusted.ManageDataLauncherActivity">
             <meta-data
@@ -26,7 +38,7 @@
         </activity>
 
         <activity android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestActivity"
-                  android:enabled="false">
+                  android:enabled="false" android:exported="true">
             <!-- A browsable intent filter is required for the DelegationService. -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -43,14 +55,14 @@
         </activity>
 
         <service android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestCustomTabsService"
-                 android:enabled="false">
+                 android:enabled="false" android:exported="true">
             <intent-filter>
                 <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
             </intent-filter>
         </service>
 
         <service android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestCustomTabsServiceSupportsTwas"
-                 android:enabled="false">
+                 android:enabled="false" android:exported="true">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
                 <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
@@ -60,7 +72,7 @@
         </service>
 
         <service android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestCustomTabsServiceNoSplashScreens"
-                 android:enabled="false">
+                 android:enabled="false" android:exported="true">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
                 <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
@@ -82,9 +94,10 @@
         </activity>
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
-                  android:label="Test Launcher Activity"
                   android:theme="@style/Theme.AppCompat.Light"
-                  android:enabled="false">
+                  android:label="Test Launcher Activity"
+                  android:enabled="false"
+                  android:exported="true">
 
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                        android:value="https://www.test.com/default_url/" />

androidbrowserhelper/src/androidTest/java/com/google/androidbrowserhelper/trusted/splashscreens/PwaWrapperSplashScreenStrategyTest.java

@@ -100,7 +100,7 @@ public void setUp() {
         mActivity = mActivityTestRule.getActivity();
         mSession = mConnectionRule.establishSessionBlocking(mActivity);
         mStrategy = new PwaWrapperSplashScreenStrategy(mActivity, R.drawable.splash, 0,
-                ImageView.ScaleType.FIT_XY, null, 0, FILE_PROVIDER_AUTHORITY);
+                ImageView.ScaleType.FIT_XY, null, 0, FILE_PROVIDER_AUTHORITY, false);
     }
 
     @After
@@ -145,7 +145,7 @@ public void setsParametersOnTwaBuilder() throws InterruptedException {
 
         PwaWrapperSplashScreenStrategy strategy = new PwaWrapperSplashScreenStrategy(mActivity,
                 R.drawable.splash, bgColor, scaleType, matrix, fadeOutDuration,
-                FILE_PROVIDER_AUTHORITY);
+                FILE_PROVIDER_AUTHORITY, false);
         strategy.onActivityEnterAnimationComplete();
         initiateLaunch(strategy);