Bump minSdk to 33 and upgrade unit test dependencies

This commit is contained in:
Torsten Grote 2023-10-09 10:57:26 -03:00
parent 74566b902a
commit cb95444ad4
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
8 changed files with 20 additions and 14 deletions

View file

@ -18,7 +18,7 @@ android {
compileSdk rootProject.ext.compileSdk compileSdk rootProject.ext.compileSdk
defaultConfig { defaultConfig {
minSdk 32 // leave at 32 for robolectric tests minSdk rootProject.ext.minSdk
targetSdk rootProject.ext.targetSdk targetSdk rootProject.ext.targetSdk
versionNameSuffix "-$gitDescribe" versionNameSuffix "-$gitDescribe"
testInstrumentationRunner "com.stevesoltys.seedvault.KoinInstrumentationTestRunner" testInstrumentationRunner "com.stevesoltys.seedvault.KoinInstrumentationTestRunner"
@ -52,6 +52,10 @@ android {
jvmTarget = JavaVersion.VERSION_17.toString() jvmTarget = JavaVersion.VERSION_17.toString()
languageVersion = "1.8" languageVersion = "1.8"
} }
packagingOptions {
exclude("META-INF/LICENSE.md")
exclude("META-INF/LICENSE-notice.md")
}
testOptions { testOptions {
unitTests.all { unitTests.all {
useJUnitPlatform() useJUnitPlatform()
@ -144,11 +148,8 @@ dependencies {
// anything less than 'implementation' fails tests run with gradlew // anything less than 'implementation' fails tests run with gradlew
testImplementation rootProject.ext.aosp_libs testImplementation rootProject.ext.aosp_libs
testImplementation 'androidx.test.ext:junit:1.1.3' testImplementation 'androidx.test.ext:junit:1.1.5'
testImplementation('org.robolectric:robolectric:4.8.1') { testImplementation('org.robolectric:robolectric:4.10.3')
// https://github.com/robolectric/robolectric/issues/5245
exclude group: "com.google.auto.service", module: "auto-service"
}
testImplementation 'org.hamcrest:hamcrest:2.2' testImplementation 'org.hamcrest:hamcrest:2.2'
testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version" testImplementation "org.junit.jupiter:junit-jupiter-api:$junit5_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version" testImplementation "org.junit.jupiter:junit-jupiter-params:$junit5_version"

View file

@ -41,7 +41,7 @@ import kotlin.random.Random
@Suppress("DEPRECATION") @Suppress("DEPRECATION")
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
@Config( @Config(
sdk = [32], // robolectric does not support 33, yet sdk = [33], // robolectric does not support 34, yet
application = TestApp::class application = TestApp::class
) )
class MetadataManagerTest { class MetadataManagerTest {

View file

@ -19,7 +19,7 @@ import org.robolectric.annotation.Config
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
@Config( @Config(
sdk = [32], // robolectric does not support 33, yet sdk = [33], // robolectric does not support 34, yet
application = TestApp::class application = TestApp::class
) )
internal class DocumentFileTest { internal class DocumentFileTest {

View file

@ -22,7 +22,7 @@ import kotlin.random.Random
@RunWith(AndroidJUnit4::class) @RunWith(AndroidJUnit4::class)
@Config( @Config(
sdk = [32], // robolectric does not support 33, yet sdk = [33], // robolectric does not support 34, yet
application = TestApp::class application = TestApp::class
) )
internal class DeviceInfoTest { internal class DeviceInfoTest {

View file

@ -22,7 +22,7 @@ plugins {
ext { ext {
compileSdk = 34 compileSdk = 34
minSdk = 32 minSdk = 33
targetSdk = 34 targetSdk = 34
} }

View file

@ -30,6 +30,11 @@ android {
jvmTarget = JavaVersion.VERSION_17.toString() jvmTarget = JavaVersion.VERSION_17.toString()
} }
packagingOptions {
exclude("META-INF/LICENSE.md")
exclude("META-INF/LICENSE-notice.md")
}
testOptions { testOptions {
unitTests.returnDefaultValues = true unitTests.returnDefaultValues = true
} }
@ -67,7 +72,7 @@ dependencies {
testImplementation "io.mockk:mockk:$mockk_version" testImplementation "io.mockk:mockk:$mockk_version"
androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" androidTestImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
androidTestImplementation "io.mockk:mockk-android:$mockk_version" androidTestImplementation "io.mockk:mockk-android:$mockk_version"
} }

View file

@ -6,8 +6,8 @@ ext {
// test dependencies below - these do not care about AOSP and can be freely updated // test dependencies below - these do not care about AOSP and can be freely updated
junit4_version = "4.13.2" junit4_version = "4.13.2"
junit5_version = "5.7.2" // careful, upgrading this can change a Cipher's IV size in tests!? junit5_version = "5.10.0" // careful, upgrading this can change a Cipher's IV size in tests!?
mockk_version = "1.12.3" mockk_version = "1.13.4" // newer versions require kotlin > 1.8.10
espresso_version = "3.4.0" espresso_version = "3.4.0"
} }

View file

@ -99,7 +99,7 @@ dependencies {
testImplementation "io.mockk:mockk:$mockk_version" testImplementation "io.mockk:mockk:$mockk_version"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version" testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version" androidTestImplementation "androidx.test.espresso:espresso-core:$espresso_version"
} }