From e0d36e8007f1c15a5b2b2bbfb79a7ea95a5a99dc Mon Sep 17 00:00:00 2001 From: Calise Cheung Date: Tue, 23 Apr 2024 14:58:32 -0700 Subject: [PATCH] [dev 4.0.1 -> staging] Add namespace support for Android (#107) * 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. * Update Flutter version for the plugins, update sample app gradle files and Update issue_template (#106) * bump the major version to 4.0.0 (to include Android SDK 3.0.0 and iOS SDK 5.0.0) * specify the ios version * update CI to use Xcode 15.0.1 * fix CI syntax issue * draft * cleanup * update API doc * address review comments * address a review comment * correct timeout accuracy * Update FlutterAEPCorePlugin.m * feat: :arrow_up: messaging api changes * Update EdgeBridge sample app and readme Update EdgeBridge sample app and readme * refactor: :recycle: rename edge event type for messaging * chore: reenable messaging * fix: :bug: fixes for messaging * disable unit tests * docs: :memo: remove beta language from messaging docs * Update README for Privacy Manifest changes (#100) * update main README to show information about "Privacy Manifest" * fix: :bug: fix oncontentloaded to be android only * Update Flutter version for the plugins, update sample app gradle files and update issue_template Update Flutter version for the plugins Update sample app gradle files Update issue_template --------- Co-authored-by: yansong Co-authored-by: dsoffiantini * update ci java-version (#108) update ci java-version * remove and gitignore pubspec.lock in the plugins (#109) remove and gitignore pubspec.lock in the plugins * Update GitHub issue (#110) * update issue template description update issue template description * update bug_report.yml update bug_report.yml * Update android project gradle version (#111) Update android project gradle version * migration doc update (#112) migration doc update --------- Co-authored-by: Egon Meijers Co-authored-by: yansong Co-authored-by: dsoffiantini --- .github/CONTRIBUTING.md | 52 +++++ .github/ISSUE_TEMPLATE.md | 24 +-- .github/ISSUE_TEMPLATE/bug_report.yml | 77 ++++++++ .github/ISSUE_TEMPLATE/feature_request.yml | 43 +++++ .github/ISSUE_TEMPLATE/project_epic.yml | 24 +++ .github/ISSUE_TEMPLATE/project_task.yml | 17 ++ .github/release-drafter.yml | 16 ++ .github/workflows/dart.yml | 33 ++-- .gitignore | 5 +- docs/migration.md | 4 +- example/android/app/build.gradle | 5 +- .../plugins/GeneratedPluginRegistrant.java | 16 +- example/android/build.gradle | 6 +- .../gradle/wrapper/gradle-wrapper.properties | 6 +- example/pubspec.lock | 98 ++++++---- example/pubspec.yaml | 4 +- plugins/flutter_aepassurance/CHANGELOG.md | 5 + .../flutter_aepassurance/android/build.gradle | 10 +- plugins/flutter_aepassurance/pubspec.lock | 173 ----------------- plugins/flutter_aepassurance/pubspec.yaml | 4 +- plugins/flutter_aepcore/CHANGELOG.md | 5 + plugins/flutter_aepcore/android/build.gradle | 11 +- plugins/flutter_aepcore/pubspec.lock | 165 ---------------- plugins/flutter_aepcore/pubspec.yaml | 4 +- plugins/flutter_aepedge/CHANGELOG.md | 5 + plugins/flutter_aepedge/android/build.gradle | 10 +- plugins/flutter_aepedge/pubspec.lock | 181 ------------------ plugins/flutter_aepedge/pubspec.yaml | 4 +- plugins/flutter_aepedgebridge/CHANGELOG.md | 5 + .../android/build.gradle | 10 +- plugins/flutter_aepedgebridge/pubspec.lock | 173 ----------------- plugins/flutter_aepedgebridge/pubspec.yaml | 4 +- plugins/flutter_aepedgeconsent/CHANGELOG.md | 5 + .../android/build.gradle | 10 +- plugins/flutter_aepedgeconsent/pubspec.lock | 173 ----------------- plugins/flutter_aepedgeconsent/pubspec.yaml | 4 +- plugins/flutter_aepedgeidentity/CHANGELOG.md | 5 + .../android/build.gradle | 10 +- plugins/flutter_aepedgeidentity/pubspec.lock | 173 ----------------- plugins/flutter_aepedgeidentity/pubspec.yaml | 4 +- plugins/flutter_aepmessaging/CHANGELOG.md | 5 + .../flutter_aepmessaging/android/build.gradle | 10 +- plugins/flutter_aepmessaging/pubspec.lock | 173 ----------------- plugins/flutter_aepmessaging/pubspec.yaml | 4 +- plugins/flutter_aepuserprofile/CHANGELOG.md | 5 + .../android/build.gradle | 10 +- plugins/flutter_aepuserprofile/pubspec.lock | 173 ----------------- plugins/flutter_aepuserprofile/pubspec.yaml | 4 +- 48 files changed, 453 insertions(+), 1514 deletions(-) create mode 100644 .github/CONTRIBUTING.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml create mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml create mode 100644 .github/ISSUE_TEMPLATE/project_epic.yml create mode 100644 .github/ISSUE_TEMPLATE/project_task.yml create mode 100644 .github/release-drafter.yml delete mode 100644 plugins/flutter_aepassurance/pubspec.lock delete mode 100644 plugins/flutter_aepcore/pubspec.lock delete mode 100644 plugins/flutter_aepedge/pubspec.lock delete mode 100644 plugins/flutter_aepedgebridge/pubspec.lock delete mode 100644 plugins/flutter_aepedgeconsent/pubspec.lock delete mode 100644 plugins/flutter_aepedgeidentity/pubspec.lock delete mode 100644 plugins/flutter_aepmessaging/pubspec.lock delete mode 100644 plugins/flutter_aepuserprofile/pubspec.lock diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 0000000..26ea8e5 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,52 @@ +# Contributing + +Thanks for choosing to contribute! + +The following are a set of guidelines to follow when contributing to this project. + +## Code Of Conduct + +This project adheres to the Adobe [code of conduct](../CODE_OF_CONDUCT.md). By participating, +you are expected to uphold this code. Please report unacceptable behavior to +[Grp-opensourceoffice@adobe.com](mailto:Grp-opensourceoffice@adobe.com). + +## Have A Question? + +Start by filing an issue. The existing committers on this project work to reach +consensus around project direction and issue solutions within issue threads +(when appropriate). + +## Contributor License Agreement + +All third-party contributions to this project must be accompanied by a signed contributor +license agreement. This gives Adobe permission to redistribute your contributions +as part of the project. [Sign our CLA](http://opensource.adobe.com/cla.html). You +only need to submit an Adobe CLA one time, so if you have submitted one previously, +you are good to go! + +## Code Reviews + +All submissions should come in the form of pull requests and need to be reviewed +by project committers. Read [GitHub's pull request documentation](https://help.github.com/articles/about-pull-requests/) +for more information on sending pull requests. + +Lastly, please follow the [pull request template](PULL_REQUEST_TEMPLATE.md) when +submitting a pull request! + +## Style Guide + +Code cleanliness and consistency is important. Please review and follow our code +[Style Guide](../Documentation/Contributing/StyleGuide.md) when contributing. + +## From Contributor To Committer + +We love contributions from our community! If you'd like to go a step beyond contributor +and become a committer with full write access and a say in the project, you must +be invited to the project. The existing committers employ an internal nomination +process that must reach lazy consensus (silence is approval) before invitations +are issued. If you feel you are qualified and want to get more deeply involved, +feel free to reach out to existing committers to have a conversation about that. + +## Security Issues + +Security issues shouldn't be reported on this issue tracker. Instead, [file an issue to our security experts](https://helpx.adobe.com/security/alertus.html) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 524718e..bfacfd3 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,16 +1,8 @@ - - - -### Expected Behaviour - -### Actual Behaviour - -### Reproduce Scenario (including but not limited to) - -#### Steps to Reproduce - -#### Platform and Version - -#### Sample Code that illustrates the problem - -#### Logs taken while reproducing problem +--- +name: Blank issue +labels: task +--- +## Prerequisites + +- [ ] I have searched in this repository's issues to see if it has already been reported. +- [ ] This is not a Security Disclosure, otherwise please follow the guidelines in [Security Policy](https://github.com/adobe/aepsdk-analytics-android/security/policy). diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml new file mode 100644 index 0000000..1862a7f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -0,0 +1,77 @@ +name: Bug report +description: Create a bug report to help us improve. Use this template if you encountered an issue while integrating with or implementing the APIs of this SDK. +labels: [bug, triage-required] + +body: +- type: checkboxes + attributes: + label: Prerequisites + description: Please check the following items before logging a new bug report. + options: + - label: This is not a Security Disclosure, otherwise please follow the guidelines in [Security Policy](https://github.com/adobe/aepsdk_flutter/security/policy). + required: true + - label: I have searched in this repository's issues to see if it has already been reported. + required: true + - label: I have updated to the latest released version of the SDK and the issue still persists. + required: true + +- type: textarea + attributes: + label: Bug summary + description: Please provide a summary of the bug you are reporting. + validations: + required: true + +- type: textarea + attributes: + label: Environment + description: | + Please provide the Platform, OS version, SDK version(s) used, IDE version, and any other specific settings that could help us narrow down the problem. + Run `flutter doctor` and paste the output here. + Example: + [✓] MOBILE SDK VERSION: Flutter_aepcore@4.0.0, Flutter_aepedge@4.0.0 + [✓] Flutter (Channel stable, 3.19.6, on macOS 14.2.1 darwin-arm64) + • Flutter version 3.19.6 on channel stable at /development/flutter + • Dart version 3.3.4 + • DevTools version 2.31.1 + [!] Android toolchain - develop for Android devices (Android SDK version 34.0.0) + [✓] Xcode - develop for iOS and macOS (Xcode 15.1) + • CocoaPods version 1.14.3 + + validations: + required: true + +- type: textarea + attributes: + label: Steps to reproduce + description: Steps to reproduce the behavior consistently. + placeholder: | + 1. ... + 2. ... + 3. ... + validations: + required: false + +- type: textarea + attributes: + label: Current behavior + description: A concise description of what you are experiencing. + validations: + required: false + +- type: textarea + attributes: + label: Expected behavior + description: A concise description of what you expected to happen. + validations: + required: false + +- type: textarea + attributes: + label: Anything else? + description: | + Here you can include sample code that illustrates the problem, logs taken while reproducing the problem, or anything that can give us more context about the issue you are encountering. + + Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in. + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml new file mode 100644 index 0000000..fdae869 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -0,0 +1,43 @@ +name: Feature request +description: Suggest an idea for this project. +labels: [feature-request, triage-required] + +body: +- type: checkboxes + attributes: + label: Prerequisites + description: Please check the following items before logging a new feature request. + options: + - label: This is not a Security Disclosure, otherwise please follow the guidelines in [Security Policy](https://github.com/adobe/aepsdk-flutter/security/policy). + required: true + - label: I have searched in this repository's issues to see if it has already been reported. + required: true + +- type: textarea + id: description + attributes: + label: Feature request summary + description: Please provide a summary of the feature. + validations: + required: true + +- type: textarea + attributes: + label: Current behavior + description: A concise description of what you are experiencing. + validations: + required: false + +- type: textarea + attributes: + label: Expected behavior + description: A concise description of what you expected to happen. + validations: + required: false + +- type: textarea + attributes: + label: Additional implementation details or code snippets + description: Provide additional information about this request, implementation details or code snippets. + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/project_epic.yml b/.github/ISSUE_TEMPLATE/project_epic.yml new file mode 100644 index 0000000..eec745a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/project_epic.yml @@ -0,0 +1,24 @@ +name: Project epic +description: Create an internal epic that represents the top level parent of multiple tasks. +labels: [epic] + +body: +- type: textarea + id: description + attributes: + label: Epic description + description: Please provide a detailed description for this epic. + validations: + required: true + +- type: textarea + id: tasks + attributes: + label: Tasks + description: | + Provide a high-level definition of done for this epic as a list of tasks that need to be completed. + Tip: List out the task links if they already exist or list them out as text with a descriptive title so they can be easily converted to task items. + placeholder: | + - [ ] your task link here + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/project_task.yml b/.github/ISSUE_TEMPLATE/project_task.yml new file mode 100644 index 0000000..f4334a3 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/project_task.yml @@ -0,0 +1,17 @@ +name: Project task +description: Create an internal task that can be completed as a standalone code change or is part of an epic. +labels: [task] +body: +- type: textarea + attributes: + label: Task description + description: Please provide a summary or the "what" of the task logged. + validations: + required: true + +- type: textarea + attributes: + label: Additional implementation details or code snippet(s) + description: Provide additional information about this task, implementation details or code snippets. + validations: + required: false diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml new file mode 100644 index 0000000..e053484 --- /dev/null +++ b/.github/release-drafter.yml @@ -0,0 +1,16 @@ +# +# Copyright 2024 Adobe. All rights reserved. +# This file is licensed to you under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. You may obtain a copy +# of the License at http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software distributed under +# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS +# OF ANY KIND, either express or implied. See the License for the specific language +# governing permissions and limitations under the License. +# + +template: | + ## What’s Changed + + $CHANGES \ No newline at end of file diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index ea78a10..140d57b 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -22,10 +22,10 @@ jobs: - uses: actions/checkout@v1 - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./example @@ -48,10 +48,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./example @@ -73,10 +73,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./plugins/flutter_aepcore @@ -94,10 +94,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./plugins/flutter_aepassurance @@ -115,10 +115,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./plugins/flutter_aepedge @@ -136,10 +136,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./plugins/flutter_aepedgeconsent @@ -157,10 +157,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./plugins/flutter_aepedgeidentity @@ -177,10 +177,10 @@ jobs: - uses: actions/setup-java@v1 with: - java-version: "12.x" + java-version: "17.x" - uses: subosito/flutter-action@v2 with: - flutter-version: "2.x" + flutter-version: "3.x" - name: Install dependencies working-directory: ./plugins/flutter_aepuserprofile @@ -189,3 +189,4 @@ jobs: - name: Unit test working-directory: ./plugins/flutter_aepuserprofile run: flutter test + \ No newline at end of file diff --git a/.gitignore b/.gitignore index e202576..8fcec44 100644 --- a/.gitignore +++ b/.gitignore @@ -78,4 +78,7 @@ example/android/GeneratedPluginRegistrant.java **/ios/Icon? **/ios/.tags* **/ios/Flutter/Generated.xcconfig -**/ios/flutter_export_environment.sh \ No newline at end of file +**/ios/flutter_export_environment.sh + +# podspec.lock +plugins/**/pubspec.lock \ No newline at end of file diff --git a/docs/migration.md b/docs/migration.md index c64f5d3..8fa6aa5 100644 --- a/docs/migration.md +++ b/docs/migration.md @@ -11,7 +11,7 @@ Update your `pubspec.yml` file to point to the new plugin as so: dependencies: - flutter_acpcore: ^2.0.0 -+ flutter_aepcore: ^3.0.0 ++ flutter_aepcore: ^4.0.0 ... ``` @@ -344,7 +344,7 @@ final Event event = Event({ "eventData": {"eventDataKey": "eventDataValue"} }); try { - result = await MobileCore.dispatchEventWithResponseCallback(event); + result = await MobileCore.dispatchEventWithResponseCallback(event, 1000); } on PlatformException catch (e) { log("Failed to dispatch event '${e.message}''"); } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index df79c20..2060fa4 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -25,7 +25,8 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdk 34 + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepsdk_example' lintOptions { disable 'InvalidPackage' @@ -35,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.adobe.marketing.mobile.flutter.flutter_aepsdk_example" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' diff --git a/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java index edab91f..108eb1d 100644 --- a/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ b/example/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java @@ -17,42 +17,42 @@ public final class GeneratedPluginRegistrant { public static void registerWith(@NonNull FlutterEngine flutterEngine) { try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepassurance.FlutterAEPAssurancePlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepassurance, com.adobe.marketing.mobile.flutter.flutter_aepassurance.FlutterAEPAssurancePlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepcore.FlutterAEPCorePlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepcore, com.adobe.marketing.mobile.flutter.flutter_aepcore.FlutterAEPCorePlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepedge.FlutterAEPEdgePlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepedge, com.adobe.marketing.mobile.flutter.flutter_aepedge.FlutterAEPEdgePlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepedgebridge.FlutterAEPEdgeBridgePlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepedgebridge, com.adobe.marketing.mobile.flutter.flutter_aepedgebridge.FlutterAEPEdgeBridgePlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepedgeconsent.FlutterAEPEdgeConsentPlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepedgeconsent, com.adobe.marketing.mobile.flutter.flutter_aepedgeconsent.FlutterAEPEdgeConsentPlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepedgeidentity.FlutterAEPEdgeIdentityPlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepedgeidentity, com.adobe.marketing.mobile.flutter.flutter_aepedgeidentity.FlutterAEPEdgeIdentityPlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepmessaging.FlutterAEPMessagingPlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepmessaging, com.adobe.marketing.mobile.flutter.flutter_aepmessaging.FlutterAEPMessagingPlugin", e); } try { flutterEngine.getPlugins().add(new com.adobe.marketing.mobile.flutter.flutter_aepuserprofile.FlutterAEPUserProfilePlugin()); - } catch(Exception e) { + } catch (Exception e) { Log.e(TAG, "Error registering plugin flutter_aepuserprofile, com.adobe.marketing.mobile.flutter.flutter_aepuserprofile.FlutterAEPUserProfilePlugin", e); } } diff --git a/example/android/build.gradle b/example/android/build.gradle index 3593d96..ebaa36d 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.2.2' } } @@ -24,6 +24,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index b25e4be..2a3a460 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 15 14:27:20 MDT 2022 +#Thu Apr 18 18:04:58 PDT 2024 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/example/pubspec.lock b/example/pubspec.lock index 549e2f6..6376f6f 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -21,10 +21,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: @@ -37,18 +37,18 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: a937da4c006989739ceb4d10e3bd6cce64ca85d0fe287fc5b2b9f6ee757dcee6 + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "0.1.3" + version: "1.0.8" fake_async: dependency: transitive description: @@ -68,101 +68,117 @@ packages: path: "../plugins/flutter_aepassurance" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepcore: dependency: "direct main" description: path: "../plugins/flutter_aepcore" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepedge: dependency: "direct main" description: path: "../plugins/flutter_aepedge" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepedgebridge: dependency: "direct main" description: path: "../plugins/flutter_aepedgebridge" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepedgeconsent: dependency: "direct main" description: path: "../plugins/flutter_aepedgeconsent" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepedgeidentity: dependency: "direct main" description: path: "../plugins/flutter_aepedgeidentity" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepmessaging: dependency: "direct main" description: path: "../plugins/flutter_aepmessaging" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_aepuserprofile: dependency: "direct main" description: path: "../plugins/flutter_aepuserprofile" relative: true source: path - version: "4.0.0" + version: "4.0.1" flutter_test: dependency: "direct dev" description: flutter source: sdk version: "0.0.0" - js: + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + url: "https://pub.dev" + source: hosted + version: "10.0.0" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + leak_tracker_testing: dependency: transitive description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + name: leak_tracker_testing + sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "2.0.1" matcher: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.8.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04 url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.11.0" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.9.0" sky_engine: dependency: transitive description: flutter @@ -172,26 +188,26 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -212,10 +228,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.1" vector_math: dependency: transitive description: @@ -224,5 +240,13 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + url: "https://pub.dev" + source: hosted + version: "13.0.0" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=3.2.0-0 <4.0.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index bcf8256..b73a14d 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: "none" version: 2.0.1 environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: flutter: @@ -12,7 +12,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 + cupertino_icons: ^1.0.8 flutter_aepcore: ">= 4.0.0 <5.0.0" diff --git a/plugins/flutter_aepassurance/CHANGELOG.md b/plugins/flutter_aepassurance/CHANGELOG.md index 54da4a9..77ba9d4 100644 --- a/plugins/flutter_aepassurance/CHANGELOG.md +++ b/plugins/flutter_aepassurance/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepassurance/android/build.gradle b/plugins/flutter_aepassurance/android/build.gradle index 9159412..23c663e 100644 --- a/plugins/flutter_aepassurance/android/build.gradle +++ b/plugins/flutter_aepassurance/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepassurance' -version '2.0' +version '3.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepassurance' + } + + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/plugins/flutter_aepassurance/pubspec.lock b/plugins/flutter_aepassurance/pubspec.lock deleted file mode 100644 index aaba9be..0000000 --- a/plugins/flutter_aepassurance/pubspec.lock +++ /dev/null @@ -1,173 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepassurance/pubspec.yaml b/plugins/flutter_aepassurance/pubspec.yaml index 08c7b55..48983ae 100644 --- a/plugins/flutter_aepassurance/pubspec.yaml +++ b/plugins/flutter_aepassurance/pubspec.yaml @@ -1,14 +1,14 @@ name: flutter_aepassurance description: Official Adobe Experience Platform support for Flutter apps. Assurance is a new, innovative product from Adobe to help you easily validate SDK implementations. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepassurance environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepcore/CHANGELOG.md b/plugins/flutter_aepcore/CHANGELOG.md index c579fb4..cb2aae6 100644 --- a/plugins/flutter_aepcore/CHANGELOG.md +++ b/plugins/flutter_aepcore/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepcore/android/build.gradle b/plugins/flutter_aepcore/android/build.gradle index 4c11e2b..f2fb68d 100644 --- a/plugins/flutter_aepcore/android/build.gradle +++ b/plugins/flutter_aepcore/android/build.gradle @@ -1,5 +1,6 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepcore' -version '2.0' +//do we need to update this version? +version '3.0' buildscript { repositories { @@ -8,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +23,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepcore' + } + + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/plugins/flutter_aepcore/pubspec.lock b/plugins/flutter_aepcore/pubspec.lock deleted file mode 100644 index 596d125..0000000 --- a/plugins/flutter_aepcore/pubspec.lock +++ /dev/null @@ -1,165 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepcore/pubspec.yaml b/plugins/flutter_aepcore/pubspec.yaml index 96dab21..312eae0 100644 --- a/plugins/flutter_aepcore/pubspec.yaml +++ b/plugins/flutter_aepcore/pubspec.yaml @@ -1,12 +1,12 @@ name: flutter_aepcore description: Official Adobe Experience Platform support for Flutter apps. The Mobile Core represents the core Adobe Experience Platform SDK that is required for every app implementation. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk-flutter/tree/main/plugins/flutter_aepcore environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepedge/CHANGELOG.md b/plugins/flutter_aepedge/CHANGELOG.md index a3e9aeb..c3cd3bd 100644 --- a/plugins/flutter_aepedge/CHANGELOG.md +++ b/plugins/flutter_aepedge/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepedge/android/build.gradle b/plugins/flutter_aepedge/android/build.gradle index 325755d..a1d49a3 100644 --- a/plugins/flutter_aepedge/android/build.gradle +++ b/plugins/flutter_aepedge/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepedge' -version '2.0' +version '3.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedge' + } + + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/plugins/flutter_aepedge/pubspec.lock b/plugins/flutter_aepedge/pubspec.lock deleted file mode 100644 index 6332634..0000000 --- a/plugins/flutter_aepedge/pubspec.lock +++ /dev/null @@ -1,181 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_aepedgeidentity: - dependency: "direct main" - description: - name: flutter_aepedgeidentity - sha256: "375c6a2eed0472a3d11adbacd695753e6967e4ede6048f3dd13f820ce59e25ab" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepedge/pubspec.yaml b/plugins/flutter_aepedge/pubspec.yaml index 9c13cc8..a202a32 100644 --- a/plugins/flutter_aepedge/pubspec.yaml +++ b/plugins/flutter_aepedge/pubspec.yaml @@ -1,13 +1,13 @@ name: flutter_aepedge description: Official Adobe Experience Platform support for Flutter apps. The Experience Platform Edge extension enables sending data to the Adobe Experience Edge from a mobile device. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepedge environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepedgebridge/CHANGELOG.md b/plugins/flutter_aepedgebridge/CHANGELOG.md index 7e3b7ea..8c62f5a 100644 --- a/plugins/flutter_aepedgebridge/CHANGELOG.md +++ b/plugins/flutter_aepedgebridge/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepedgebridge/android/build.gradle b/plugins/flutter_aepedgebridge/android/build.gradle index 3d78c09..2d15791 100644 --- a/plugins/flutter_aepedgebridge/android/build.gradle +++ b/plugins/flutter_aepedgebridge/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepedgebridge' -version '2.0' +version '3.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedgebridge' + } + + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/plugins/flutter_aepedgebridge/pubspec.lock b/plugins/flutter_aepedgebridge/pubspec.lock deleted file mode 100644 index aaba9be..0000000 --- a/plugins/flutter_aepedgebridge/pubspec.lock +++ /dev/null @@ -1,173 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepedgebridge/pubspec.yaml b/plugins/flutter_aepedgebridge/pubspec.yaml index 7bebd63..bb6b259 100644 --- a/plugins/flutter_aepedgebridge/pubspec.yaml +++ b/plugins/flutter_aepedgebridge/pubspec.yaml @@ -1,12 +1,12 @@ name: flutter_aepedgebridge description: Official Adobe Experience Platform support for Flutter apps. The AEP Edge Bridge mobile extension provides seamless routing of data to the Adobe Experience Platform Edge Network for existing SDK implementations. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepedgebridge environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepedgeconsent/CHANGELOG.md b/plugins/flutter_aepedgeconsent/CHANGELOG.md index 54da4a9..77ba9d4 100644 --- a/plugins/flutter_aepedgeconsent/CHANGELOG.md +++ b/plugins/flutter_aepedgeconsent/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepedgeconsent/android/build.gradle b/plugins/flutter_aepedgeconsent/android/build.gradle index 1ae6ca1..75f4c2d 100644 --- a/plugins/flutter_aepedgeconsent/android/build.gradle +++ b/plugins/flutter_aepedgeconsent/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepedgeconsent' -version '2.0' +version '3.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedgeconsent' + } + + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/plugins/flutter_aepedgeconsent/pubspec.lock b/plugins/flutter_aepedgeconsent/pubspec.lock deleted file mode 100644 index aaba9be..0000000 --- a/plugins/flutter_aepedgeconsent/pubspec.lock +++ /dev/null @@ -1,173 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepedgeconsent/pubspec.yaml b/plugins/flutter_aepedgeconsent/pubspec.yaml index a86a109..0fdde9d 100644 --- a/plugins/flutter_aepedgeconsent/pubspec.yaml +++ b/plugins/flutter_aepedgeconsent/pubspec.yaml @@ -1,13 +1,13 @@ name: flutter_aepedgeconsent description: Official Adobe Experience Platform support for Flutter apps. The AEP Consent Collection plugin enables consent preferences collection from your Flutter app when using the Adobe Experience Platform Mobile SDK and the Edge Network extension. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepedgeconsent environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepedgeidentity/CHANGELOG.md b/plugins/flutter_aepedgeidentity/CHANGELOG.md index 54da4a9..77ba9d4 100644 --- a/plugins/flutter_aepedgeidentity/CHANGELOG.md +++ b/plugins/flutter_aepedgeidentity/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepedgeidentity/android/build.gradle b/plugins/flutter_aepedgeidentity/android/build.gradle index ef90f05..aedd36b 100644 --- a/plugins/flutter_aepedgeidentity/android/build.gradle +++ b/plugins/flutter_aepedgeidentity/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepedgeidentity' -version '2.0' +version '3.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepedgeidentity' + } + + compileSdk 34 defaultConfig { minSdkVersion 21 diff --git a/plugins/flutter_aepedgeidentity/pubspec.lock b/plugins/flutter_aepedgeidentity/pubspec.lock deleted file mode 100644 index aaba9be..0000000 --- a/plugins/flutter_aepedgeidentity/pubspec.lock +++ /dev/null @@ -1,173 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepedgeidentity/pubspec.yaml b/plugins/flutter_aepedgeidentity/pubspec.yaml index 51b505c..e9e5122 100644 --- a/plugins/flutter_aepedgeidentity/pubspec.yaml +++ b/plugins/flutter_aepedgeidentity/pubspec.yaml @@ -1,13 +1,13 @@ name: flutter_aepedgeidentity description: Official Adobe Experience Platform support for Flutter apps. The Experience Platform Edge Identity extension enables handling of user identity data from a mobile app when using the Adobe Experience Platform SDK and the Edge Network extension. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepedgeidentity environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepmessaging/CHANGELOG.md b/plugins/flutter_aepmessaging/CHANGELOG.md index 1dc1921..8c4ee45 100644 --- a/plugins/flutter_aepmessaging/CHANGELOG.md +++ b/plugins/flutter_aepmessaging/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepmessaging/android/build.gradle b/plugins/flutter_aepmessaging/android/build.gradle index aba6d59..4efdb22 100644 --- a/plugins/flutter_aepmessaging/android/build.gradle +++ b/plugins/flutter_aepmessaging/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepmessaging' -version '2.0' +version '3.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20" } } @@ -24,7 +24,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepmessaging' + } + + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/plugins/flutter_aepmessaging/pubspec.lock b/plugins/flutter_aepmessaging/pubspec.lock deleted file mode 100644 index aaba9be..0000000 --- a/plugins/flutter_aepmessaging/pubspec.lock +++ /dev/null @@ -1,173 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepmessaging/pubspec.yaml b/plugins/flutter_aepmessaging/pubspec.yaml index ee3fdcb..000b915 100644 --- a/plugins/flutter_aepmessaging/pubspec.yaml +++ b/plugins/flutter_aepmessaging/pubspec.yaml @@ -1,13 +1,13 @@ name: flutter_aepmessaging description: Official Adobe Experience Platform support for Flutter apps. The Experience Platform Messaging extension enables handling of user push an in-app messages from a mobile app when using the Adobe Experience Platform SDK. -version: 4.0.0 +version: 4.0.1 homepage: https://aep-sdks.gitbook.io/docs/ repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepmessaging environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: diff --git a/plugins/flutter_aepuserprofile/CHANGELOG.md b/plugins/flutter_aepuserprofile/CHANGELOG.md index 7e3b7ea..8c62f5a 100644 --- a/plugins/flutter_aepuserprofile/CHANGELOG.md +++ b/plugins/flutter_aepuserprofile/CHANGELOG.md @@ -1,3 +1,8 @@ +## 4.0.1 + +* Add namespace support for Android +* Update Flutter support version to 3.x + ## 4.0.0 * Adobe Mobile SDK for iOS 5.x support diff --git a/plugins/flutter_aepuserprofile/android/build.gradle b/plugins/flutter_aepuserprofile/android/build.gradle index 2561bb1..21037c6 100644 --- a/plugins/flutter_aepuserprofile/android/build.gradle +++ b/plugins/flutter_aepuserprofile/android/build.gradle @@ -1,5 +1,5 @@ group 'com.adobe.marketing.mobile.flutter.flutter_aepuserprofile' -version '1.0' +version '2.0' buildscript { repositories { @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' + classpath 'com.android.tools.build:gradle:8.1.2' } } @@ -22,7 +22,11 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 33 + if (project.android.hasProperty("namespace")) { + namespace 'com.adobe.marketing.mobile.flutter.flutter_aepuserprofile' + } + + compileSdk 34 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 diff --git a/plugins/flutter_aepuserprofile/pubspec.lock b/plugins/flutter_aepuserprofile/pubspec.lock deleted file mode 100644 index aaba9be..0000000 --- a/plugins/flutter_aepuserprofile/pubspec.lock +++ /dev/null @@ -1,173 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.dev" - source: hosted - version: "2.10.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.dev" - source: hosted - version: "1.2.1" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.dev" - source: hosted - version: "1.17.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_aepcore: - dependency: "direct main" - description: - name: flutter_aepcore - sha256: "414065152096329fde834e117cd7dced690ea4334a8702fb128400e7b6cb29be" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.dev" - source: hosted - version: "0.6.5" - matcher: - dependency: transitive - description: - name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.dev" - source: hosted - version: "0.12.13" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.dev" - source: hosted - version: "1.8.0" - path: - dependency: transitive - description: - name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.dev" - source: hosted - version: "1.8.2" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.dev" - source: hosted - version: "0.4.16" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" -sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=2.0.0" diff --git a/plugins/flutter_aepuserprofile/pubspec.yaml b/plugins/flutter_aepuserprofile/pubspec.yaml index 62158dd..cc35aed 100644 --- a/plugins/flutter_aepuserprofile/pubspec.yaml +++ b/plugins/flutter_aepuserprofile/pubspec.yaml @@ -1,12 +1,12 @@ name: flutter_aepuserprofile description: Official Adobe Experience Platform support for Flutter apps. The UserProfile extension represents the Adobe Experience Platform SDK's Profile extension which helps manage profile attributes in the client. -version: 4.0.0 +version: 4.0.1 homepage: https://developer.adobe.com/client-sdks repository: https://github.com/adobe/aepsdk_flutter/tree/main/plugins/flutter_aepuserprofile environment: sdk: ">=2.12.0 <3.0.0" - flutter: ">=2.0.0" + flutter: ">=2.0.0 <4.0.0" dependencies: flutter: