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

4.2 prerelease #406

Merged
merged 36 commits into from
Jan 13, 2022
Merged

4.2 prerelease #406

merged 36 commits into from
Jan 13, 2022

Conversation

thomassth
Copy link
Contributor

Wait 7 days then go to main release?

FCView and others added 30 commits July 31, 2021 14:51
(cherry picked from commit 87710e0)
# Conflicts:
#	android/src/main/kotlin/com/builttoroam/devicecalendar/CalendarDelegate.kt
#	example/lib/presentation/pages/calendar_add.dart
#	example/lib/presentation/pages/calendar_event.dart
#	lib/src/models/event.dart
Enable multiple-day allDay events on Android
iOS integration test execution framework
…ed compile error

1.error: 'AAPT: error: resource android:attr/lStar' not found when building apk in release mode
2.causes: androidx.appcompat incompatibility

Signed-off-by: zhuyangyang <[email protected]>
Fix the compile error caused by andoidx.appcompat incompatibility when building apk in release mode
@thomassth thomassth changed the title 4.1 prerelease 2 4.2 prerelease Jan 11, 2022
@thomassth thomassth mentioned this pull request Jan 11, 2022
sowens-csd
sowens-csd previously approved these changes Jan 13, 2022
Copy link
Contributor

@sowens-csd sowens-csd left a comment

Choose a reason for hiding this comment

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

Agree

@thomassth
Copy link
Contributor Author

New commits cancels out previous approvals. Sorry.

@thomassth thomassth merged commit 031d3dd into release Jan 13, 2022
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.

5 participants