Merge branch 'main' into pm-16998/swift-style

bitwarden · Jan 15, 2025 · 0b03126 · 0b03126
2 parents d0b1da7 + fc8098b
commit 0b03126
Show file tree

Hide file tree

Showing 5 changed files with 1,066 additions and 1,272 deletions.
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
@@ -68,7 +68,6 @@ jobs:
         uses: sonarsource/sonarqube-scan-action@bfd4e558cda28cda6b5defafb9232d191be8c203 # v4.2.1
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           args: >
             -Dsonar.organization=${{ github.repository_owner }} -Dsonar.projectKey=${{

diff --git a/docs/architecture/mobile-clients/android/index.md b/docs/architecture/mobile-clients/android/index.md
@@ -63,9 +63,9 @@ retrieved via interactions with the [Bitwarden SDK](https://github.com/bitwarden
 
 Note that these data sources are constructed in a manner that adheres to a very important principle
 of the app: **that function calls should not throw exceptions** (see the
-[style and best practices documentation](styles-best-practices.md#best-practices--kotlin) for more
-details.) In the case of data sources, this tends to mean that suspending functions like those
-representing network requests or Bitwarden SDK calls should return a
+[style and best practices documentation](/docs/contributing/code-style/android-kotlin.md#best-practices--kotlin)
+for more details.) In the case of data sources, this tends to mean that suspending functions like
+those representing network requests or Bitwarden SDK calls should return a
 [Result](https://kotlinlang.org/api/latest/jvm/stdlib/kotlin/-result/) type. This is an important
 responsibility of the data layer as a wrapper around other third party libraries, as dependencies
 like Retrofit and the Bitwarden SDK tend to throw exceptions to indicate errors instead.
@@ -369,7 +369,7 @@ components. If there is any new unique UI component that is added, it should alw
 it should be made a shareable component.
 
 Refer to the
-[style and best practices documentation](styles-best-practices.md#best-practices--jetpack-compose)
+[style and best practices documentation](/docs/contributing/code-style/android-kotlin.md#best-practices--jetpack-compose)
 for additional information on best practices when using Compose.
 
 #### State-hoisting

diff --git a/...-clients/android/styles-best-practices.md → ...contributing/code-style/android-kotlin.md b/...-clients/android/styles-best-practices.md → ...contributing/code-style/android-kotlin.md
@@ -1,6 +1,8 @@
-# Code Style Guidelines
+---
+title: Android & Kotlin
+---
 
-## Contents
+# Android & Kotlin
 
 The following outlines the general code style and best practices for Android development. It is
 expected that all developers are familiar with the code style documents referenced here and have