Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dev -> Staging] for bumping major version to 4.0.0 #92

Merged
merged 24 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
dcd48b6
bump the major version to 4.0.0 (to include Android SDK 3.0.0 and iOS…
yangyansong-adbe Apr 5, 2024
fa045ff
specify the ios version
yangyansong-adbe Apr 5, 2024
d58f50c
update CI to use Xcode 15.0.1
yangyansong-adbe Apr 5, 2024
4b1025c
fix CI syntax issue
yangyansong-adbe Apr 5, 2024
4d87759
draft
yangyansong-adbe Apr 9, 2024
f2a0835
cleanup
yangyansong-adbe Apr 9, 2024
1e65e6b
update API doc
yangyansong-adbe Apr 9, 2024
71bf47f
address review comments
yangyansong-adbe Apr 9, 2024
68a7590
address a review comment
yangyansong-adbe Apr 9, 2024
50c4af8
correct timeout accuracy
yangyansong-adbe Apr 9, 2024
6d5d8b6
Update FlutterAEPCorePlugin.m
yangyansong-adbe Apr 9, 2024
d9ade7d
Merge pull request #94 from yangyansong-adbe/dispatchEventWithRespons…
yangyansong-adbe Apr 9, 2024
6302ecb
feat: :arrow_up: messaging api changes
dsoffiantini Apr 10, 2024
4409a3d
Update EdgeBridge sample app and readme
cacheung Apr 11, 2024
c08a27c
refactor: :recycle: rename edge event type for messaging
dsoffiantini Apr 11, 2024
ce8dc7a
Merge pull request #96 from cacheung/edgebridgeupdate
yangyansong-adbe Apr 11, 2024
2b168c5
chore: reenable messaging
dsoffiantini Apr 11, 2024
4af9c1e
Merge commit '18b10e8e9039b7ed419a5248ff6d73b6f30d9429' into dev-v4.0.0
yangyansong-adbe Apr 11, 2024
a14790f
fix: :bug: fixes for messaging
dsoffiantini Apr 11, 2024
6fe17c6
disable unit tests
yangyansong-adbe Apr 11, 2024
8224238
Merge pull request #98 from yangyansong-adbe/disable_ut
yangyansong-adbe Apr 11, 2024
9d98a92
docs: :memo: remove beta language from messaging docs
dsoffiantini Apr 12, 2024
61f0371
Update README for Privacy Manifest changes (#100)
yangyansong-adbe Apr 12, 2024
04af311
fix: :bug: fix oncontentloaded to be android only
dsoffiantini Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 34 additions & 24 deletions .github/workflows/dart.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: 'Dart Unit Tests + Android Build + iOS Build'
on:
name: "Dart Unit Tests + Android Build + iOS Build"
on:
push:
branches:
- main
- staging
paths:
- 'plugins/**'
- 'example/**'
- "plugins/**"
- "example/**"
pull_request:
branches:
- main
- staging
paths:
- 'plugins/**'
- 'example/**'
- "plugins/**"
- "example/**"
jobs:
job1:
name: Build Android example app
Expand All @@ -22,10 +22,10 @@ jobs:
- uses: actions/checkout@v1
- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./example
Expand All @@ -37,16 +37,21 @@ jobs:

job2:
name: Build iOS example app
runs-on: macos-latest
runs-on: macos-13

steps:
- uses: actions/checkout@v1

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: "15.0.1"

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./example
Expand All @@ -68,10 +73,10 @@ jobs:

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./plugins/flutter_aepcore
Expand All @@ -82,17 +87,18 @@ jobs:
run: flutter test

job4:
if: false
name: Assurance unit tests
cdhoffmann marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./plugins/flutter_aepassurance
Expand All @@ -103,17 +109,18 @@ jobs:
run: flutter test

job5:
if: false
name: Edge unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./plugins/flutter_aepedge
Expand All @@ -122,19 +129,20 @@ jobs:
- name: Unit test
working-directory: ./plugins/flutter_aepedge
run: flutter test

job6:
if: false
name: Consent unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./plugins/flutter_aepedgeconsent
Expand All @@ -145,17 +153,18 @@ jobs:
run: flutter test

job7:
if: false
name: EdgeIdentity unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./plugins/flutter_aepedgeidentity
Expand All @@ -165,17 +174,18 @@ jobs:
working-directory: ./plugins/flutter_aepedgeidentity
run: flutter test
job8:
if: false
name: UserProfile unit tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- uses: actions/setup-java@v1
with:
java-version: '12.x'
java-version: "12.x"
- uses: subosito/flutter-action@v2
with:
flutter-version: '2.x'
flutter-version: "2.x"

- name: Install dependencies
working-directory: ./plugins/flutter_aepuserprofile
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ This repository is a monorepo. It contains a collection of Adobe Experience Plat
| [UserProfile](plugins/flutter_aepuserprofile/README.md) | [![pub package](https://img.shields.io/pub/v/flutter_aepuserprofile.svg)](https://pub.dartlang.org/packages/flutter_aepuserprofile) |
| [Messaging](plugins/flutter_aepmessaging/README.md) | [![pub package](https://img.shields.io/pub/v/flutter_aepmessaging.svg)](https://pub.dartlang.org/packages/flutter_aepmessaging) |

## iOS Privacy Manifest

> [!IMPORTANT]
> Adobe Experience Platform Flutter **4.x** plugins now depend on Experience Platform iOS 5.x SDKs, which have been updated to align with Apple's latest guidelines on [privacy manifest](https://developer.apple.com/documentation/bundleresources/privacy_manifest_files). For further details on how Apple's privacy-related announcements affect the Adobe mobile SDK for iOS, please refer to this [document](https://developer.adobe.com/client-sdks/resources/privacy-manifest/).

## Installation

First, make sure that `Flutter` is [installed](https://docs.flutter.dev/get-started/install).
Expand Down Expand Up @@ -49,7 +54,7 @@ Initializing the SDK should be done in native code (AppDelegate / SceneDelegate

As part of the initialization code, make sure that you set the SDK wrapper type to `Flutter` before you start the SDK.

### iOS:
#### iOS:

Add the initialization code in [AppDelegate.m or AppDelegate.swift](/example/ios/Runner/AppDelegate.m#L9) file of the generated iOS project.

Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ android {
defaultConfig {
// 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 19
minSdkVersion 21
cdhoffmann marked this conversation as resolved.
Show resolved Hide resolved
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
146 changes: 73 additions & 73 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
PODS:
- AEPAssurance (4.0.0):
- AEPCore (>= 4.0.0)
- AEPServices (>= 4.0.0)
- AEPCore (4.0.0):
- AEPRulesEngine (>= 4.0.0)
- AEPServices (>= 4.0.0)
- AEPEdge (4.0.0):
- AEPCore (>= 4.0.0)
- AEPEdgeIdentity (>= 4.0.0)
- AEPEdgeBridge (4.0.0):
- AEPCore (>= 4.0.0)
- AEPEdgeConsent (4.0.0):
- AEPCore (>= 4.0.0)
- AEPEdge (>= 4.0.0)
- AEPEdgeIdentity (4.0.0):
- AEPCore (>= 4.0.0)
- AEPIdentity (4.0.0):
- AEPCore (>= 4.0.0)
- AEPLifecycle (4.0.0):
- AEPCore (>= 4.0.0)
- AEPMessaging (4.0.0):
- AEPCore (>= 4.0.0)
- AEPEdge (>= 4.0.0)
- AEPEdgeIdentity (>= 4.0.0)
- AEPServices (>= 4.0.0)
- AEPRulesEngine (4.0.0)
- AEPServices (4.0.0)
- AEPSignal (4.0.0):
- AEPCore (>= 4.0.0)
- AEPUserProfile (4.0.0):
- AEPCore
- AEPAssurance (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPServices (< 6.0.0, >= 5.0.0)
- AEPCore (5.0.0):
- AEPRulesEngine (< 6.0.0, >= 5.0.0)
- AEPServices (< 6.0.0, >= 5.0.0)
- AEPEdge (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPEdgeIdentity (< 6.0.0, >= 5.0.0)
- AEPEdgeBridge (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPEdgeConsent (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPEdge (< 6.0.0, >= 5.0.0)
- AEPEdgeIdentity (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPIdentity (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPLifecycle (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPMessaging (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPEdge (< 6.0.0, >= 5.0.0)
- AEPEdgeIdentity (< 6.0.0, >= 5.0.0)
- AEPServices (< 6.0.0, >= 5.0.0)
- AEPRulesEngine (5.0.0)
- AEPServices (5.0.0)
- AEPSignal (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- AEPUserProfile (5.0.0):
- AEPCore (< 6.0.0, >= 5.0.0)
- Flutter (1.0.0)
- flutter_aepassurance (3.0.0):
- AEPAssurance (~> 4.0)
- flutter_aepassurance (4.0.0):
- AEPAssurance (~> 5.0)
- Flutter
- flutter_aepcore (3.0.0):
- AEPCore (~> 4.0)
- AEPIdentity (~> 4.0)
- AEPLifecycle (~> 4.0)
- AEPSignal (~> 4.0)
- flutter_aepcore (4.0.0):
- AEPCore (~> 5.0)
- AEPIdentity (~> 5.0)
- AEPLifecycle (~> 5.0)
- AEPSignal (~> 5.0)
- Flutter
- flutter_aepedge (3.0.0):
- AEPEdge (~> 4.0)
- flutter_aepedge (4.0.0):
- AEPEdge (~> 5.0)
- Flutter
- flutter_aepedgebridge (3.0.0):
- AEPEdgeBridge (~> 4.0)
- flutter_aepedgebridge (4.0.0):
- AEPEdgeBridge (~> 5.0)
- Flutter
- flutter_aepedgeconsent (3.0.0):
- AEPEdgeConsent (~> 4.0)
- flutter_aepedgeconsent (4.0.0):
- AEPEdgeConsent (~> 5.0)
- Flutter
- flutter_aepedgeidentity (3.0.0):
- AEPEdgeIdentity (~> 4.0)
- flutter_aepedgeidentity (4.0.0):
- AEPEdgeIdentity (~> 5.0)
- Flutter
- flutter_aepmessaging (3.0.0.beta.1):
- AEPCore (~> 4.0)
- AEPMessaging (~> 4.0)
- flutter_aepmessaging (4.0.0):
- AEPCore (~> 5.0)
- AEPMessaging (~> 5.0)
- Flutter
- flutter_aepuserprofile (3.0.0):
- AEPUserProfile (~> 4.0)
- flutter_aepuserprofile (4.0.0):
- AEPUserProfile (~> 5.0)
- Flutter

DEPENDENCIES:
Expand Down Expand Up @@ -108,29 +108,29 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_aepuserprofile/ios"

SPEC CHECKSUMS:
AEPAssurance: 4fa3138ddd7308c1f9923570f4d2b0b8526a916f
AEPCore: dd7cd69696c768c610e6adc0307032985a381c7e
AEPEdge: ffea1ada1e81c9cb239aac694efa5c8635b50c1f
AEPEdgeBridge: 9cf489f2ff34209d18e2ef4df86c74063d575b5b
AEPEdgeConsent: 54c1b6a30a3d646e3d4bc4bae1713755422b471e
AEPEdgeIdentity: c2396b9119abd6eb530ea11efc58ec019b163bd4
AEPIdentity: 45ee1c3717e08ff3ca60930caf4a869d60d7bf08
AEPLifecycle: 59be1b5381d8ec4939ece43516ea7d2de4aaba65
AEPMessaging: b5693ae07e7bfb27f375a2d86640b60989b8338f
AEPRulesEngine: 458450a34922823286ead045a0c2bd8c27e224c6
AEPServices: ca493988df250d84fda050124ff7549bcc43c65f
AEPSignal: b2b332adf4d8a9af6a1b57f5dd8c2e1ea6d5c112
AEPUserProfile: 5c1d90014627cacff99efb193ce9acd287905661
AEPAssurance: 7f260ded4df38a70a06efebade8c33a3e3221984
AEPCore: f1c3e9238bb12e7e1103f4407c341ebc65aeab5b
AEPEdge: 6bc7c3f6573fdf0a12fb3ddfd32420112a89c80b
AEPEdgeBridge: be78be4885ae420ef21bda91707d5eff9510ef70
AEPEdgeConsent: d7db1d19eb4c1e2146360ed3c8df315f671b26d5
AEPEdgeIdentity: 3161ff33434586962946912d6b8e9e8fca1c4d23
AEPIdentity: a65c1eba43a06f01b0dab191b27a53a81adada57
AEPLifecycle: d4e0e1e86d6225d87203875d67f56c48f7ab7f67
AEPMessaging: 63ea36bff1476ee61578df6f9f439df02a7283c9
AEPRulesEngine: fe5800653a4bee07b1e41e61b4d5551f0dba557b
AEPServices: e42e5118128e81c0f797fdfb1dc9c4a714d644b8
AEPSignal: b146a3d4e5af51ff588f4f1ffbd40f1541325143
AEPUserProfile: cf36305d683d993d528337a46b7a269029b63e5d
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_aepassurance: b233dea439a022f8f3f4ae52cfdf753e04b1b72f
flutter_aepcore: 3481b755a03bbc3562681fa4a411ccddf0813156
flutter_aepedge: 7b3a586744fe19a325b34e902b5fff7bab26bfdb
flutter_aepedgebridge: e46c86eacbfe8333396d42183d872e6df0be9eb5
flutter_aepedgeconsent: d196b2a4aba755d479e1954d4f19587e36c0d6f9
flutter_aepedgeidentity: e6f6b4ff142c2babc0377639ab179f9743b380c2
flutter_aepmessaging: 69cc9b0625a095109feae0a6f796d40b87c0d616
flutter_aepuserprofile: f0d6b073500d55bdbd5e3cb0cbb7734c282df5cf
flutter_aepassurance: 3b0c0b2d135ea0d8abef3e2a26ec13517658ece0
flutter_aepcore: 6e354136a75938fe4670aefb5f4f664ef1ed3b25
flutter_aepedge: d23f2b983198c2b7ab52637cd4212952544bed2c
flutter_aepedgebridge: 3e8041b694f6267513d6178ffb2abc1a8eba349c
flutter_aepedgeconsent: a50a8c90df588d75aef758b0258b7bbdb1906167
flutter_aepedgeidentity: 9eed9300833fe225f9f8bcc9d52dbee81a1811ea
flutter_aepmessaging: e4a6b4b3d6c15b064e0d0665f63e83d7fdf2d285
flutter_aepuserprofile: a2ba9de310969c805158ae7b46497a1746ce3c85

PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
PODFILE CHECKSUM: 4e8f8b2be68aeea4c0d5beb6ff1e79fface1d048

COCOAPODS: 1.11.3
Loading
Loading