Skip to content

Commit 0ca4e61

Browse files
author
markvdouw
authored
Merge branch 'development' into feat/SQDSDKS-5855_identity_caching
2 parents d0e09cc + c7287b6 commit 0ca4e61

6 files changed

Lines changed: 62 additions & 11 deletions

File tree

.github/workflows/cross-platform-tests.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,48 @@ jobs:
1010
uses: actions/checkout@v3
1111
with:
1212
repository: mParticle/crossplatform-sdk-tests
13+
1314
- name: "Checkout Android SDK Branch"
1415
uses: actions/checkout@v3
1516
with:
1617
repository: ${{github.event.pull_request.head.repo.full_name}}
1718
ref: ${{github.head_ref}}
1819
path: .sdks/android
20+
21+
- name: Gradle cache
22+
uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a #v2.9.0
23+
24+
- name: AVD cache
25+
uses: actions/cache@v3
26+
id: avd-cache
27+
with:
28+
path: |
29+
~/.android/avd/*
30+
~/.android/adb*
31+
key: avd-cache
32+
33+
- name: create AVD and generate snapshot for caching
34+
if: steps.avd-cache.outputs.cache-hit != 'true'
35+
uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0
36+
with:
37+
api-level: 29
38+
force-avd-creation: false
39+
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
40+
disable-animations: false
41+
script: echo "Generated AVD snapshot for caching."
42+
1943
- name: "Install JDK 11"
2044
uses: actions/setup-java@v3
2145
with:
2246
distribution: "zulu"
2347
java-version: "11"
2448
- name: "Run Crossplatform Tests"
25-
uses: reactivecircus/android-emulator-runner@b35b1c6e6921ebfd3f980c2236ac298f019df53a #v2.28.0
49+
uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #v2.28.0
2650
with:
2751
api-level: 29
52+
force-avd-creation: false
53+
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
54+
disable-animations: true
2855
script: ./gradlew runAndroid
2956
- name: "Archive Test Results"
3057
if: ${{ always() }}

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
## [5.55.0](https://github.com/mParticle/mparticle-android-sdk/compare/v5.54.0...v5.55.0) (2023-12-13)
2+
3+
4+
### Features
5+
6+
* SQDSDKS-5723 - Remove custom attributes limit to MPEvents. ([#456](https://github.com/mParticle/mparticle-android-sdk/issues/456)) ([32c788e](https://github.com/mParticle/mparticle-android-sdk/commit/32c788ee15d532c2e93a9b50ab996b240341a1f8))
7+
8+
9+
### Bug Fixes
10+
11+
* only delete branch if all succeeds ([f239ba8](https://github.com/mParticle/mparticle-android-sdk/commit/f239ba87fe32fb8fb86d2454b2495fb3890d0653))
12+
13+
## [5.54.0](https://github.com/mParticle/mparticle-android-sdk/compare/v5.53.2...v5.54.0) (2023-11-03)
14+
15+
16+
### Features
17+
18+
* update CI in kits ([5b12dbc](https://github.com/mParticle/mparticle-android-sdk/commit/5b12dbc9b3bf1f72651d1d96882bab104fa434b1))
19+
20+
21+
### Bug Fixes
22+
23+
* kit syntax for lint ([fc63aa1](https://github.com/mParticle/mparticle-android-sdk/commit/fc63aa11683bd8b95fb8300fadcb9a9753fe0eec))
24+
* remove daily cron and fix branch deletion ([57fda36](https://github.com/mParticle/mparticle-android-sdk/commit/57fda36576e5967e5fc2b0cbb7a3f1f1f4c7c902))
25+
26+
27+
### Updates & Maintenance
28+
29+
* pin all third party github actions ([74bcca8](https://github.com/mParticle/mparticle-android-sdk/commit/74bcca86215539a7d452588feb481f1c39554262))
30+
131
## [5.53.2](https://github.com/mParticle/mparticle-android-sdk/compare/v5.53.1...v5.53.2) (2023-10-16)
232

333

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You can grab the Core SDK via Maven Central. Please see the badge above and foll
1616

1717
```groovy
1818
dependencies {
19-
implementation 'com.mparticle:android-core:5.53.2'
19+
implementation 'com.mparticle:android-core:5.55.0'
2020
}
2121
```
2222

@@ -27,8 +27,8 @@ Several integrations require additional client-side add-on libraries called "kit
2727
```groovy
2828
dependencies {
2929
implementation (
30-
'com.mparticle:android-example-kit:5.53.2',
31-
'com.mparticle:android-another-kit:5.53.2'
30+
'com.mparticle:android-example-kit:5.55.0',
31+
'com.mparticle:android-another-kit:5.55.0'
3232
)
3333
}
3434
```

android-core/src/main/java/com/mparticle/internal/Constants.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public static void setMaxMessagePerBatch(int max) {
3636
// preferences persistence
3737
public static final String PREFS_FILE = "mParticlePrefs";
3838

39-
public static final int LIMIT_ATTR_COUNT = 100;
4039
public static final int LIMIT_ATTR_KEY = 256;
4140
public static final int LIMIT_ATTR_VALUE = 4096;
4241
public static final int LIMIT_MAX_MESSAGE_SIZE = 100 * 1024;

android-core/src/main/java/com/mparticle/internal/MPUtility.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -719,11 +719,6 @@ public static Boolean setCheckedAttribute(JSONObject attributes, String key, Obj
719719
if (caseInsensitive) {
720720
key = findCaseInsensitiveKey(attributes, key);
721721
}
722-
723-
if (Constants.LIMIT_ATTR_COUNT == attributes.length() && !attributes.has(key)) {
724-
Logger.error("Attribute count exceeds limit. Discarding attribute: " + key);
725-
return false;
726-
}
727722
if (value != null) {
728723
String stringValue = value.toString();
729724
if (stringValue.length() > Constants.LIMIT_ATTR_VALUE) {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ subprojects {
3535

3636
allprojects {
3737
group = 'com.mparticle'
38-
version = '5.53.2-SNAPSHOT'
38+
version = '5.55.0-SNAPSHOT'
3939
if (project.hasProperty('isRelease') && project.isRelease) {
4040
version = version.toString().replace("-SNAPSHOT", "")
4141
}

0 commit comments

Comments
 (0)