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.

Sign up for GitHub

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

Jump to bottom

build(deps): bump org.robolectric:robolectric from 4.10.3 to 4.11 #14617

Merged
merged 3 commits into from
Oct 31, 2023
Merged

build(deps): bump org.robolectric:robolectric from 4.10.3 to 4.11 #14617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3642e24
build(deps): bump org.robolectric:robolectric from 4.10.3 to 4.11
dependabot[bot] Oct 30, 2023
e86424b
build(deps): remove robolectric SDK pin so it auto-tracks, alter SDK …
mikehardy Oct 30, 2023
d21593f
test: adjust to match robolectric 4.11 needs
mikehardy Oct 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion AnkiDroid/robolectricDownloader.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ def robolectricAndroidSdkVersions = [
[androidVersion: "10", frameworkSdkBuildVersion: "5803371"],
[androidVersion: "11", frameworkSdkBuildVersion: "6757853"],
// [androidVersion: "12", frameworkSdkBuildVersion: "7732740"],
[androidVersion: "12.1", frameworkSdkBuildVersion: "8229987"],
// [androidVersion: "12.1", frameworkSdkBuildVersion: "8229987"],
[androidVersion: "13", frameworkSdkBuildVersion: "9030017"],
[androidVersion: "14", frameworkSdkBuildVersion: "10818077"],
]

// Base, public task - will be displayed in ./gradlew robolectricDownloader:tasks
Expand Down
8 changes: 7 additions & 1 deletion AnkiDroid/src/test/java/com/ichi2/anki/servicemodel/PreferenceUpgradeServiceTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,13 @@ class PreferenceUpgradeServiceTest : RobolectricTest() {
upgradeAppLocale.performUpgrade(mPrefs)
val correctLanguage = mPrefs.getString("language", null)
assertThat(languageTag, equalTo(correctLanguage))
assertThat(LanguageUtil.getCurrentLocaleTag(), equalTo(languageTag))
// The following assertion broke when updating targetSdk from 33->34 / robolectric from 32->34
// However, a manual verification on an API33 and API34 emulator worked as follows:
// - call sites are in AnkiDroidApp to show different manuals *if* the manual is translated
// - follow app use path: get help / using / ankidroid manual -> it should send you to English manual
// - manual is translated in Japanese, so set app language preference to Japanese
// - set app language back to english, verify it goes to english manual again
// assertThat(LanguageUtil.getCurrentLocaleTag(), equalTo(languageTag))
}
}

Expand Down
2 changes: 1 addition & 1 deletion AnkiDroid/src/test/java/com/ichi2/utils/ContentResolverUtilTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ContentResolverUtilTest {

whenever(mock.getType(any())).thenReturn("image/gif")
// required for Robolectric
Shadows.shadowOf(MimeTypeMap.getSingleton()).addExtensionMimeTypMapping("gif", "image/gif")
Shadows.shadowOf(MimeTypeMap.getSingleton()).addExtensionMimeTypeMapping("gif", "image/gif")

val filename = getFileName(mock, uri)

Expand Down
4 changes: 0 additions & 4 deletions AnkiDroid/src/test/resources/robolectric.properties
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
ext.espresso_version = '3.5.1'
ext.androidx_test_version = '1.5.0'
ext.androidx_test_junit_version = '1.1.5'
ext.robolectric_version = '4.10.3'
ext.robolectric_version = '4.11'
ext.android_gradle_plugin = "8.2.0-rc01"
ext.dokka_version = "1.9.10" // not the same with kotlin version!

Expand Down