Consolidate libraries versions

ukaratkevich · gstepniewski-google · commit d3e9f42f644b · 2025-08-07T18:30:05.000+02:00
Introducing libs.toml and fixing build errors caused by versions
changes.
diff --git a/androidbrowserhelper/build.gradle b/androidbrowserhelper/build.gradle
@@ -63,28 +63,28 @@ android {
 
 dependencies {
     // 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"))
+    implementation(platform(libs.kotlin.bom))
+    implementation(platform(libs.kotlin.coroutines.bom))
 
-    api 'androidx.browser:browser:1.9.0-alpha04'
+    api libs.androidx.browser
 
     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'
-    implementation 'com.google.guava:guava:33.4.8-android'
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:3.0.0'
-    testImplementation 'org.robolectric:robolectric:4.12.2'
-
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'org.mockito:mockito-core:3.0.0'
-    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.0'
-    androidTestImplementation 'junit:junit:4.12'
+    implementation libs.androidx.annotation
+    implementation libs.androidx.core
+    implementation libs.androidx.appcompat
+    implementation libs.guava
+
+    testImplementation libs.junit
+    testImplementation libs.mockito.core
+    testImplementation libs.robolectric
+
+    androidTestImplementation libs.androidx.runner
+    androidTestImplementation libs.androidx.rules
+    androidTestImplementation libs.androidx.ext.junit
+    androidTestImplementation libs.mockito.core
+    androidTestImplementation libs.dexmaker.mockito
+    androidTestImplementation libs.junit
 }
 
 publishing {
diff --git a/androidbrowserhelper/src/test/java/com/google/androidbrowserhelper/trusted/ManageDataLauncherActivityTest.java b/androidbrowserhelper/src/test/java/com/google/androidbrowserhelper/trusted/ManageDataLauncherActivityTest.java
@@ -20,7 +20,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
diff --git a/androidbrowserhelper/src/test/java/com/google/androidbrowserhelper/trusted/TwaProviderPickerTest.java b/androidbrowserhelper/src/test/java/com/google/androidbrowserhelper/trusted/TwaProviderPickerTest.java
@@ -16,7 +16,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.robolectric.Shadows.shadowOf;
 
diff --git a/demos/custom-tabs-auth-tab/build.gradle b/demos/custom-tabs-auth-tab/build.gradle
@@ -42,10 +42,10 @@ android {
 dependencies {
     implementation project(path: ':androidbrowserhelper')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.activity:activity:1.9.3'
-    implementation 'androidx.browser:browser:1.9.0'
-    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.annotation:annotation:1.9.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.activity
+    implementation libs.androidx.browser
+    implementation libs.material
+    implementation libs.androidx.annotation
+    implementation libs.androidx.constraintlayout
 }
diff --git a/demos/custom-tabs-ephemeral-with-fallback/build.gradle b/demos/custom-tabs-ephemeral-with-fallback/build.gradle
@@ -43,10 +43,10 @@ android {
 dependencies {
     implementation project(path: ':androidbrowserhelper')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.activity:activity:1.9.3'
-    implementation 'androidx.browser:browser:1.9.0-alpha01'
-    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.annotation:annotation:1.9.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.activity
+    implementation libs.androidx.browser
+    implementation libs.material
+    implementation libs.androidx.annotation
+    implementation libs.androidx.constraintlayout
 }
diff --git a/demos/custom-tabs-ephemeral-with-fallback/src/main/java/com/google/androidbrowserhelper/demos/customtabsephemeralwithfallback/MainActivity.java b/demos/custom-tabs-ephemeral-with-fallback/src/main/java/com/google/androidbrowserhelper/demos/customtabsephemeralwithfallback/MainActivity.java
@@ -24,14 +24,14 @@
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.widget.Button;
+
 import androidx.annotation.NonNull;
-import androidx.annotation.OptIn;
 import androidx.browser.customtabs.CustomTabColorSchemeParams;
 import androidx.browser.customtabs.CustomTabsClient;
 import androidx.browser.customtabs.CustomTabsIntent;
 import androidx.browser.customtabs.CustomTabsServiceConnection;
 import androidx.browser.customtabs.CustomTabsSession;
-import androidx.browser.customtabs.ExperimentalEphemeralBrowsing;
+
 
 public class MainActivity extends Activity {
     private static final String URL = "https://xchrdw.github.io/browsing-data/siteDataTester.html";
@@ -51,7 +51,8 @@ public void onCustomTabsServiceConnected(@NonNull ComponentName name,
             }
 
             @Override
-            public void onServiceDisconnected(ComponentName componentName) { }
+            public void onServiceDisconnected(ComponentName componentName) {
+            }
         };
 
         String packageName = CustomTabsClient.getPackageName(this, null);
@@ -87,7 +88,6 @@ protected void onStop() {
         mConnection = null;
     }
 
-    @OptIn(markerClass = ExperimentalEphemeralBrowsing.class)
     private void launchEphemeralTab() {
         CustomTabsIntent customTabsIntent = new CustomTabsIntent.Builder()
                 .setEphemeralBrowsingEnabled(true)
@@ -106,7 +106,6 @@ private void launchFallbackWebView() {
         startActivity(webIntent);
     }
 
-    @OptIn(markerClass = ExperimentalEphemeralBrowsing.class)
     private boolean isEphemeralTabSupported() throws RemoteException {
         String provider = CustomTabsClient.getPackageName(this, null);
         if (provider == null) {
diff --git a/demos/custom-tabs-ephemeral/build.gradle b/demos/custom-tabs-ephemeral/build.gradle
@@ -43,10 +43,10 @@ android {
 dependencies {
     implementation project(path: ':androidbrowserhelper')
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.activity:activity:1.9.3'
-    implementation 'androidx.browser:browser:1.9.0-alpha01'
-    implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.annotation:annotation:1.9.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.activity
+    implementation libs.androidx.browser
+    implementation libs.material
+    implementation libs.androidx.annotation
+    implementation libs.androidx.constraintlayout
 }
diff --git a/demos/custom-tabs-ephemeral/src/main/java/com/google/androidbrowserhelper/demos/customtabsephemeral/MainActivity.java b/demos/custom-tabs-ephemeral/src/main/java/com/google/androidbrowserhelper/demos/customtabsephemeral/MainActivity.java
@@ -18,7 +18,6 @@
 
 import androidx.annotation.OptIn;
 import androidx.browser.customtabs.CustomTabsIntent;
-import androidx.browser.customtabs.ExperimentalEphemeralBrowsing;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -40,7 +39,6 @@ protected void onCreate(Bundle savedInstanceState) {
         });
     }
 
-    @OptIn(markerClass = ExperimentalEphemeralBrowsing.class)
     private void launchTab() {
         Intent customTabsIntent = new CustomTabsIntent.Builder()
                 .setEphemeralBrowsingEnabled(true)
diff --git a/demos/custom-tabs-example-app/build.gradle b/demos/custom-tabs-example-app/build.gradle
@@ -44,9 +44,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':androidbrowserhelper')
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.browser:browser:1.6.0-alpha01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.core:core:1.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation libs.androidx.appcompat
+    implementation libs.androidx.browser
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.core
+    implementation libs.androidx.recyclerview
+    implementation(platform(libs.kotlin.bom))
 }
diff --git a/demos/custom-tabs-headers/build.gradle b/demos/custom-tabs-headers/build.gradle
@@ -44,7 +44,7 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.browser
+    implementation(platform(libs.kotlin.bom))
 }
-
diff --git a/demos/custom-tabs-navigation-callbacks/build.gradle b/demos/custom-tabs-navigation-callbacks/build.gradle
@@ -44,7 +44,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.browser
+    implementation(platform(libs.kotlin.bom))
 }
 
diff --git a/demos/custom-tabs-oauth/build.gradle b/demos/custom-tabs-oauth/build.gradle
@@ -42,5 +42,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation libs.androidx.browser
+    implementation(platform(libs.kotlin.bom))
 }
diff --git a/demos/custom-tabs-session/build.gradle b/demos/custom-tabs-session/build.gradle
@@ -44,7 +44,8 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation libs.androidx.constraintlayout
+    implementation libs.androidx.browser
+    implementation(platform(libs.kotlin.bom))
 }
 
diff --git a/demos/twa-basic/build.gradle b/demos/twa-basic/build.gradle
@@ -44,6 +44,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':androidbrowserhelper')
 
