Update gradle and add namespaces

maiconcarraro · Jan 14, 2025 · 61c0886 · 61c0886
1 parent 653bfd2
commit 61c0886
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 25 deletions.
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,6 +20,7 @@ apply plugin: 'maven-publish'
 def VERSION = "2.5.0";
 
 android {
+    namespace "com.google.androidbrowserhelper"
     compileSdkVersion 31
 
     defaultConfig {

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.7.3'
     }
 }
 

diff --git a/demos/custom-tabs-example-app/build.gradle b/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"

diff --git a/demos/custom-tabs-headers/build.gradle b/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"

diff --git a/demos/custom-tabs-navigation-callbacks/build.gradle b/demos/custom-tabs-navigation-callbacks/build.gradle
@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.google.androidbrowserhelper.demos.customtabsnavigationcallbacks"

diff --git a/demos/custom-tabs-oauth/build.gradle b/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"

diff --git a/demos/custom-tabs-session/build.gradle b/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"

diff --git a/demos/twa-basic/build.gradle b/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"

diff --git a/demos/twa-custom-launcher/build.gradle b/demos/twa-custom-launcher/build.gradle
@@ -17,8 +17,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.androidbrowserhelper.launchtwa"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.google.androidbrowserhelper"
         minSdkVersion 23

diff --git a/demos/twa-firebase-analytics/build.gradle b/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"

diff --git a/demos/twa-location-delegation/build.gradle b/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"

diff --git a/demos/twa-multi-domain/build.gradle b/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"

diff --git a/demos/twa-notification-delegation/build.gradle b/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"

diff --git a/demos/twa-offline-first/build.gradle b/demos/twa-offline-first/build.gradle
@@ -19,6 +19,7 @@ plugins {
 }
 
 android {
+    namespace "com.google.androidbrowserhelper.demos.twa_offline_first"
     compileSdkVersion 31
 
     defaultConfig {

diff --git a/demos/twa-orientation/build.gradle b/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"

diff --git a/demos/twa-play-billing/build.gradle b/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

diff --git a/...billing/src/main/java/com/google/androidbrowserhelper/demos/playbilling/MainActivity.java b/...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);
     }

diff --git a/demos/twa-post-message/build.gradle b/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

diff --git a/demos/twa-web-share-target/build.gradle b/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"

diff --git a/demos/twa-webview-fallback/build.gradle b/demos/twa-webview-fallback/build.gradle
@@ -1,9 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace "com.google.browser.examples.twawebviewfallback"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
-
 
     defaultConfig {
         applicationId "com.google.browser.examples.twawebviewfallback"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 06 14:01:45 GMT 2021
+#Tue Dec 03 18:37:48 CST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/locationdelegation/build.gradle b/locationdelegation/build.gradle
@@ -18,8 +18,8 @@ apply plugin: 'maven-publish'
 def VERSION = "1.1.1";
 
 android {
+    namespace "com.google.androidbrowserhelper.locationdelegation"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 19

diff --git a/playbilling/build.gradle b/playbilling/build.gradle
@@ -20,8 +20,8 @@ apply plugin: 'maven-publish'
 def VERSION = "1.0.0-alpha11";
 
 android {
+    namespace "com.google.androidbrowserhelper.playbilling"
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 19