Merge next into master
#5536
Merged
Merge next into master
#5536
Conversation
This file contains 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
… importing settings
Run `master` CI jobs on `next` as well
Remove ability to set Google account as server
…2023.2 Dependency updates v2023.2
Add notes about regression testing process
Bumped the targed sdk version
Remove untested and (believed to be) unnecessary updateAnswersForScreen calls
Improved scheduling auto-send jobs
seadowg
force-pushed
the
next
branch
2 times, most recently
from
e0b3b39 to
af19f11
Compare
Add tests for save points
seadowg
commented
Mar 31, 2023
| @@ -56,27 +55,6 @@ class GoogleDriveDeprecationTest { | |||
| .assertText(R.string.google_drive_deprecation_message) | |||
| } | |||
|
|
|||
| @Test | |||
| fun bannerDisappearsAfterSwitchingFromGoogleDriveProjectToOdkServer() { | |||
There was a problem hiding this comment.
This test is no longer relevant.
seadowg
commented
Mar 31, 2023
| @@ -21,7 +21,7 @@ object Dependencies { | |||
| const val androidx_multidex = "androidx.multidex:multidex:2.0.1" | |||
| const val androidx_preference_ktx = "androidx.preference:preference-ktx:1.2.0" | |||
| const val androidx_fragment_ktx = "androidx.fragment:fragment-ktx:${Versions.androidx_fragment}" | |||
| const val android_material = "com.google.android.material:material:1.8.0" | |||
| const val android_material = "com.google.android.material:material:1.7.0" | |||
There was a problem hiding this comment.
It looks like there is a problem with MaterialCardView using a Material 3 style with a non-Material 3 theme that we need to address to upgrade to 1.8.0
grzesiek2010
approved these changes
Apr 3, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
We end up with a merge commit (from
masterback intonext) to make this all work, but I think that's better than rebasing so that we don't change commit SHAs and clobber any useful links between commits and PRs. The most important thing to review is the merge commit itself.