diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle index 3e61d9d2882..20f9b89e182 100644 --- a/owncloudApp/build.gradle +++ b/owncloudApp/build.gradle @@ -160,6 +160,11 @@ android { } testOptions { + packagingOptions { + jniLibs { + useLegacyPackaging = true + } + } unitTests.returnDefaultValues = true animationsDisabled = true } diff --git a/owncloudApp/src/androidTest/java/com/owncloud/android/utils/ReleaseNotesList.kt b/owncloudApp/src/androidTest/java/com/owncloud/android/utils/ReleaseNotesList.kt index dec200fba1e..16a2cde32a7 100644 --- a/owncloudApp/src/androidTest/java/com/owncloud/android/utils/ReleaseNotesList.kt +++ b/owncloudApp/src/androidTest/java/com/owncloud/android/utils/ReleaseNotesList.kt @@ -25,38 +25,18 @@ import com.owncloud.android.presentation.releasenotes.ReleaseNoteType val releaseNotesList = listOf( ReleaseNote( - title = R.string.release_notes_4_1_title_1, - subtitle = R.string.release_notes_4_1_subtitle_1, - type = ReleaseNoteType.ENHANCEMENT, + title = R.string.release_notes_header, + subtitle = R.string.release_notes_footer, + type = ReleaseNoteType.BUGFIX ), ReleaseNote( - title = R.string.release_notes_4_1_title_2, - subtitle = R.string.release_notes_4_1_subtitle_2, - type = ReleaseNoteType.ENHANCEMENT, + title = R.string.release_notes_header, + subtitle = R.string.release_notes_footer, + type = ReleaseNoteType.BUGFIX ), ReleaseNote( - title = R.string.release_notes_4_1_title_3, - subtitle = R.string.release_notes_4_1_subtitle_3, - type = ReleaseNoteType.ENHANCEMENT, - ), - ReleaseNote( - title = R.string.release_notes_4_1_title_4, - subtitle = R.string.release_notes_4_1_subtitle_4, - type = ReleaseNoteType.BUGFIX, - ), - ReleaseNote( - title = R.string.release_notes_4_1_title_5, - subtitle = R.string.release_notes_4_1_subtitle_5, - type = ReleaseNoteType.ENHANCEMENT, - ), - ReleaseNote( - title = R.string.release_notes_4_1_title_6, - subtitle = R.string.release_notes_4_1_subtitle_6, - type = ReleaseNoteType.ENHANCEMENT, - ), - ReleaseNote( - title = R.string.release_notes_4_1_title_7, - subtitle = R.string.release_notes_4_1_subtitle_7, - type = ReleaseNoteType.BUGFIX, - ), + title = R.string.release_notes_header, + subtitle = R.string.release_notes_footer, + type = ReleaseNoteType.ENHANCEMENT + ) )