diff options
Diffstat (limited to 'format-common')
4 files changed, 3 insertions, 18 deletions
diff --git a/format-common/build.gradle.kts b/format-common/build.gradle.kts index 487d0bc1..8382436c 100644 --- a/format-common/build.gradle.kts +++ b/format-common/build.gradle.kts @@ -5,27 +5,20 @@ @file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage") plugins { - id("com.github.android-password-store.android-library") - id("com.github.android-password-store.kotlin-android") + kotlin("jvm") id("com.github.android-password-store.kotlin-library") } -android { - namespace = "app.passwordstore.format.common" - compileOptions { isCoreLibraryDesugaringEnabled = true } -} - dependencies { api(libs.kotlin.coroutines.core) api(libs.thirdparty.kotlinResult) - coreLibraryDesugaring(libs.android.desugarJdkLibs) implementation(projects.coroutineUtils) implementation(libs.androidx.annotation) implementation(libs.dagger.hilt.core) implementation(libs.thirdparty.commons.codec) + implementation(libs.thirdparty.uri) testImplementation(projects.coroutineUtilsTesting) testImplementation(libs.bundles.testDependencies) testImplementation(libs.kotlin.coroutines.test) - testImplementation(libs.testing.robolectric) testImplementation(libs.testing.turbine) } diff --git a/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt b/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt index 741a21a7..bb97c90c 100644 --- a/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt +++ b/format-common/src/main/kotlin/app/passwordstore/util/totp/UriTotpFinder.kt @@ -1,6 +1,6 @@ package app.passwordstore.util.totp -import android.net.Uri +import com.eygraber.uri.Uri import javax.inject.Inject /** [Uri] backed TOTP URL parser. */ diff --git a/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt index 31ced9f3..73e55b34 100644 --- a/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt +++ b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt @@ -23,11 +23,8 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay import kotlinx.coroutines.test.runTest import org.junit.Rule -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner @OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class) -@RunWith(RobolectricTestRunner::class) class PasswordEntryTest { @get:Rule val coroutineTestRule: CoroutineTestRule = CoroutineTestRule() diff --git a/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt b/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt index c62df0e7..e462c490 100644 --- a/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt +++ b/format-common/src/test/kotlin/app/passwordstore/util/totp/UriTotpFinderTest.kt @@ -7,12 +7,7 @@ package app.passwordstore.util.totp import kotlin.test.Test import kotlin.test.assertEquals -import org.junit.runner.RunWith -import org.robolectric.RobolectricTestRunner -import org.robolectric.annotation.Config -@RunWith(RobolectricTestRunner::class) -@Config(sdk = [23]) class UriTotpFinderTest { private val totpFinder = UriTotpFinder() |