Skip to content

Merge the latest staging to the typescript branch #153

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.

Sign up for GitHub

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

Merged
merged 22 commits into from
Mar 21, 2022
Merged

Merge the latest staging to the typescript branch #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e2d43c5
Staging -> main for beta.1 release (#129)
yangyansong-adbe Dec 20, 2021
86ecce9
clean up README
yangyansong-adbe Dec 20, 2021
2de1d21
Add a migration doc for ACP library users (#137)
yangyansong-adbe Feb 9, 2022
1bfe21d
Update API reference for Core & Profile extensions (#138)
yangyansong-adbe Feb 9, 2022
c8939cc
fix heading style for API names (#140)
yangyansong-adbe Feb 9, 2022
ca83161
Add registering extensions example in UserProfile README (#142)
yangyansong-adbe Feb 10, 2022
8265232
Merge pull request #144 from cacheung/EdgeResponse
cacheung Feb 18, 2022
29c38d5
Add Arraylist support in WriteableArray
cacheung Feb 18, 2022
5d378ee
Add ArrayList check for more locations.
cacheung Feb 18, 2022
4550ae1
Change checking the instanceof List instead of the ArrayList
cacheung Feb 28, 2022
f7d0b58
Merge pull request #145 from cacheung/EdgeResponse
cacheung Feb 28, 2022
d4181fe
Merge pull request #147 from adobe/edge
cacheung Mar 1, 2022
237a47c
Add List Array check for Writeable Map in Utils files
cacheung Mar 3, 2022
023d4b8
convert data to WritableMap when passing it to javascript (#149)
yangyansong-adbe Mar 7, 2022
8c22421
Merge branch 'staging' of github.com:adobe/aepsdk-react-native into List
cacheung Mar 7, 2022
4ba4660
Remove unused writeableMap for EdgeIdentity
cacheung Mar 8, 2022
2476bc5
Merge pull request #148 from cacheung/List
cacheung Mar 8, 2022
b4dcaf0
Edge Beta.2 release (#150)
cacheung Mar 11, 2022
4d9841e
Merge branch 'main' into staging
yangyansong-adbe Mar 11, 2022
7454ee2
Update README.md
yangyansong-adbe Mar 11, 2022
e054bfc
Update README.md
yangyansong-adbe Mar 11, 2022
c968331
Merge branch 'staging' into typescript
yangyansong-adbe Mar 21, 2022
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
4 changes: 2 additions & 2 deletions apps/AEPSampleApp/ios/AEPSampleApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -598,7 +598,7 @@
COPY_PHASE_STRIP = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand Down
12 changes: 6 additions & 6 deletions apps/AEPSampleApp/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- AEPAssurance (3.0.0):
- AEPAssurance (3.0.1):
- AEPCore (>= 3.1.0)
- AEPServices (>= 3.1.0)
- AEPCore (3.4.2):
Expand Down Expand Up @@ -56,7 +56,7 @@ PODS:
- AEPLifecycle (~> 3.0)
- AEPSignal (~> 3.0)
- React
- RCTAEPEdge (1.0.0-beta.2):
- RCTAEPEdge (1.0.0-beta.3):
- AEPEdge (~> 1.0)
- React
- RCTAEPEdgeConsent (1.0.0-beta.2):
Expand Down Expand Up @@ -502,7 +502,7 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
AEPAssurance: 18068627111e366a851dc2166239f22b665101bd
AEPAssurance: b25880cd4b14f22c61a1dce19807bd0ca0fe9b17
AEPCore: b01856bf24972e4720cb0511a358d1e68067252a
AEPEdge: 500628aee1319ef2690dfaf5bd950badce6ec3f0
AEPEdgeConsent: dd46002b0c4bf55443f5441990e799248975713e
Expand All @@ -517,12 +517,12 @@ SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
FBReactNativeSpec: 8079de7dfa4fd4aab0e97969116b246069f7ec3e
FBReactNativeSpec: a2f531d996fa0cfec14dc62700efc19d68982a65
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
RCT-Folly: ec7a233ccc97cc556cf7237f0db1ff65b986f27c
RCTAEPAssurance: 94562ecc3e0a741aa262daee2cae4a1fc93ed6b3
RCTAEPCore: 8c04356c2651dac760b3a922c217da5cd729e498
RCTAEPEdge: 000abd4e9ea531a6cc2058b647f91b637ebf3977
RCTAEPEdge: 308c26f53c329ed30d01f21746563c114a808ce2
RCTAEPEdgeConsent: c493ca5e10156ff42899786d323cfacdbc55c661
RCTAEPEdgeIdentity: 063277b28ec5197ca61a0c28926ad5091c081856
RCTAEPMessaging: 5ff246c624ceb253f93dbb1ae96af4ec898c91af
Expand Down Expand Up @@ -558,4 +558,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 72fa28983148c9436f08736f91f61421c635e9b6

COCOAPODS: 1.11.2
COCOAPODS: 1.10.1
6 changes: 3 additions & 3 deletions apps/AEPSampleApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aepsampleapp",
"version": "1.0.0-beta.1",
"version": "1.0.0-beta.2",
"private": true,
"scripts": {
"cleanup": "rm -rf node_modules",
Expand All @@ -13,7 +13,7 @@
"dependencies": {
"@adobe/react-native-aepassurance": "^3.0.0-beta.2",
"@adobe/react-native-aepcore": "^1.0.0-beta.2",
"@adobe/react-native-aepedge": "^1.0.0-beta.2",
"@adobe/react-native-aepedge": "^1.0.0-beta.3",
"@adobe/react-native-aepedgeconsent": "^1.0.0-beta.2",
"@adobe/react-native-aepedgeidentity": "^1.0.0-beta.2",
"@adobe/react-native-aepmessaging": "^1.0.0-beta.2",
Expand Down Expand Up @@ -47,4 +47,4 @@
"node"
]
}
}
}
Loading