Update gradle and add namespaces

.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

androidbrowserhelper/build.gradle

@@ -20,6 +20,7 @@ apply plugin: 'maven-publish'
 def VERSION = "2.5.0";
 
 android {
+    namespace "com.google.androidbrowserhelper"
     compileSdkVersion 31
 
     defaultConfig {
@@ -39,8 +40,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     testOptions {
@@ -60,7 +61,7 @@ dependencies {
 
     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'

build.gradle

@@ -22,14 +22,21 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:8.7.3'
     }
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
+
+        maven {
+            url = "https://linkedin.jfrog.io/artifactory/open-source/"
+            content {
+                includeGroup 'com.linkedin.dexmaker'
+            }
+        }
     }
 }
 

demos/custom-tabs-example-app/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "org.chromium.customtabsdemos"
     compileSdkVersion 33
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "org.chromium.customtabsdemos"

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/CustomUIActivity.java

@@ -86,12 +86,8 @@ protected void onStop() {
     @Override
     public void onClick(View v) {
         int viewId = v.getId();
-        switch (viewId) {
-            case R.id.start_custom_tab:
-                openCustomTab();
-                break;
-            default:
-                //Unknown View Clicked
+        if (viewId == R.id.start_custom_tab) {
+            openCustomTab();
         }
     }
 

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/DemoListActivity.java

@@ -135,6 +135,7 @@ public ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int position)
 
         @Override
         public void onBindViewHolder(ViewHolder viewHolder, int position) {
+            position = viewHolder.getAdapterPosition();
             final ActivityDesc activityDesc = mActivityDescs.get(position);
             String title = activityDesc.mTitle;
             String description = activityDesc.mDescription;

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/EngagementSignalsActivity.java

@@ -183,12 +183,8 @@ private void unbindCustomTabsService() {
     @Override
     public void onClick(View v) {
         int viewId = v.getId();
-        switch (viewId) {
-            case R.id.start_custom_tab:
-                openCustomTab();
-                break;
-            default:
-                // Unknown View Clicked
+        if (viewId == R.id.start_custom_tab) {
+            openCustomTab();
         }
     }
 

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/NotificationParentActivity.java

@@ -14,6 +14,8 @@
 
 package org.chromium.customtabsdemos;
 
+import static org.chromium.customtabsdemos.R.*;
+
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -60,13 +62,9 @@ protected void onNewIntent(Intent intent) {
     @Override
     public void onClick(View v) {
         int viewId = v.getId();
-        switch (viewId) {
-            case R.id.create_notification:
-                createAndShowNotification();
-                finish();
-                break;
-            default:
-                //Unknown view clicked
+        if (viewId == R.id.create_notification) {
+            createAndShowNotification();
+            finish();
         }
     }
 
@@ -81,7 +79,7 @@ private void createAndShowNotification() {
         }
         NotificationCompat.Builder mBuilder =
                 new NotificationCompat.Builder(this, CT_NOTIFICATION_CHANNEL_ID)
-                        .setSmallIcon(R.drawable.abc_popup_background_mtrl_mult)
+                        .setSmallIcon(androidx.appcompat.R.drawable.abc_popup_background_mtrl_mult)
                         .setContentTitle(getString(R.string.notification_title))
                         .setContentText(getString(R.string.notification_text));
 

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/PartialCustomTabActivity.java

@@ -136,12 +136,8 @@ protected void onStop() {
     @Override
     public void onClick(View v) {
         int viewId = v.getId();
-        switch (viewId) {
-            case R.id.start_custom_tab:
-                openCustomTab();
-                break;
-            default:
-                // Unknown View Clicked
+        if (viewId == R.id.start_custom_tab) {
+            openCustomTab();
         }
     }
 

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/ServiceConnectionActivity.java

@@ -69,19 +69,14 @@ public void onCustomTabsDisconnected() {
     public void onClick(View view) {
         int viewId = view.getId();
         Uri uri  = Uri.parse(mUrlEditText.getText().toString());
-        switch (viewId) {
-            case R.id.button_may_launch_url:
-                customTabActivityHelper.mayLaunchUrl(uri, null, null);
-                break;
-            case R.id.start_custom_tab:
-                CustomTabsIntent customTabsIntent =
-                        new CustomTabsIntent.Builder(customTabActivityHelper.getSession())
-                        .build();
-                CustomTabActivityHelper.openCustomTab(
-                        this, customTabsIntent, uri, new WebviewFallback());
-                break;
-            default:
-                //Unkown View Clicked
+        if (viewId == R.id.button_may_launch_url) {
+            customTabActivityHelper.mayLaunchUrl(uri, null, null);
+        } else if (viewId == R.id.start_custom_tab) {
+            CustomTabsIntent customTabsIntent =
+                    new CustomTabsIntent.Builder(customTabActivityHelper.getSession())
+                            .build();
+            CustomTabActivityHelper.openCustomTab(
+                    this, customTabsIntent, uri, new WebviewFallback());
         }
     }
 }

demos/custom-tabs-example-app/src/main/java/org/chromium/customtabsdemos/SimpleCustomTabActivity.java

@@ -40,16 +40,11 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     public void onClick(View v) {
         int viewId = v.getId();
-
-        switch (viewId) {
-            case R.id.start_custom_tab:
-                String url = mUrlEditText.getText().toString();
-                CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder().build();
-                CustomTabActivityHelper.openCustomTab(
-                        this, customTabsIntent, Uri.parse(url), new WebviewFallback());
-                break;
-            default:
-                //Unknown View Clicked
+        if (viewId == R.id.start_custom_tab) {
+            String url = mUrlEditText.getText().toString();
+            CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder().build();
+            CustomTabActivityHelper.openCustomTab(
+                    this, customTabsIntent, Uri.parse(url), new WebviewFallback());
         }
     }
 }

demos/custom-tabs-headers/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.customtabsheaders"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsheaders"

demos/custom-tabs-navigation-callbacks/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.customtabssession"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks"

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" />

demos/custom-tabs-oauth/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.customtabsoauth"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsoauth"

demos/custom-tabs-session/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.customtabssession"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabssession"

demos/twa-basic/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.browser.examples.twa_basic"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_basic"

demos/twa-custom-launcher/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.demo"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper"
         minSdkVersion 23

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"

demos/twa-firebase-analytics/build.gradle

@@ -27,8 +27,8 @@ buildscript {
 }
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.twa_firebase_analytics"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.twa_firebase_analytics"

demos/twa-location-delegation/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.browser.examples.twa_location_delegation"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_location_delegation"

demos/twa-multi-domain/build.gradle

@@ -17,9 +17,9 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.browser.examples.twa_multi_domain"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
+
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_multi_domain"

demos/twa-notification-delegation/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace 'com.google.androidbrowserhelper.demos.twa_notification_delegation'
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.twa_notification_delegation"

demos/twa-offline-first/build.gradle

@@ -19,6 +19,7 @@ plugins {
 }
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.twa_offline_first"
     compileSdkVersion 31
 
     defaultConfig {

demos/twa-orientation/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.browser.examples.twa_orientation"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.browser.examples.twa_orientation"

demos/twa-play-billing/build.gradle

@@ -21,8 +21,8 @@ def appId = "com.google.androidbrowserhelper.demos.playbilling"
 // def appId = "dev.conn.drink"
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.playbilling"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId appId
         minSdkVersion 21

demos/twa-play-billing/src/main/java/com/google/androidbrowserhelper/demos/playbilling/MainActivity.java

@@ -38,7 +38,8 @@ public void launch(View view) {
         Intent intent = new Intent(this, LauncherActivity.class);
 
         intent.setData(
-                Uri.parse("https://beer.conn.dev?client_version=" + BuildConfig.VERSION_CODE));
+                Uri.parse("https://beer.conn.dev")
+        );
 
         startActivity(intent);
     }

demos/twa-post-message/build.gradle

@@ -19,6 +19,7 @@ plugins {
 }
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.twapostmessage"
     // If you are changing this to below 31 you will need to ask for Permission
     // for notification to work.
     compileSdkVersion 33

demos/twa-post-message/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.androidbrowserhelper.demos.twapostmessage">
 
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
   <queries>
     <intent>
       <action android:name="android.support.customtabs.action.CustomTabsService" />

demos/twa-web-share-target/build.gradle

@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.webshare"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.webshare"