From 0c65840b8c1200e010c482d6a027f4e682ca79d9 Mon Sep 17 00:00:00 2001 From: Egon Meijers Date: Fri, 19 Apr 2024 01:44:26 +0200 Subject: [PATCH] Gradle 8.2 support (#88) * Add conditional namespace to support gradle 8 * Use git as pub resource * Revert "Use git as pub resource" This reverts commit 027911d6878f69e4b07c138e04af5b9f281a3e90. * fix * fix * fix * Revert "fix" This reverts commit 2a5a8046858d2307a51286bf2bbb37596bedd4fd. * Revert "fix" This reverts commit fbee65ba4c0d6eb161712263765c68701997baac. * Revert "fix" This reverts commit 746c0ca4d364b6324e8f6dcaa414f1298cda56d1. * Revert "Revert "Use git as pub resource"" This reverts commit 4b7485e075b7fea7df3f1977f8caf3dc303da381. * Revert "Use git as pub resource" This reverts commit 027911d6878f69e4b07c138e04af5b9f281a3e90. --- plugins/flutter_aepassurance/android/build.gradle | 4 ++++ plugins/flutter_aepcore/android/build.gradle | 4 ++++ plugins/flutter_aepedge/android/build.gradle | 4 ++++ plugins/flutter_aepedgebridge/android/build.gradle | 4 ++++ plugins/flutter_aepedgeconsent/android/build.gradle | 4 ++++ plugins/flutter_aepedgeidentity/android/build.gradle | 4 ++++ plugins/flutter_aepmessaging/android/build.gradle | 4 ++++ plugins/flutter_aepuserprofile/android/build.gradle | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/plugins/flutter_aepassurance/android/build.gradle b/plugins/flutter_aepassurance/android/build.gradle index 9159412..ab12c74 100644 --- a/plugins/flutter_aepassurance/android/build.gradle +++ b/plugins/flutter_aepassurance/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepassurance' + } + compileSdk 33 defaultConfig { diff --git a/plugins/flutter_aepcore/android/build.gradle b/plugins/flutter_aepcore/android/build.gradle index 4c11e2b..24756ad 100644 --- a/plugins/flutter_aepcore/android/build.gradle +++ b/plugins/flutter_aepcore/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepcore' + } + compileSdk 33 defaultConfig { diff --git a/plugins/flutter_aepedge/android/build.gradle b/plugins/flutter_aepedge/android/build.gradle index 325755d..cb2ccd2 100644 --- a/plugins/flutter_aepedge/android/build.gradle +++ b/plugins/flutter_aepedge/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedge' + } + compileSdk 33 defaultConfig { diff --git a/plugins/flutter_aepedgebridge/android/build.gradle b/plugins/flutter_aepedgebridge/android/build.gradle index 3d78c09..8560155 100644 --- a/plugins/flutter_aepedgebridge/android/build.gradle +++ b/plugins/flutter_aepedgebridge/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedgebridge' + } + compileSdk 33 defaultConfig { diff --git a/plugins/flutter_aepedgeconsent/android/build.gradle b/plugins/flutter_aepedgeconsent/android/build.gradle index 1ae6ca1..92b7f67 100644 --- a/plugins/flutter_aepedgeconsent/android/build.gradle +++ b/plugins/flutter_aepedgeconsent/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedgeconsent' + } + compileSdk 33 defaultConfig { diff --git a/plugins/flutter_aepedgeidentity/android/build.gradle b/plugins/flutter_aepedgeidentity/android/build.gradle index ef90f05..3d4c115 100644 --- a/plugins/flutter_aepedgeidentity/android/build.gradle +++ b/plugins/flutter_aepedgeidentity/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedgeidentity' + } + compileSdk 33 defaultConfig { diff --git a/plugins/flutter_aepmessaging/android/build.gradle b/plugins/flutter_aepmessaging/android/build.gradle index aba6d59..224c71c 100644 --- a/plugins/flutter_aepmessaging/android/build.gradle +++ b/plugins/flutter_aepmessaging/android/build.gradle @@ -24,6 +24,10 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepmessaging' + } + compileSdkVersion 33 compileOptions { diff --git a/plugins/flutter_aepuserprofile/android/build.gradle b/plugins/flutter_aepuserprofile/android/build.gradle index 2561bb1..56fa900 100644 --- a/plugins/flutter_aepuserprofile/android/build.gradle +++ b/plugins/flutter_aepuserprofile/android/build.gradle @@ -22,6 +22,10 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepuserprofile' + } + compileSdk 33 compileOptions {