From d4c9cb54810e92e578417ed09203ffe1456f81f3 Mon Sep 17 00:00:00 2001 From: Jason Feingold Date: Tue, 17 May 2022 14:03:44 -0700 Subject: [PATCH 1/2] Modified build for DSC, removing renaming of application Id --- intercom-plugin/src/android/build-extras-intercom.gradle | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/intercom-plugin/src/android/build-extras-intercom.gradle b/intercom-plugin/src/android/build-extras-intercom.gradle index 0748bb7..3c8cf6f 100644 --- a/intercom-plugin/src/android/build-extras-intercom.gradle +++ b/intercom-plugin/src/android/build-extras-intercom.gradle @@ -4,8 +4,11 @@ import java.util.regex.Matcher // INSTALL_FAILED_CONFLICTING_PROVIDER error when installing the app. // // @link https://issues.apache.org/jira/browse/CB-10014 -def manifest = new XmlSlurper().parse(file("src/main/AndroidManifest.xml")) -android.defaultConfig.applicationId manifest.@package.text() + +//DRIVER'S SEAT: Removing this as it conflicts with the build by +// setting ApplicationId to literal "manifest.@package.text()" +//def manifest = new XmlSlurper().parse(file("src/main/AndroidManifest.xml")) +//android.defaultConfig.applicationId manifest.@package.text() // some libraries depend on higher versions of our dependencies than we support // we keep track of these dependencies here and override the version to a safe one From 5d7d145e58dee4160994e23c39cd32325d7e3735 Mon Sep 17 00:00:00 2001 From: Jason Feingold Date: Fri, 2 Jun 2023 15:36:20 -0700 Subject: [PATCH 2/2] setup for capacitor-5 --- intercom-plugin/src/android/intercom.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intercom-plugin/src/android/intercom.gradle b/intercom-plugin/src/android/intercom.gradle index 211a9a8..9077ad3 100644 --- a/intercom-plugin/src/android/intercom.gradle +++ b/intercom-plugin/src/android/intercom.gradle @@ -14,7 +14,7 @@ buildscript { maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:8.0.2' if (pushType == 'fcm') { classpath 'com.google.gms:google-services:4.3.3' }