From 07e4e6a8065757abe9fc551ae9a01792187273a4 Mon Sep 17 00:00:00 2001 From: Patrick Honkonen <1883101+SaintPatrck@users.noreply.github.com> Date: Mon, 19 May 2025 09:19:16 -0400 Subject: [PATCH] [PM-21726] Move OmitFromCoverage to `annotation` module (#5214) --- annotation/.gitignore | 1 + annotation/build.gradle.kts | 42 +++++++++++++++++++ .../bitwarden}/annotation/OmitFromCoverage.kt | 2 +- app/build.gradle.kts | 1 + .../x8bit/bitwarden/AccessibilityActivity.kt | 2 +- .../x8bit/bitwarden/AuthCallbackActivity.kt | 2 +- .../bitwarden/AutofillTotpCopyActivity.kt | 2 +- .../bitwarden/BitwardenAppComponentFactory.kt | 2 +- .../x8bit/bitwarden/BitwardenApplication.kt | 2 +- .../java/com/x8bit/bitwarden/MainActivity.kt | 2 +- .../AuthRequestNotificationManagerImpl.kt | 2 +- .../data/auth/util/KdfParamsConstants.kt | 2 +- .../data/autofill/BitwardenAutofillService.kt | 2 +- .../BitwardenAccessibilityService.kt | 2 +- .../util/AccessibilityNodeInfoExtensions.kt | 2 +- .../accessibility/util/UriExtensions.kt | 2 +- .../ChromeThirdPartyAutofillManagerImpl.kt | 2 +- .../data/autofill/util/ActivityExtensions.kt | 2 +- .../data/autofill/util/AutofillIntentUtils.kt | 2 +- .../data/autofill/util/HtmlInfoExtensions.kt | 2 +- .../data/autofill/util/IntExtensions.kt | 2 +- .../BitwardenCredentialProviderService.kt | 2 +- .../util/BiometricPromptDataUtils.kt | 2 +- ...blicKeyCredentialEntryBuilderExtensions.kt | 2 +- .../UncaughtErrorLoggingContentProvider.kt | 2 +- .../disk/legacy/LegacySecureStorageImpl.kt | 2 +- .../data/platform/manager/AssetManagerImpl.kt | 2 +- .../BiometricsEncryptionManagerImpl.kt | 2 +- .../manager/NativeLibraryManagerImpl.kt | 2 +- .../BitwardenClipboardManagerImpl.kt | 2 +- .../manager/clipboard/ClearClipboardWorker.kt | 2 +- .../FlightRecorderWriterImpl.kt | 2 +- .../service/AuthenticatorBridgeService.kt | 2 +- .../AddTotpIntentFromAuthenticatorUtils.kt | 2 +- .../data/platform/util/AndroidBuildUtils.kt | 2 +- .../data/platform/util/FileExtensions.kt | 2 +- .../platform/util/InputStreamExtensions.kt | 2 +- .../data/platform/util/IntentExtensions.kt | 2 +- .../data/platform/util/StringExtensions.kt | 2 +- .../tiles/BitwardenAutofillTileService.kt | 2 +- .../tiles/BitwardenGeneratorTileService.kt | 2 +- .../data/tiles/BitwardenVaultTileService.kt | 2 +- ...edentialAuthenticationUserInterfaceImpl.kt | 2 +- ...CredentialRegistrationUserInterfaceImpl.kt | 2 +- .../sdk/model/Fido2CredentialStoreImpl.kt | 2 +- .../data/vault/manager/FileManager.kt | 2 +- .../data/vault/manager/FileManagerImpl.kt | 2 +- ...iderCompletionManagerUnsupportedApiImpl.kt | 2 +- .../platform/base/util/ModifierExtensions.kt | 2 +- .../toolbar/BitwardenCutCopyTextToolbar.kt | 2 +- .../toolbar/BitwardenEmptyTextToolbar.kt | 2 +- .../composition/LocalManagerProvider.kt | 2 +- .../feature/search/SearchViewModel.kt | 2 +- .../platform/feature/splash/SplashScreen.kt | 2 +- .../biometrics/BiometricsManagerImpl.kt | 2 +- .../platform/manager/exit/ExitManagerImpl.kt | 2 +- .../manager/intent/IntentManagerImpl.kt | 2 +- .../ui/platform/manager/nfc/NfcManagerImpl.kt | 2 +- .../permissions/PermissionsManagerImpl.kt | 2 +- .../manager/resource/ResourceManagerImpl.kt | 2 +- .../importlogins/ImportLoginsScreen.kt | 2 +- .../qrcodescan/util/QrCodeAnalyzerImpl.kt | 2 +- .../data/platform/manager/LogsManagerImpl.kt | 2 +- .../push/BitwardenFirebaseMessagingService.kt | 2 +- .../manager/review/AppReviewManagerImpl.kt | 2 +- authenticator/build.gradle.kts | 1 + .../platform/provider/BaseUrlsProviderImpl.kt | 2 +- .../platform/base/util/ModifierExtensions.kt | 2 +- .../composition/LocalManagerProvider.kt | 2 +- .../manager/intent/IntentManagerImpl.kt | 2 +- .../platform/util/ConfigurationExtensions.kt | 2 +- authenticatorbridge/build.gradle.kts | 1 + build.gradle.kts | 4 +- core/build.gradle.kts | 2 + .../repository/util/DataStateExtensions.kt | 2 +- .../com/bitwarden/core/data/util/MapUtil.kt | 2 +- data/build.gradle.kts | 1 + network/build.gradle.kts | 1 + .../network/BitwardenServiceClient.kt | 2 +- .../network/BitwardenServiceClientImpl.kt | 2 +- .../interceptor/BaseUrlInterceptors.kt | 2 +- .../ssl/BitwardenX509ExtendedKeyManager.kt | 2 +- .../network/util/DeviceModelProvider.kt | 2 +- settings.gradle.kts | 1 + ui/build.gradle.kts | 2 + 85 files changed, 130 insertions(+), 75 deletions(-) create mode 100644 annotation/.gitignore create mode 100644 annotation/build.gradle.kts rename {core/src/main/kotlin/com/bitwarden/core => annotation/src/main/kotlin/com/bitwarden}/annotation/OmitFromCoverage.kt (90%) diff --git a/annotation/.gitignore b/annotation/.gitignore new file mode 100644 index 0000000000..796b96d1c4 --- /dev/null +++ b/annotation/.gitignore @@ -0,0 +1 @@ +/build diff --git a/annotation/build.gradle.kts b/annotation/build.gradle.kts new file mode 100644 index 0000000000..a641330bfd --- /dev/null +++ b/annotation/build.gradle.kts @@ -0,0 +1,42 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + +plugins { + alias(libs.plugins.android.library) + alias(libs.plugins.kotlin.android) +} + +android { + namespace = "com.bitwarden.annotation" + compileSdk = libs.versions.compileSdk.get().toInt() + + defaultConfig { + minSdk = libs.versions.minSdkBwa.get().toInt() + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro", + ) + } + } + compileOptions { + sourceCompatibility(libs.versions.jvmTarget.get()) + targetCompatibility(libs.versions.jvmTarget.get()) + } + @Suppress("UnstableApiUsage") + testFixtures { + enable = true + } +} + +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.fromTarget(libs.versions.jvmTarget.get())) + } +} diff --git a/core/src/main/kotlin/com/bitwarden/core/annotation/OmitFromCoverage.kt b/annotation/src/main/kotlin/com/bitwarden/annotation/OmitFromCoverage.kt similarity index 90% rename from core/src/main/kotlin/com/bitwarden/core/annotation/OmitFromCoverage.kt rename to annotation/src/main/kotlin/com/bitwarden/annotation/OmitFromCoverage.kt index 28008a2f76..a31ea2f0fe 100644 --- a/core/src/main/kotlin/com/bitwarden/core/annotation/OmitFromCoverage.kt +++ b/annotation/src/main/kotlin/com/bitwarden/annotation/OmitFromCoverage.kt @@ -1,4 +1,4 @@ -package com.bitwarden.core.annotation +package com.bitwarden.annotation /** * Used to omit the annotated class from test coverage reporting. This should be used sparingly and diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 42f71b020c..652dfb0d17 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -213,6 +213,7 @@ dependencies { implementation(files("libs/authenticatorbridge-1.0.0-release.aar")) + implementation(project(":annotation")) implementation(project(":core")) implementation(project(":data")) implementation(project(":network")) diff --git a/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt b/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt index 73f8937540..d4a8ec79f2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * An activity to be launched and then immediately closed so that the OS Shade can be collapsed diff --git a/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt b/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt index 2c20514231..330ff15737 100644 --- a/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import dagger.hilt.android.AndroidEntryPoint /** diff --git a/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt b/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt index 4f432aa60a..e1693a5aff 100644 --- a/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt @@ -4,7 +4,7 @@ import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt index 24a5b4f018..9864cb060c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt +++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.os.Build import androidx.annotation.Keep import androidx.core.app.AppComponentFactory -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.BitwardenAutofillService import com.x8bit.bitwarden.data.autofill.accessibility.BitwardenAccessibilityService import com.x8bit.bitwarden.data.credentials.BitwardenCredentialProviderService diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt index 0425d0d108..7f1b71a38e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt +++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden import android.app.Application -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.auth.manager.AuthRequestNotificationManager import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager diff --git a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt index 0cf2fc9927..6448347710 100644 --- a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt @@ -17,7 +17,7 @@ import androidx.core.os.LocaleListCompat import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.compose.NavHost -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.theme.BitwardenTheme import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityCompletionManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt index 6749dee919..45ad4198f3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.graphics.Color import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt index bc75149c8d..25e3ea92dd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.auth.util -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.crypto.Kdf /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt index e458e1c5cb..dc66824f95 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt @@ -8,7 +8,7 @@ import android.service.autofill.FillRequest import android.service.autofill.SaveCallback import android.service.autofill.SaveRequest import androidx.annotation.Keep -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo import com.x8bit.bitwarden.data.autofill.processor.AutofillProcessor import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt index 7c0d34fe84..b665680e9c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt @@ -4,7 +4,7 @@ import android.accessibilityservice.AccessibilityService import android.content.Intent import android.view.accessibility.AccessibilityEvent import androidx.annotation.Keep -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityEnabledManager import com.x8bit.bitwarden.data.autofill.accessibility.processor.BitwardenAccessibilityProcessor import com.x8bit.bitwarden.data.tiles.BitwardenAutofillTileService diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt index 44c02d5c2c..0d4ad2f67d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.autofill.accessibility.util import android.view.accessibility.AccessibilityNodeInfo import android.widget.EditText import androidx.core.os.bundleOf -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.accessibility.model.KnownUsernameField private const val PACKAGE_NAME_BITWARDEN_PREFIX: String = "com.x8bit.bitwarden" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt index 74de8e27a5..e6be4ccd5f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.autofill.accessibility.util import android.net.Uri -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import java.net.URISyntaxException /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt index f6661c7645..4213d83399 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.autofill.manager.chrome import android.content.ContentResolver import android.content.Context import android.net.Uri -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeReleaseChannel import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutoFillData diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt index 2cf85de7b2..17b057775f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt @@ -4,7 +4,7 @@ package com.x8bit.bitwarden.data.autofill.util import android.app.Activity import android.os.Build -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt index b472b282ef..898c7fd668 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt @@ -11,7 +11,7 @@ import android.content.IntentSender import android.service.autofill.Dataset import android.view.autofill.AutofillManager import androidx.core.os.bundleOf -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.AutofillTotpCopyActivity import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt index e825cdabe7..7ff01ebfdc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.autofill.util import android.view.ViewStructure.HtmlInfo -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Whether this [HtmlInfo] represents a password field. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt index b2cc113e57..336d9e9fd3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.autofill.util import android.app.PendingIntent import android.os.Build import android.text.InputType -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Whether this [Int] is a password [InputType]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/credentials/BitwardenCredentialProviderService.kt b/app/src/main/java/com/x8bit/bitwarden/data/credentials/BitwardenCredentialProviderService.kt index 52896e90ab..bc8a8ee6eb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/credentials/BitwardenCredentialProviderService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/credentials/BitwardenCredentialProviderService.kt @@ -14,7 +14,7 @@ import androidx.credentials.provider.BeginGetCredentialRequest import androidx.credentials.provider.BeginGetCredentialResponse import androidx.credentials.provider.CredentialProviderService import androidx.credentials.provider.ProviderClearCredentialStateRequest -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.credentials.processor.CredentialProviderProcessor import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/BiometricPromptDataUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/BiometricPromptDataUtils.kt index 99c4fe1bd7..b23919fc75 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/BiometricPromptDataUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/BiometricPromptDataUtils.kt @@ -7,7 +7,7 @@ import androidx.annotation.RequiresApi import androidx.biometric.BiometricManager import androidx.biometric.BiometricPrompt import androidx.credentials.provider.BiometricPromptData -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import javax.crypto.Cipher /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/PublicKeyCredentialEntryBuilderExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/PublicKeyCredentialEntryBuilderExtensions.kt index 823e37ba6f..5f01114192 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/PublicKeyCredentialEntryBuilderExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/credentials/util/PublicKeyCredentialEntryBuilderExtensions.kt @@ -4,7 +4,7 @@ package com.x8bit.bitwarden.data.credentials.util import android.os.Build import androidx.credentials.provider.PublicKeyCredentialEntry -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import javax.crypto.Cipher diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/contentprovider/UncaughtErrorLoggingContentProvider.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/contentprovider/UncaughtErrorLoggingContentProvider.kt index b024dfe3b2..c2c5497326 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/contentprovider/UncaughtErrorLoggingContentProvider.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/contentprovider/UncaughtErrorLoggingContentProvider.kt @@ -4,7 +4,7 @@ import android.content.ContentProvider import android.content.ContentValues import android.database.Cursor import android.net.Uri -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import timber.log.Timber /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt index 73b3ca2101..c2234c5d95 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt @@ -10,7 +10,7 @@ import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import android.util.Base64 import androidx.core.content.edit -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import java.math.BigInteger import java.nio.charset.StandardCharsets import java.security.InvalidAlgorithmParameterException diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt index 058cc8cd18..00f46d1bea 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager import android.content.Context -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.data.manager.DispatcherManager import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt index 6900d438ce..0bb0615b9b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.platform.manager import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyPermanentlyInvalidatedException import android.security.keystore.KeyProperties -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt index 897f7f1aa5..2b12ac3168 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import timber.log.Timber /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt index 900c0f8bac..0f227fb0f6 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt @@ -11,7 +11,7 @@ import androidx.core.os.persistableBundleOf import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequest import androidx.work.WorkManager -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.ui.platform.base.util.toAnnotatedString import com.bitwarden.ui.util.Text import com.x8bit.bitwarden.R diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt index e21f85205b..c1b69ddd68 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Context.CLIPBOARD_SERVICE import androidx.work.Worker import androidx.work.WorkerParameters -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * A worker to clear the clipboard manager. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt index f1011a7e91..8617c007fd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/flightrecorder/FlightRecorderWriterImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.manager.flightrecorder import android.os.Build import android.util.Log -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.data.manager.DispatcherManager import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.platform.datasource.disk.model.FlightRecorderDataSet diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt index c72b82877c..0b351ffb1c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.service import android.app.Service import android.content.Intent -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.processor.AuthenticatorBridgeProcessor import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt index 5308bff453..9e4993f16d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt @@ -7,7 +7,7 @@ import android.content.Intent import android.content.Intent.FLAG_ACTIVITY_NEW_TASK import android.content.Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt index f7fd4dc140..6abe2f4922 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.platform.util import android.os.Build -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Returns true if the current OS build version is below the provided [version]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/FileExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/FileExtensions.kt index 199d580105..85cdde358a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/FileExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/FileExtensions.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.util -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import java.io.File /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt index 00a256f127..0799f2bd84 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.util import android.os.Build -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import java.io.IOException import java.io.InputStream import java.io.OutputStream diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt index c7e68669c2..8f20b46f94 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt @@ -7,7 +7,7 @@ import android.os.Bundle import android.os.Parcelable import androidx.core.content.IntentCompat import androidx.core.os.BundleCompat -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * A means of retrieving a [Parcelable] from an [Intent] using the given [name] in a manner that diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt index e0a3126570..239e6baf16 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.util -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.ResourceCacheManager import java.net.URI import java.net.URISyntaxException diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt index 9daee626ce..c412068e7a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt @@ -8,7 +8,7 @@ import android.content.Intent import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.Keep -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.AccessibilityActivity import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt index 01bd844a67..d92dace2da 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.Keep -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt index c57b678e94..f551573266 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.Keep -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt index c879e44eae..1d7e16f2f2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.fido.CheckUserOptions import com.bitwarden.sdk.CheckUserAndPickCredentialForCreationResult import com.bitwarden.sdk.CheckUserResult diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt index 8041313b7c..af7fce9bc0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.fido.CheckUserOptions import com.bitwarden.sdk.CheckUserAndPickCredentialForCreationResult import com.bitwarden.sdk.CheckUserResult diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt index dc636be44b..3278f0d006 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.Cipher diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt index e3349a6115..9e8d7aade5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.manager import android.net.Uri -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.vault.manager.model.DownloadResult import com.x8bit.bitwarden.data.vault.manager.model.ZipFileResult import java.io.File diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt index 3d2433113e..2118072b8c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt @@ -4,7 +4,7 @@ package com.x8bit.bitwarden.data.vault.manager import android.content.Context import android.net.Uri -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.network.service.DownloadService import com.x8bit.bitwarden.data.platform.util.sdkAgnosticTransferTo diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/credentials/manager/CredentialProviderCompletionManagerUnsupportedApiImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/credentials/manager/CredentialProviderCompletionManagerUnsupportedApiImpl.kt index 91f5d549e8..cfc4e2e60b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/credentials/manager/CredentialProviderCompletionManagerUnsupportedApiImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/credentials/manager/CredentialProviderCompletionManagerUnsupportedApiImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.ui.credentials.manager import androidx.credentials.CredentialProvider -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.credentials.manager.model.AssertFido2CredentialResult import com.x8bit.bitwarden.ui.credentials.manager.model.GetCredentialsResult import com.x8bit.bitwarden.ui.credentials.manager.model.RegisterFido2CredentialResult diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt index 6c07f7dae1..ebdbb91761 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.constrainWidth import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.offset -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.ui.platform.base.util.toScrolledContainerColor import com.bitwarden.ui.platform.base.util.toScrolledContainerDividerAlpha import com.bitwarden.ui.platform.components.model.CardStyle diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt index 01461f8864..64d5d53736 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.TextToolbarStatus import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.getSelectedText import androidx.core.os.persistableBundleOf -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * A custom [TextToolbar] that is obfuscates the copied or cut text. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt index 0e8a241fce..dff1a0433f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.components.field.toolbar import androidx.compose.ui.geometry.Rect import androidx.compose.ui.platform.TextToolbar import androidx.compose.ui.platform.TextToolbarStatus -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * A custom [TextToolbar] that is completely empty. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt index 67d8040538..948ccf3566 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.CompositionLocal import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.compositionLocalOf -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManagerImpl import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt index cf44ad9725..c582a04534 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.core.data.repository.model.DataState import com.bitwarden.data.repository.util.baseIconUrl import com.bitwarden.data.repository.util.baseWebSendUrl diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt index 85db62e824..06982a2cc8 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt @@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Splash screen with empty composable content so that the Activity window background is shown. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt index e6c106fcef..89bca811df 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt @@ -6,7 +6,7 @@ import androidx.biometric.BiometricManager.Authenticators import androidx.biometric.BiometricPrompt import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.R import javax.crypto.Cipher diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt index ff83b4d3e0..a32a83f1aa 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.ui.platform.manager.exit import android.app.Activity -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * The default implementation of the [ExitManager] for managing the various ways to exit the app. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt index 746f830389..1754e2c878 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt @@ -23,7 +23,7 @@ import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.core.net.toUri import androidx.credentials.CredentialManager -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.R diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt index dbf9e4ef33..5d8a1a5d87 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt @@ -7,7 +7,7 @@ import android.content.Intent import android.content.IntentFilter import android.nfc.NfcAdapter import android.os.Build -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.x8bit.bitwarden.AuthCallbackActivity import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag import kotlin.random.Random diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt index 3cf050d90a..d528a98a4f 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt @@ -7,7 +7,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.runtime.Composable import androidx.core.content.ContextCompat -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Primary implementation of [PermissionsManager]. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt index fea45c07ad..0e995fe2b7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.platform.manager.resource import android.content.Context import androidx.annotation.StringRes -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Primary implementation of [ResourceManager]. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt index 7aac63d27d..93b3ff7cfd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt @@ -37,7 +37,7 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.ui.platform.base.util.EventsEffect import com.bitwarden.ui.platform.base.util.toAnnotatedString import com.bitwarden.ui.platform.theme.BitwardenTheme diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt index c8eb06e663..2de6239c11 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.qrcodescan.util import androidx.camera.core.ImageProxy -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.google.zxing.BarcodeFormat import com.google.zxing.BinaryBitmap import com.google.zxing.DecodeHintType diff --git a/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt b/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt index ddd706f22d..1bc787b5de 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.data.repository.model.Environment import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase diff --git a/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt b/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt index 3dc1f0b5ae..b96567deef 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.push -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage import com.x8bit.bitwarden.data.platform.manager.PushManager diff --git a/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt b/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt index 4bd5b62ac3..084007b234 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.platform.manager.review import android.app.Activity import android.widget.Toast -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.google.android.play.core.review.ReviewManagerFactory import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.R diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts index ed95f1e555..713b89323e 100644 --- a/authenticator/build.gradle.kts +++ b/authenticator/build.gradle.kts @@ -151,6 +151,7 @@ dependencies { implementation(files("libs/authenticatorbridge-1.0.0-release.aar")) + implementation(project(":annotation")) implementation(project(":core")) implementation(project(":data")) implementation(project(":network")) diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/provider/BaseUrlsProviderImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/provider/BaseUrlsProviderImpl.kt index 08091183ec..5105f38003 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/provider/BaseUrlsProviderImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/provider/BaseUrlsProviderImpl.kt @@ -1,6 +1,6 @@ package com.bitwarden.authenticator.data.platform.provider -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.data.repository.model.Environment import com.bitwarden.data.repository.util.baseApiUrl import com.bitwarden.data.repository.util.baseEventsUrl diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt index 071fab15d6..0b5e0456ca 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.authenticator.ui.platform.util.isPortrait -import com.bitwarden.core.annotation.OmitFromCoverage /** * This is a [Modifier] extension for drawing a divider at the bottom of the composable. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/composition/LocalManagerProvider.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/composition/LocalManagerProvider.kt index a1e9e744ba..fa9738fcd1 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/composition/LocalManagerProvider.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/composition/LocalManagerProvider.kt @@ -9,6 +9,7 @@ import androidx.compose.runtime.CompositionLocal import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.compositionLocalOf +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.authenticator.ui.platform.manager.biometrics.BiometricsManager import com.bitwarden.authenticator.ui.platform.manager.biometrics.BiometricsManagerImpl import com.bitwarden.authenticator.ui.platform.manager.exit.ExitManager @@ -17,7 +18,6 @@ import com.bitwarden.authenticator.ui.platform.manager.intent.IntentManager import com.bitwarden.authenticator.ui.platform.manager.intent.IntentManagerImpl import com.bitwarden.authenticator.ui.platform.manager.permissions.PermissionsManager import com.bitwarden.authenticator.ui.platform.manager.permissions.PermissionsManagerImpl -import com.bitwarden.core.annotation.OmitFromCoverage /** * Helper [Composable] that wraps a [content] and provides manager classes via [CompositionLocal]. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt index 024625dee5..ed12de555b 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt @@ -15,8 +15,8 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.runtime.Composable import androidx.core.content.ContextCompat import androidx.core.net.toUri +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.authenticator.R -import com.bitwarden.core.annotation.OmitFromCoverage /** * The default implementation of the [IntentManager] for simplifying the handling of Android diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt index 678c6c3ce0..aab8fd7e41 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt @@ -3,7 +3,7 @@ package com.bitwarden.authenticator.ui.platform.util import android.content.res.Configuration -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * A helper method to indicate if the current UI configuration is portrait or not. diff --git a/authenticatorbridge/build.gradle.kts b/authenticatorbridge/build.gradle.kts index d0cedc8bd6..ee99c34c11 100644 --- a/authenticatorbridge/build.gradle.kts +++ b/authenticatorbridge/build.gradle.kts @@ -60,6 +60,7 @@ kotlin { dependencies { // SDK dependencies: + implementation(project(":annotation")) implementation(libs.androidx.appcompat) implementation(libs.androidx.lifecycle.process) implementation(libs.kotlinx.serialization) diff --git a/build.gradle.kts b/build.gradle.kts index 5a14542c1f..2397d6acba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,7 @@ dependencies { detektPlugins(libs.detekt.detekt.formatting) detektPlugins(libs.detekt.detekt.rules) + kover(project(":annotation")) kover(project(":app")) kover(project(":authenticator")) kover(project(":authenticatorbridge")) @@ -29,6 +30,7 @@ detekt { autoCorrect = true config.from(files("detekt-config.yml")) source.from( + "annotation/src", "app/src", "authenticator/src", "authenticatorbridge/src", @@ -64,7 +66,7 @@ kover { "androidx.compose.ui.tooling.preview.Preview", "androidx.compose.ui.tooling.preview.PreviewScreenSizes", // Manually excluded classes/files/etc. - "com.bitwarden.core.annotation.OmitFromCoverage", + "com.bitwarden.annotation.OmitFromCoverage", // Dagger modules "dagger.Module", ) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index c1660e497b..6baa756c5f 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -38,6 +38,8 @@ android { } dependencies { + implementation(project(":annotation")) + implementation(libs.google.hilt.android) ksp(libs.google.hilt.compiler) implementation(libs.kotlinx.coroutines.android) diff --git a/core/src/main/kotlin/com/bitwarden/core/data/repository/util/DataStateExtensions.kt b/core/src/main/kotlin/com/bitwarden/core/data/repository/util/DataStateExtensions.kt index 29429c2fc9..74340fc487 100644 --- a/core/src/main/kotlin/com/bitwarden/core/data/repository/util/DataStateExtensions.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/repository/util/DataStateExtensions.kt @@ -1,6 +1,6 @@ package com.bitwarden.core.data.repository.util -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.core.data.repository.model.DataState import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/core/src/main/kotlin/com/bitwarden/core/data/util/MapUtil.kt b/core/src/main/kotlin/com/bitwarden/core/data/util/MapUtil.kt index e542e74387..fa832cb375 100644 --- a/core/src/main/kotlin/com/bitwarden/core/data/util/MapUtil.kt +++ b/core/src/main/kotlin/com/bitwarden/core/data/util/MapUtil.kt @@ -2,7 +2,7 @@ package com.bitwarden.core.data.util -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import java.util.concurrent.ConcurrentHashMap /** diff --git a/data/build.gradle.kts b/data/build.gradle.kts index d3b768202b..a3b85142aa 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -45,6 +45,7 @@ kotlin { } dependencies { + implementation(project(":annotation")) implementation(project(":core")) implementation(project(":network")) diff --git a/network/build.gradle.kts b/network/build.gradle.kts index 49221e92bb..c2670daff7 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -44,6 +44,7 @@ kotlin { } dependencies { + implementation(project(":annotation")) implementation(project(":core")) implementation(libs.androidx.core.ktx) diff --git a/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClient.kt b/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClient.kt index 97f174d611..b407db049e 100644 --- a/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClient.kt +++ b/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClient.kt @@ -2,7 +2,7 @@ package com.bitwarden.network -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.network.model.BitwardenServiceClientConfig import com.bitwarden.network.provider.RefreshTokenProvider import com.bitwarden.network.service.AccountsService diff --git a/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt b/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt index 3b87d69d04..18015b010b 100644 --- a/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt +++ b/network/src/main/kotlin/com/bitwarden/network/BitwardenServiceClientImpl.kt @@ -1,6 +1,6 @@ package com.bitwarden.network -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import com.bitwarden.core.data.serializer.ZonedDateTimeSerializer import com.bitwarden.network.authenticator.RefreshAuthenticator import com.bitwarden.network.interceptor.AuthTokenInterceptor diff --git a/network/src/main/kotlin/com/bitwarden/network/interceptor/BaseUrlInterceptors.kt b/network/src/main/kotlin/com/bitwarden/network/interceptor/BaseUrlInterceptors.kt index aadfd3e3c5..dceaf9f5e5 100644 --- a/network/src/main/kotlin/com/bitwarden/network/interceptor/BaseUrlInterceptors.kt +++ b/network/src/main/kotlin/com/bitwarden/network/interceptor/BaseUrlInterceptors.kt @@ -1,6 +1,6 @@ package com.bitwarden.network.interceptor -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * An overall container for various [BaseUrlInterceptor] implementations for different API groups. diff --git a/network/src/main/kotlin/com/bitwarden/network/ssl/BitwardenX509ExtendedKeyManager.kt b/network/src/main/kotlin/com/bitwarden/network/ssl/BitwardenX509ExtendedKeyManager.kt index 2c5e48cc79..aec8d70090 100644 --- a/network/src/main/kotlin/com/bitwarden/network/ssl/BitwardenX509ExtendedKeyManager.kt +++ b/network/src/main/kotlin/com/bitwarden/network/ssl/BitwardenX509ExtendedKeyManager.kt @@ -1,6 +1,6 @@ package com.bitwarden.network.ssl -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage import java.net.Socket import java.security.Principal import java.security.PrivateKey diff --git a/network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt b/network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt index 11733a24ac..d6ef086ad4 100644 --- a/network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt +++ b/network/src/main/kotlin/com/bitwarden/network/util/DeviceModelProvider.kt @@ -1,7 +1,7 @@ package com.bitwarden.network.util import android.os.Build -import com.bitwarden.core.annotation.OmitFromCoverage +import com.bitwarden.annotation.OmitFromCoverage /** * Provides device model string. Useful for mocking static [Build.MODEL] call tests. diff --git a/settings.gradle.kts b/settings.gradle.kts index 5e2c81ef1e..e5a41f404e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -49,6 +49,7 @@ buildCache { rootProject.name = "Bitwarden" include( + ":annotation", ":app", ":authenticator", ":authenticatorbridge", diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index e2ff1fa8d3..3fb766f866 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -40,6 +40,8 @@ android { } dependencies { + implementation(project(":annotation")) + implementation(libs.androidx.appcompat) implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.animation)