EiraGe · EiraGe · Oct 25, 2024 · Oct 25, 2024 · Oct 25, 2024 · Oct 25, 2024
diff --git a/.github/workflows/android.yml b/.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
diff --git a/androidbrowserhelper/build.gradle b/androidbrowserhelper/build.gradle
@@ -20,13 +20,12 @@ apply plugin: 'maven-publish'
 def VERSION = "2.5.0";
 
 android {
-    compileSdkVersion 31
+    namespace "com.google.androidbrowserhelper"
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 31
-        versionCode 1
-        versionName VERSION
+        minSdk 21
+        compileSdk 34
+        targetSdk 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -39,8 +38,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     testOptions {
@@ -58,16 +57,16 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.core:core:1.0.2'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:3.0.0'
     testImplementation 'org.robolectric:robolectric:4.4'
 
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test:runner:1.6.1'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
     androidTestImplementation 'org.mockito:mockito-core:3.0.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.0'
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.28.4'
+    androidTestImplementation 'junit:junit:4.13.2'
 }
 
 publishing {

diff --git a/androidbrowserhelper/src/androidTest/AndroidManifest.xml b/androidbrowserhelper/src/androidTest/AndroidManifest.xml
@@ -13,9 +13,8 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="android.support.customtabs">
-    <uses-sdk android:minSdkVersion="16"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <uses-sdk android:minSdkVersion="21"/>
 
     <application>
 
@@ -26,7 +25,8 @@
         </activity>
 
         <activity android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestActivity"
-                  android:enabled="false">
+                  android:enabled="false"
+                  android:exported="false">
             <!-- A browsable intent filter is required for the DelegationService. -->
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -43,14 +43,16 @@
         </activity>
 
         <service android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestCustomTabsService"
-                 android:enabled="false">
+                 android:enabled="false"
+                 android:exported="false">
             <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="false">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
                 <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
@@ -60,17 +62,17 @@
         </service>
 
         <service android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestCustomTabsServiceNoSplashScreens"
-                 android:enabled="false">
+                 android:enabled="false"
+                 android:exported="false">
             <intent-filter>
                 <action android:name="android.support.customtabs.action.CustomTabsService" />
                 <category android:name="androidx.browser.trusted.category.TrustedWebActivities" />
             </intent-filter>
         </service>
 
         <activity android:name="com.google.androidbrowserhelper.trusted.testcomponents.TestBrowser"
-                  android:theme="@style/Theme.AppCompat.Light"
                   android:exported="true"
-                  android:enabled="false">
+                  android:enabled="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -83,8 +85,8 @@
 
         <activity android:name="com.google.androidbrowserhelper.trusted.LauncherActivity"
                   android:label="Test Launcher Activity"
-                  android:theme="@style/Theme.AppCompat.Light"
-                  android:enabled="false">
+                  android:enabled="false"
+                  android:exported="false">
 
             <meta-data android:name="android.support.customtabs.trusted.DEFAULT_URL"
                        android:value="https://www.test.com/default_url/" />

diff --git a/.../androidTest/java/com/google/androidbrowserhelper/trusted/testcomponents/TestBrowser.java b/.../androidTest/java/com/google/androidbrowserhelper/trusted/testcomponents/TestBrowser.java
@@ -14,19 +14,19 @@
 
 package com.google.androidbrowserhelper.trusted.testcomponents;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.os.Looper;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * A fake Browser that accepts browsable Intents.
  */
-public class TestBrowser extends AppCompatActivity {
+public class TestBrowser extends Activity {
 
     private final CountDownLatch mResumeLatch = new CountDownLatch(1);
 

diff --git a/androidbrowserhelper/src/main/AndroidManifest.xml b/androidbrowserhelper/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
     limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.androidbrowserhelper">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />

diff --git a/build.gradle b/build.gradle
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:8.3.2'
     }
 }
 

diff --git a/demos/custom-tabs-example-app/build.gradle b/demos/custom-tabs-example-app/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
+    namespace "org.chromium.customtabsdemos"
 
     defaultConfig {
         applicationId "org.chromium.customtabsdemos"
-        minSdkVersion 26
-        targetSdkVersion 31
+        minSdk 21
+        compileSdk 34
+        targetSdk 34
         versionCode 1
         versionName "1.0"
     }
@@ -45,7 +45,7 @@ dependencies {
     implementation project(path: ':androidbrowserhelper')
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.browser:browser:1.6.0-alpha01'
+    implementation 'androidx.browser:browser:1.6.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.core:core:1.1.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'

diff --git a/demos/custom-tabs-example-app/src/main/AndroidManifest.xml b/demos/custom-tabs-example-app/src/main/AndroidManifest.xml
@@ -11,8 +11,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.chromium.customtabsdemos">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <queries>
         <intent>

diff --git a/demos/custom-tabs-headers/build.gradle b/demos/custom-tabs-headers/build.gradle
@@ -17,13 +17,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
+    namespace "com.google.androidbrowserhelper.demos.customtabsheaders"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsheaders"
-        minSdkVersion 25
-        targetSdkVersion 31
+        minSdk 21
+        compileSdk 34
+        targetSdk 34
         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
@@ -12,8 +12,7 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.androidbrowserhelper.demos.customtabsheaders">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />

diff --git a/demos/custom-tabs-navigation-callbacks/build.gradle b/demos/custom-tabs-navigation-callbacks/build.gradle
@@ -17,13 +17,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
+    namespace "com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks"
-        minSdkVersion 25
-        targetSdkVersion 31
+        minSdk 21
+        compileSdk 34
+        targetSdk 34
         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
@@ -12,8 +12,7 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.androidbrowserhelper.demos.customtabssession">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />

diff --git a/...demos/customtabssession/MainActivity.java → ...tabsnavigationcallbacks/MainActivity.java b/...demos/customtabssession/MainActivity.java → ...tabsnavigationcallbacks/MainActivity.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package com.google.androidbrowserhelper.demos.customtabssession;
+package com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

diff --git a/demos/custom-tabs-oauth/build.gradle b/demos/custom-tabs-oauth/build.gradle
@@ -17,13 +17,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
+    namespace "com.google.androidbrowserhelper.demos.customtabsoauth"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsoauth"
-        minSdkVersion 23
-        targetSdkVersion 31
+        minSdk 23
+        compileSdk 34
+        targetSdk 34
         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
@@ -12,8 +12,7 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.androidbrowserhelper.demos.customtabsoauth">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- This permission is required to query the GitHub API via an HttpUrlConnection. -->
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/demos/custom-tabs-session/build.gradle b/demos/custom-tabs-session/build.gradle
@@ -17,13 +17,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
+    namespace "com.google.androidbrowserhelper.demos.customtabssession"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabssession"
-        minSdkVersion 25
-        targetSdkVersion 31
+        minSdk 25
+        compileSdk 34
+        targetSdk 34
         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
@@ -12,8 +12,7 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.androidbrowserhelper.demos.customtabssession">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />

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

diff --git a/demos/twa-basic/src/main/AndroidManifest.xml b/demos/twa-basic/src/main/AndroidManifest.xml
@@ -12,8 +12,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.browser.examples.twa_basic">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"

diff --git a/demos/twa-custom-launcher/build.gradle b/demos/twa-custom-launcher/build.gradle
@@ -17,12 +17,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
+    namespace "com.google.androidbrowserhelper.demo"
     defaultConfig {
-        applicationId "com.google.androidbrowserhelper"
-        minSdkVersion 23
-        targetSdkVersion 31
+        applicationId "com.google.androidbrowserhelper.demo"
+        minSdk 23
+        compileSdk 34
+        targetSdk 34
         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
@@ -12,8 +12,7 @@
     limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.androidbrowserhelper.demo">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"