-    implementation 'androidx.browser:browser:1.4.0'
-    implementation 'androidx.core:core:1.1.0'
+    implementation libs.androidx.browser
+    implementation libs.androidx.core
 }
diff --git a/demos/twa-custom-launcher/build.gradle b/demos/twa-custom-launcher/build.gradle
@@ -41,11 +41,11 @@ android {
 }
 
 dependencies {
-    api 'androidx.browser:browser:1.4.0'
+    api libs.androidx.browser
     implementation project(path: ':androidbrowserhelper')
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.runner
+    androidTestImplementation libs.androidx.test.espresso.core
 }
diff --git a/demos/twa-firebase-analytics/build.gradle b/demos/twa-firebase-analytics/build.gradle
@@ -53,10 +53,10 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation project(path: ':androidbrowserhelper')
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation libs.androidx.browser
     // Firebase: Firebase Bill of Materials (BoM) for automatic choice version for each imported
     // library (See https://firebase.google.com/docs/android/learn-more#bom).
-    implementation platform('com.google.firebase:firebase-bom:25.12.0')
+    implementation platform(libs.firebase.bom)
     // Firebase Analytics: include Firebase Analytics for GA tracking.
-    implementation 'com.google.firebase:firebase-analytics'
+    implementation libs.firebase.analytics
 }
