Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename app package to authenticator #305

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:
versionName:${{ inputs.version-name || '' }}

regex='versionName = "([^"]+)"'
if [[ "$(cat app/build.gradle.kts)" =~ $regex ]]; then
if [[ "$(cat authenticator/build.gradle.kts)" =~ $regex ]]; then
VERSION_NAME="${BASH_REMATCH[1]}"
fi
echo "Version Name: ${VERSION_NAME}" >> $GITHUB_STEP_SUMMARY
Expand Down Expand Up @@ -220,27 +220,27 @@ jobs:
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: com.bitwarden.authenticator.aab
path: app/build/outputs/bundle/release/com.bitwarden.authenticator-release.aab
path: authenticator/build/outputs/bundle/release/com.bitwarden.authenticator-release.aab
if-no-files-found: error

- name: Upload release .apk artifact
if: ${{ matrix.variant == 'apk' }}
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: com.bitwarden.authenticator.apk
path: app/build/outputs/apk/release/com.bitwarden.authenticator-release.apk
path: authenticator/build/outputs/apk/release/com.bitwarden.authenticator-release.apk
if-no-files-found: error

- name: Create checksum file for Release AAB
if: ${{ matrix.variant == 'aab' }}
run: |
sha256sum "app/build/outputs/bundle/release/com.bitwarden.authenticator-release.aab" \
sha256sum "authenticator/build/outputs/bundle/release/com.bitwarden.authenticator-release.aab" \
> ./authenticator-android-aab-sha256.txt

- name: Create checksum for release .apk artifact
if: ${{ matrix.variant == 'apk' }}
run: |
sha256sum "app/build/outputs/apk/release/com.bitwarden.authenticator-release.apk" \
sha256sum "authenticator/build/outputs/apk/release/com.bitwarden.authenticator-release.apk" \
> ./authenticator-android-apk-sha256.txt

- name: Upload .apk SHA file for release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ jobs:
- name: Upload to codecov.io
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
with:
file: app/build/reports/kover/reportDebug.xml
file: authenticator/build/reports/kover/reportDebug.xml
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
File renamed without changes.
8 changes: 4 additions & 4 deletions app/build.gradle.kts โ†’ authenticator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,10 @@ sonar {
property("sonar.projectKey", "bitwarden_authenticator-android")
property("sonar.organization", "bitwarden")
property("sonar.host.url", "https://sonarcloud.io")
property("sonar.sources", "app/src/")
property("sonar.tests", "app/src/")
property("sonar.test.inclusions", "app/src/test/")
property("sonar.exclusions", "app/src/test/")
property("sonar.sources", "authenticator/src/")
property("sonar.tests", "authenticator/src/")
property("sonar.test.inclusions", "authenticator/src/test/")
property("sonar.exclusions", "authenticator/src/test/")
}
}

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.bitwarden.authenticator.data.authenticator.datasource.disk.entity

import com.bitwarden.authenticator.data.authenticator.datasource.disk.entity.AuthenticatorItemAlgorithm.entries

/**
* Enum class representing SHA algorithms an authenticator item may be hashed with.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.bitwarden.authenticator.data.authenticator.datasource.disk.entity

import com.bitwarden.authenticator.data.authenticator.datasource.disk.entity.AuthenticatorItemType.entries

/**
* Enum representing the supported "type" options for authenticator items.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.bitwarden.authenticator.data.platform.manager

import com.bitwarden.authenticator.data.platform.repository.ServerConfigRepository
import com.bitwarden.authenticator.data.platform.datasource.disk.model.ServerConfig
import com.bitwarden.authenticator.data.platform.manager.model.FlagKey
import com.bitwarden.authenticator.data.platform.repository.ServerConfigRepository
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import com.bitwarden.authenticator.data.authenticator.repository.AuthenticatorRe
import com.bitwarden.authenticator.data.authenticator.repository.model.CreateItemResult
import com.bitwarden.authenticator.data.platform.repository.model.DataState
import com.bitwarden.authenticator.data.platform.repository.util.takeUntilLoaded
import com.bitwarden.authenticator.ui.authenticator.feature.edititem.AuthenticatorRefreshPeriodOption.entries
import com.bitwarden.authenticator.ui.authenticator.feature.edititem.EditItemState.Companion.MAX_ALLOWED_CODE_DIGITS
import com.bitwarden.authenticator.ui.authenticator.feature.edititem.EditItemState.Companion.MIN_ALLOWED_CODE_DIGITS
import com.bitwarden.authenticator.ui.authenticator.feature.edititem.model.EditItemData
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import com.bitwarden.authenticator.ui.platform.components.model.IconData
import com.bumptech.glide.integration.compose.ExperimentalGlideComposeApi
import com.bumptech.glide.integration.compose.GlideImage
import com.bumptech.glide.integration.compose.placeholder
import com.bitwarden.authenticator.ui.platform.components.model.IconData

/**
* Represents a Bitwarden icon that is either locally loaded or loaded using glide.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.animation.slideInHorizontally
import androidx.compose.animation.slideOutHorizontally
import androidx.navigation.NavBackStackEntry
import androidx.navigation.compose.NavHost
import com.bitwarden.authenticator.ui.platform.theme.RootTransitionProviders.Exit.stay

typealias EnterTransitionProvider =
(@JvmSuppressWildcards AnimatedContentTransitionScope<NavBackStackEntry>.() -> EnterTransition?)
Expand Down
Loading
Loading