Merged
Conversation
* Handle empty timezones Signed-off-by: Arnau Mora <arnyminerz@proton.me> * Just check for empty timezones Signed-off-by: Arnau Mora <arnyminerz@proton.me> * Add clarifying comment Signed-off-by: Arnau Mora <arnyminerz@proton.me> --------- Signed-off-by: Arnau Mora <arnyminerz@proton.me>
* Update minSdkVersion * - Replace deprecated `closeCompat()` with standard `close()` - Remove compatibility method `closeCompat()` from `MiscUtils` --------- Co-authored-by: cketti <ck@cketti.de>
Bumps the lib-dependencies group with 2 updates: gradle-wrapper and com.android.library. Updates `gradle-wrapper` from 9.3.1 to 9.4.0 Updates `com.android.library` from 9.0.1 to 9.1.0 --- updated-dependencies: - dependency-name: gradle-wrapper dependency-version: 9.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: lib-dependencies - dependency-name: com.android.library dependency-version: 9.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: lib-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Member
|
It should be possible to override the branch protection rule, we can just do that. Have activated merge and rebase in repo settings, too |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges changes from
mainintoical4j-3to4, so we don't have to worry about merge conflicts when mergingical4j-3to4intomainonce the ical4j 4.x migration is done.The commits in this PR probably shouldn't be squashed, so it's easier to follow which commits have been merged.
@rfc2822: You probably have to temporarily change the branch protection rules in order to allow this.