diff --git a/demos/twa-offline-first/build.gradle b/demos/twa-offline-first/build.gradle
@@ -46,6 +46,6 @@ android {
 
 dependencies {
 
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation libs.material
     implementation project(path: ':androidbrowserhelper')
 }
diff --git a/demos/twa-orientation/build.gradle b/demos/twa-orientation/build.gradle
@@ -27,5 +27,5 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':androidbrowserhelper')
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation libs.androidx.appcompat
 }
diff --git a/demos/twa-play-billing/build.gradle b/demos/twa-play-billing/build.gradle
@@ -39,7 +39,8 @@ android {
 }
 
 dependencies {
-    api 'androidx.browser:browser:1.4.0'
+    api libs.androidx.browser
+    implementation(platform(libs.kotlin.bom))
     debugImplementation project(path: ':androidbrowserhelper')
     debugImplementation project(path: ':playbilling')
 
diff --git a/demos/twa-post-message/build.gradle b/demos/twa-post-message/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.browser:browser:1.6.0-alpha02'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation "androidx.core:core:1.10.1"
+    implementation libs.androidx.browser
+    implementation libs.material
+    implementation libs.androidx.core
 }
diff --git a/demos/twa-web-share-target/build.gradle b/demos/twa-web-share-target/build.gradle
@@ -44,5 +44,5 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':androidbrowserhelper')
 
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation libs.androidx.browser
 }
diff --git a/demos/twa-webview-fallback/build.gradle b/demos/twa-webview-fallback/build.gradle
@@ -24,7 +24,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(path: ':androidbrowserhelper')
 
-    implementation 'androidx.browser:browser:1.4.0'
-    implementation 'androidx.core:core:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation libs.androidx.browser
+    implementation libs.androidx.core
+    implementation libs.androidx.constraintlayout
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,20 +1,16 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# This option should only be used with decoupled projects. For more details, visit
+# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
+#Thu Aug 07 15:09:47 UTC 2025
 android.enableJetifier=true
-
+android.useAndroidX=true
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/locationdelegation/build.gradle b/locationdelegation/build.gradle
diff --git a/playbilling/build.gradle b/playbilling/build.gradle
