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

Address backwards compatibility issues with AndroidX #464

Merged
merged 6 commits into from
Mar 18, 2020

Conversation

harvsu
Copy link
Contributor

@harvsu harvsu commented Mar 16, 2020

Cherry pick commits in #443 #444 #445 #457

To address back-porting issues with AndroidX, the current code base is adjusted to build SDKs with and with out AndroidX library.
https://stackoverflow.com/questions/55172932/android-x-backwards-compatibility
To achieve this, the releases are backtracked to Telem 4.7.0/Core 1.4.0 to maintain two different sets of code with and without AndroidX migration changes.
Telem 4.7.0/Core 1.4.0 is the latest release before which AndroidX was included.

https://github.com/mapbox/mapbox-events-android/tree/long-term-support is branched off at the commit where Telem 4.7.0/Core 1.4.0 release was tagged and this acts as a pseudo master for non AndroidX Code from here on.

master branch tracks the code with AndroidX and includes all new feature/code additions from now on. These new additions will be cherrypicked to https://github.com/mapbox/mapbox-events-android/tree/long-term-support as necessary.

Commits that occurred in releases Telem 4.7.1/Core 1.4.1, Telem 4.7.2 and Teleme 4.7.3(released so far) in master branch will be streamlined and reorganised in further releases as per https://github.com/mapbox/mobile-telemetry/issues/537

@codecov
Copy link

codecov bot commented Mar 16, 2020

Codecov Report

Merging #464 into long-term-support will decrease coverage by 0.28%.
The diff coverage is 33.33%.

@@                   Coverage Diff                   @@
##             long-term-support     #464      +/-   ##
=======================================================
- Coverage                68.65%   68.36%   -0.29%     
  Complexity                 394      394              
=======================================================
  Files                       69       69              
  Lines                     2144     2156      +12     
  Branches                   171      171              
=======================================================
+ Hits                      1472     1474       +2     
- Misses                     575      584       +9     
- Partials                    97       98       +1

@harvsu harvsu requested a review from nkukday March 16, 2020 23:45
@harvsu harvsu assigned alfwatt and unassigned alfwatt Mar 16, 2020
@harvsu harvsu requested a review from alfwatt March 16, 2020 23:45
@harvsu harvsu force-pushed the reorganize-releases-4.7.4_1.4.2 branch from cf89236 to 34bba45 Compare March 16, 2020 23:53
@harvsu harvsu self-assigned this Mar 16, 2020
@harvsu harvsu changed the title Apply commits in #443 #444 #445 #457 as a patch Cherry pick commits in #443 #444 #445 #457 as a patch Mar 17, 2020
@harvsu harvsu changed the title Cherry pick commits in #443 #444 #445 #457 as a patch Cherry pick commits in #443 #444 #445 #457 Mar 17, 2020
@harvsu harvsu force-pushed the reorganize-releases-4.7.4_1.4.2 branch from f03db87 to 4be1934 Compare March 17, 2020 01:10
@harvsu harvsu changed the title Cherry pick commits in #443 #444 #445 #457 Address backwards compatibility issues with AndroidX Mar 17, 2020
Gradle Version : 5.6.4
Android Gradle Plugin Version : 3.5.3
Update version to 4.7.1 in package.json
Add custom socket factory and set TrafficStats.setThreadStatsTag(1000) for configuration client(okhttpClient).
* Fix obfuscation:

Prevent obfuscation of Event classes to keep properties in JSON schema unaltered.
Throw Assertion Error in Test App in case of POST failure for an event.
Set minifyEnabled true in build.gradle for debug build to make the test
app behave close to production app.
Add button on test app's main screen, which sends turnstile event on click.
Add @SerializedName annotation to Turnstile and Crash Event properties
to keep them consistent with other events.
Fix Location Schema test to ignore the properties(speed, course, floor,
speedAccuracy, courseAccuracy, and verticalAccuracy) that are
added in the backend but not incorporated into the SDK yet!
@harvsu harvsu force-pushed the reorganize-releases-4.7.4_1.4.2 branch from 9547245 to f3de6e1 Compare March 17, 2020 20:27
@harvsu harvsu force-pushed the reorganize-releases-4.7.4_1.4.2 branch from 61e38a8 to f3de6e1 Compare March 17, 2020 22:14
Append -lts to name of the binary while publishing the binary size.
Update Version in gradle.properties and package.json.
Copy link
Contributor

@alfwatt alfwatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved but with questions about the debug build

app/build.gradle Show resolved Hide resolved
@harvsu harvsu merged commit 723ff4d into long-term-support Mar 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants