Cleanup dependency declarations and upgrade to Kotlin 1.6.0 (#1565)
This commit is contained in:
Harsh Shandilya
GitHub
parent
99c7913a48
commit
1ade4eaf64
10 changed files with 124 additions and 117 deletions
|
|
@ -11,12 +11,12 @@ import android.content.SharedPreferences
|
|||
import androidx.core.content.edit
|
||||
import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder
|
||||
import dev.msfjarvis.aps.util.extensions.getString
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Before
|
||||
import kotlin.test.BeforeTest
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertFalse
|
||||
import kotlin.test.assertNull
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.rules.TemporaryFolder
|
||||
|
||||
class MigrationsTest {
|
||||
|
|
@ -29,7 +29,7 @@ class MigrationsTest {
|
|||
private lateinit var encryptedSharedPreferences: SharedPreferences
|
||||
private lateinit var proxySharedPreferences: SharedPreferences
|
||||
|
||||
@Before
|
||||
@BeforeTest
|
||||
fun setup() {
|
||||
context = SPMockBuilder().createContext()
|
||||
filesDir = tempFolder.root.path
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
package dev.msfjarvis.aps.util.totp
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
*/
|
||||
package dev.msfjarvis.aps.util.viewmodel
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertFalse
|
||||
import kotlin.test.assertNull
|
||||
import kotlin.test.assertTrue
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
package mozilla.components.lib.publicsuffixlist
|
||||
|
||||
import org.junit.Test
|
||||
import kotlin.test.Test
|
||||
|
||||
class PublicSuffixListLoaderTest {
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ gradlePlugin {
|
|||
|
||||
dependencies {
|
||||
implementation("com.android.tools.build:gradle:7.0.3")
|
||||
implementation("com.google.dagger:hilt-android-gradle-plugin:2.40.1")
|
||||
implementation("com.google.dagger:hilt-android-gradle-plugin:2.40.3")
|
||||
implementation("com.squareup.okhttp3:okhttp:4.9.0")
|
||||
implementation("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
|
||||
implementation("com.vdurmont:semver4j:3.1.0")
|
||||
implementation("de.undercouch:gradle-download-task:4.1.2")
|
||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.5.31")
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31")
|
||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0")
|
||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,32 +3,48 @@ package dev.msfjarvis.aps.crypto
|
|||
import com.github.michaelbull.result.unwrap
|
||||
import com.github.michaelbull.result.unwrapError
|
||||
import java.io.File
|
||||
import kotlin.test.AfterTest
|
||||
import kotlin.test.BeforeTest
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertIs
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineDispatcher
|
||||
import kotlinx.coroutines.test.runBlockingTest
|
||||
import kotlinx.coroutines.test.StandardTestDispatcher
|
||||
import kotlinx.coroutines.test.TestScope
|
||||
import kotlinx.coroutines.test.resetMain
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlinx.coroutines.test.setMain
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.rules.TemporaryFolder
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
class PGPKeyManagerTest {
|
||||
|
||||
@get:Rule val temporaryFolder: TemporaryFolder = TemporaryFolder()
|
||||
private val filesDir by lazy(LazyThreadSafetyMode.NONE) { temporaryFolder.root }
|
||||
private val keysDir by
|
||||
lazy(LazyThreadSafetyMode.NONE) { File(filesDir, PGPKeyManager.KEY_DIR_NAME) }
|
||||
private val testCoroutineDispatcher = TestCoroutineDispatcher()
|
||||
private val keyManager by
|
||||
lazy(LazyThreadSafetyMode.NONE) {
|
||||
PGPKeyManager(filesDir.absolutePath, testCoroutineDispatcher)
|
||||
}
|
||||
private val filesDir by unsafeLazy { temporaryFolder.root }
|
||||
private val keysDir by unsafeLazy { File(filesDir, PGPKeyManager.KEY_DIR_NAME) }
|
||||
private val dispatcher = StandardTestDispatcher()
|
||||
private val scope = TestScope(dispatcher)
|
||||
private val keyManager by unsafeLazy { PGPKeyManager(filesDir.absolutePath, dispatcher) }
|
||||
private val key = PGPKeyManager.makeKey(TestUtils.getArmoredPrivateKey())
|
||||
|
||||
private fun <T> unsafeLazy(initializer: () -> T) =
|
||||
lazy(LazyThreadSafetyMode.NONE) { initializer.invoke() }
|
||||
|
||||
@BeforeTest
|
||||
fun setUp() {
|
||||
Dispatchers.setMain(dispatcher)
|
||||
}
|
||||
|
||||
@AfterTest
|
||||
fun tearDown() {
|
||||
Dispatchers.resetMain()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testAddingKey() {
|
||||
runBlockingTest {
|
||||
fun testAddingKey() =
|
||||
scope.runTest {
|
||||
// Check if the key id returned is correct
|
||||
val keyId = keyManager.addKey(key).unwrap().getKeyId()
|
||||
assertEquals(CryptoConstants.KEY_ID, keyId)
|
||||
|
|
@ -40,33 +56,30 @@ class PGPKeyManagerTest {
|
|||
val keyFile = keysDir.listFiles()?.first()
|
||||
assertEquals(keyFile?.name, "$keyId.${PGPKeyManager.KEY_EXTENSION}")
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testAddingKeyWithoutReplaceFlag() {
|
||||
runBlockingTest {
|
||||
fun testAddingKeyWithoutReplaceFlag() =
|
||||
scope.runTest {
|
||||
// Check adding the keys twice
|
||||
keyManager.addKey(key, false).unwrap()
|
||||
val error = keyManager.addKey(key, false).unwrapError()
|
||||
|
||||
assertIs<KeyManagerException.KeyAlreadyExistsException>(error)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testAddingKeyWithReplaceFlag() {
|
||||
runBlockingTest {
|
||||
fun testAddingKeyWithReplaceFlag() =
|
||||
scope.runTest {
|
||||
// Check adding the keys twice
|
||||
keyManager.addKey(key, true).unwrap()
|
||||
val keyId = keyManager.addKey(key, true).unwrap().getKeyId()
|
||||
|
||||
assertEquals(CryptoConstants.KEY_ID, keyId)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testRemovingKey() {
|
||||
runBlockingTest {
|
||||
fun testRemovingKey() =
|
||||
scope.runTest {
|
||||
// Add key using KeyManager
|
||||
keyManager.addKey(key).unwrap()
|
||||
|
||||
|
|
@ -78,11 +91,10 @@ class PGPKeyManagerTest {
|
|||
val keysDir = File(filesDir, PGPKeyManager.KEY_DIR_NAME)
|
||||
assertEquals(0, keysDir.list()?.size)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetExistingKey() {
|
||||
runBlockingTest {
|
||||
fun testGetExistingKey() =
|
||||
scope.runTest {
|
||||
// Add key using KeyManager
|
||||
keyManager.addKey(key).unwrap()
|
||||
|
||||
|
|
@ -91,11 +103,10 @@ class PGPKeyManagerTest {
|
|||
assertEquals(CryptoConstants.KEY_ID, key.getKeyId())
|
||||
assertEquals(key.getKeyId(), returnedKeyPair.getKeyId())
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGetNonExistentKey() {
|
||||
runBlockingTest {
|
||||
fun testGetNonExistentKey() =
|
||||
scope.runTest {
|
||||
// Add key using KeyManager
|
||||
keyManager.addKey(key).unwrap()
|
||||
|
||||
|
|
@ -106,21 +117,19 @@ class PGPKeyManagerTest {
|
|||
assertIs<KeyManagerException.KeyNotFoundException>(error)
|
||||
assertEquals("No key found with id: $randomKeyId", error.message)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testFindKeysWithoutAdding() {
|
||||
runBlockingTest {
|
||||
fun testFindKeysWithoutAdding() =
|
||||
scope.runTest {
|
||||
// Check returned key
|
||||
val error = keyManager.getKeyById("0x123456789").unwrapError()
|
||||
assertIs<KeyManagerException.NoKeysAvailableException>(error)
|
||||
assertEquals("No keys were found", error.message)
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGettingAllKeys() {
|
||||
runBlockingTest {
|
||||
fun testGettingAllKeys() =
|
||||
scope.runTest {
|
||||
// TODO: Should we check for more than 1 keys?
|
||||
// Check if KeyManager returns no key
|
||||
val noKeyList = keyManager.getAllKeys().unwrap()
|
||||
|
|
@ -133,5 +142,4 @@ class PGPKeyManagerTest {
|
|||
val singleKeyList = keyManager.getAllKeys().unwrap()
|
||||
assertEquals(1, singleKeyList.size)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,34 +6,25 @@
|
|||
plugins { id("com.rickbusarow.gradle-dependency-sync") version "0.11.4" }
|
||||
|
||||
dependencies {
|
||||
val androidx_activity = "1.4.0"
|
||||
val androidx_test = "1.4.1-alpha03"
|
||||
val compose = "1.1.0-beta02"
|
||||
val composeSnapshot = "-"
|
||||
val coroutines = "1.5.2"
|
||||
val flowbinding = "1.2.0"
|
||||
val hilt = "2.40.3"
|
||||
val kotlin = "1.5.31"
|
||||
val lifecycle = "2.4.0"
|
||||
|
||||
// Build tooling
|
||||
dependencySync("com.android.tools.build:gradle:7.0.3")
|
||||
dependencySync("org.jetbrains.kotlinx:binary-compatibility-validator:0.8.0")
|
||||
dependencySync("org.jetbrains.dokka:dokka-gradle-plugin:$kotlin")
|
||||
dependencySync("org.jetbrains.dokka:dokka-gradle-plugin:1.6.0")
|
||||
dependencySync("de.undercouch:gradle-download-task:4.1.2")
|
||||
dependencySync("com.google.dagger:hilt-android-gradle-plugin:$hilt")
|
||||
dependencySync("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin")
|
||||
dependencySync("com.google.dagger:hilt-android-gradle-plugin:2.40.3")
|
||||
dependencySync("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
|
||||
dependencySync("com.vanniktech:gradle-maven-publish-plugin:0.18.0")
|
||||
dependencySync("com.squareup.okhttp3:okhttp:4.9.3")
|
||||
dependencySync("com.vdurmont:semver4j:3.1.0")
|
||||
dependencySync("com.diffplug.spotless:spotless-plugin-gradle:6.0.1")
|
||||
|
||||
// Kotlin dependencies
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-core$coroutines")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0-RC")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0-RC")
|
||||
|
||||
// AndroidX dependencies
|
||||
dependencySync("androidx.activity:activity-ktx:$androidx_activity")
|
||||
dependencySync("androidx.activity:activity-compose:$androidx_activity")
|
||||
dependencySync("androidx.activity:activity-ktx:1.4.0")
|
||||
dependencySync("androidx.activity:activity-compose:1.4.0")
|
||||
dependencySync("androidx.annotation:annotation:1.3.0")
|
||||
dependencySync("androidx.autofill:autofill:1.2.0-beta01")
|
||||
dependencySync("androidx.appcompat:appcompat:1.4.0-rc01")
|
||||
|
|
@ -43,11 +34,11 @@ dependencies {
|
|||
dependencySync("androidx.documentfile:documentfile:1.1.0-alpha01")
|
||||
dependencySync("androidx.fragment:fragment-ktx:1.4.0-rc01")
|
||||
dependencySync("androidx.hilt:hilt-navigation-compose:1.0.0-alpha03")
|
||||
dependencySync("androidx.lifecycle:lifecycle-common:$lifecycle")
|
||||
dependencySync("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle")
|
||||
dependencySync("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle")
|
||||
dependencySync("androidx.lifecycle:lifecycle-common:2.4.0")
|
||||
dependencySync("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
|
||||
dependencySync("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
|
||||
dependencySync("androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07")
|
||||
dependencySync("com.google.android.material:material:1.5.0-beta01")
|
||||
dependencySync("com.google.android.material:material:1.6.0-alpha01")
|
||||
dependencySync("androidx.preference:preference:1.2.0-alpha02")
|
||||
dependencySync("androidx.recyclerview:recyclerview:1.3.0-alpha01")
|
||||
dependencySync("androidx.recyclerview:recyclerview-selection:1.2.0-alpha01")
|
||||
|
|
@ -55,23 +46,23 @@ dependencies {
|
|||
dependencySync("androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01")
|
||||
|
||||
// Compose dependencies
|
||||
dependencySync("androidx.compose.animation:animation:$compose")
|
||||
dependencySync("androidx.compose.compiler:compiler:$compose")
|
||||
dependencySync("androidx.compose.foundation:foundation:$compose")
|
||||
dependencySync("androidx.compose.foundation:foundation-layout:$compose")
|
||||
dependencySync("androidx.compose.material:material:$compose")
|
||||
dependencySync("androidx.compose.material3:material3:1.0.0-alpha01")
|
||||
dependencySync("androidx.compose.runtime:runtime:$compose")
|
||||
dependencySync("androidx.compose.ui:ui:$compose")
|
||||
dependencySync("androidx.compose.ui:ui-test-junit4:$compose")
|
||||
dependencySync("androidx.compose.ui:ui-tooling:$compose")
|
||||
dependencySync("androidx.compose.ui:ui-util:$compose")
|
||||
dependencySync("androidx.compose.ui:ui-viewbinding:$compose")
|
||||
dependencySync("androidx.compose.animation:animation:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.compiler:compiler:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.foundation:foundation:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.foundation:foundation-layout:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.material:material:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.material3:material3:1.0.0-alpha02")
|
||||
dependencySync("androidx.compose.runtime:runtime:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.ui:ui:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.ui:ui-test-junit4:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.ui:ui-tooling:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.ui:ui-util:1.1.0-beta04")
|
||||
dependencySync("androidx.compose.ui:ui-viewbinding:1.1.0-beta04")
|
||||
|
||||
// Dagger/Hilt dependencies
|
||||
dependencySync("com.google.dagger:hilt-android:$hilt")
|
||||
dependencySync("com.google.dagger:hilt-compiler:$hilt")
|
||||
dependencySync("com.google.dagger:hilt-core:$hilt")
|
||||
dependencySync("com.google.dagger:hilt-android:2.40.3")
|
||||
dependencySync("com.google.dagger:hilt-compiler:2.40.3")
|
||||
dependencySync("com.google.dagger:hilt-core:2.40.3")
|
||||
|
||||
// Desugaring
|
||||
dependencySync("com.android.tools:desugar_jdk_libs:1.1.5")
|
||||
|
|
@ -85,7 +76,7 @@ dependencies {
|
|||
dependencySync("commons-codec:commons-codec:1.14")
|
||||
dependencySync("net.i2p.crypto:eddsa:0.3.0")
|
||||
dependencySync("me.zhanghai.android.fastscroll:library:1.1.7")
|
||||
dependencySync("io.github.reactivecircus.flowbinding:flowbinding-android:$flowbinding")
|
||||
dependencySync("io.github.reactivecircus.flowbinding:flowbinding-android:1.2.0")
|
||||
dependencySync("org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r")
|
||||
dependencySync("com.michael-bull.kotlin-result:kotlin-result:1.1.13")
|
||||
dependencySync("com.squareup.leakcanary:leakcanary-android:2.7")
|
||||
|
|
@ -100,12 +91,12 @@ dependencies {
|
|||
|
||||
// Testing dependencies
|
||||
dependencySync("junit:junit:4.13.2")
|
||||
dependencySync("org.jetbrains.kotlin:kotlin-test-junit")
|
||||
dependencySync("org.jetbrains.kotlin:kotlin-test-junit:1.6.0")
|
||||
dependencySync("org.robolectric:robolectric:4.7.3")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
|
||||
dependencySync("org.jetbrains.kotlin:kotlin-test-junit:1.5.31")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
|
||||
dependencySync("org.jetbrains.kotlin:kotlin-test-junit:1.6.0")
|
||||
dependencySync("com.github.android-password-store:shared-preferences-fake:2.0.0")
|
||||
dependencySync("androidx.test:rules:$androidx_test")
|
||||
dependencySync("androidx.test:runner:$androidx_test")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines")
|
||||
dependencySync("androidx.test:rules:1.4.1-alpha03")
|
||||
dependencySync("androidx.test:runner:1.4.1-alpha03")
|
||||
dependencySync("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0-RC")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,20 +8,23 @@ package dev.msfjarvis.aps.data.passfile
|
|||
import dev.msfjarvis.aps.util.time.TestUserClock
|
||||
import dev.msfjarvis.aps.util.totp.TotpFinder
|
||||
import java.util.Locale
|
||||
import kotlin.test.Ignore
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertNotNull
|
||||
import kotlin.test.assertNull
|
||||
import kotlin.test.assertTrue
|
||||
import kotlin.time.ExperimentalTime
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
import kotlinx.coroutines.test.TestCoroutineScope
|
||||
import org.junit.Test
|
||||
import kotlinx.coroutines.test.StandardTestDispatcher
|
||||
import kotlinx.coroutines.test.TestScope
|
||||
import kotlinx.coroutines.test.runTest
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class, ExperimentalTime::class)
|
||||
class PasswordEntryTest {
|
||||
|
||||
private fun makeEntry(content: String) =
|
||||
PasswordEntry(fakeClock, testFinder, testScope, content.encodeToByteArray())
|
||||
PasswordEntry(fakeClock, testFinder, scope, content.encodeToByteArray())
|
||||
|
||||
@Test
|
||||
fun testGetPassword() {
|
||||
|
|
@ -121,23 +124,27 @@ class PasswordEntryTest {
|
|||
}
|
||||
|
||||
@Test
|
||||
fun testGeneratesOtpFromTotpUri() {
|
||||
val entry = makeEntry("secret\nextra\n$TOTP_URI")
|
||||
assertTrue(entry.hasTotp())
|
||||
val code = entry.totp.value
|
||||
assertNotNull(code) { "Generated OTP cannot be null" }
|
||||
assertEquals("818800", code)
|
||||
}
|
||||
@Ignore("Timing with runTest seems hard to implement right now")
|
||||
fun testGeneratesOtpFromTotpUri() =
|
||||
scope.runTest {
|
||||
val entry = makeEntry("secret\nextra\n$TOTP_URI")
|
||||
assertTrue(entry.hasTotp())
|
||||
val code = entry.totp.value
|
||||
assertNotNull(code) { "Generated OTP cannot be null" }
|
||||
assertEquals("818800", code)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testGeneratesOtpWithOnlyUriInFile() {
|
||||
val entry = makeEntry(TOTP_URI)
|
||||
assertNull(entry.password)
|
||||
assertTrue(entry.hasTotp())
|
||||
val code = entry.totp.value
|
||||
assertNotNull(code) { "Generated OTP cannot be null" }
|
||||
assertEquals("818800", code)
|
||||
}
|
||||
@Ignore("Timing with runTest seems hard to implement right now")
|
||||
fun testGeneratesOtpWithOnlyUriInFile() =
|
||||
scope.runTest {
|
||||
val entry = makeEntry(TOTP_URI)
|
||||
assertNull(entry.password)
|
||||
assertTrue(entry.hasTotp())
|
||||
val code = entry.totp.value
|
||||
assertNotNull(code) { "Generated OTP cannot be null" }
|
||||
assertEquals("818800", code)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun testOnlyLooksForUriInFirstLine() {
|
||||
|
|
@ -164,7 +171,8 @@ class PasswordEntryTest {
|
|||
const val TOTP_URI =
|
||||
"otpauth://totp/ACME%20Co:john@example.com?secret=HXDMVJECJJWSRB3HWIZR4IFUGFTMXBOZ&issuer=ACME%20Co&algorithm=SHA1&digits=6&period=30"
|
||||
|
||||
val testScope = TestCoroutineScope()
|
||||
val dispatcher = StandardTestDispatcher()
|
||||
val scope = TestScope(dispatcher)
|
||||
|
||||
val fakeClock = TestUserClock()
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
package dev.msfjarvis.aps.util.totp
|
||||
|
||||
import com.github.michaelbull.result.get
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertNotNull
|
||||
import kotlin.test.assertNull
|
||||
import org.junit.Test
|
||||
|
||||
class OtpTest {
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
[versions]
|
||||
androidx_activity = "1.4.0"
|
||||
androidx_test = "1.4.1-alpha03"
|
||||
compose = "1.1.0-beta02"
|
||||
compose = "1.1.0-beta04"
|
||||
composeSnapshot = "-"
|
||||
coroutines = "1.5.2"
|
||||
coroutines = "1.6.0-RC"
|
||||
flowbinding = "1.2.0"
|
||||
hilt = "2.40.3"
|
||||
kotlin = "1.5.31"
|
||||
kotlin = "1.6.0"
|
||||
lifecycle = "2.4.0"
|
||||
|
||||
[libraries]
|
||||
|
|
@ -24,7 +24,7 @@ androidx-autofill = "androidx.autofill:autofill:1.2.0-beta01"
|
|||
|
||||
androidx-biometricKtx = "androidx.biometric:biometric-ktx:1.2.0-alpha03"
|
||||
|
||||
androidx-compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha01"
|
||||
androidx-compose-material3 = "androidx.compose.material3:material3:1.0.0-alpha02"
|
||||
|
||||
androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.1"
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ androidx-lifecycle-livedataKtx = { module = "androidx.lifecycle:lifecycle-liveda
|
|||
androidx-lifecycle-viewmodel-compose = "androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07"
|
||||
androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
|
||||
|
||||
androidx-material = "com.google.android.material:material:1.5.0-beta01"
|
||||
androidx-material = "com.google.android.material:material:1.6.0-alpha01"
|
||||
|
||||
androidx-preference = "androidx.preference:preference:1.2.0-alpha02"
|
||||
|
||||
|
|
@ -66,7 +66,7 @@ kotlin-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines
|
|||
kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
|
||||
kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
|
||||
|
||||
build-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.5.31"
|
||||
build-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.6.0"
|
||||
|
||||
build-download = "de.undercouch:gradle-download-task:4.1.2"
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref =
|
|||
dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
|
||||
dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "hilt" }
|
||||
|
||||
build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
|
||||
build-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
|
||||
testing-kotlintest-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
|
||||
|
||||
build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.18.0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue