From 5025521ef112b52cb51d460b504a071c2ea28a44 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Thu, 14 Sep 2023 15:01:29 +0200
Subject: [PATCH] Change maven artifactId to sdk-android

---
 .github/workflows/build-android.yml | 16 ++--------------
 languages/kotlin/app/build.gradle   |  2 +-
 languages/kotlin/sdk/build.gradle   |  4 ++--
 3 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 0ce6084713..77a782ca95 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -101,23 +101,11 @@ jobs:
         working-directory: languages/kotlin
         run: ./build-schemas.sh
 
-      - name: Login to Azure - CI Subscription
-        uses: Azure/login@92a5484dfaf04ca78a94597f4f19fea633851fa2 # v1.4.7
-        with:
-          creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }}
-
-      - name: Retrieve bot secrets
-        id: retrieve-bot-secrets
-        uses: bitwarden/gh-actions/get-keyvault-secrets@8fccdaea2810d5dfb13753b6dd93bbd3a63ff82e
-        with:
-          keyvault: bitwarden-ci
-          secrets: "github-pat-bitwarden-devops-bot-packages-scope"
-
       - name: Publish
         uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
         with:
           arguments: sdk:publish
           build-root-directory: languages/kotlin
         env:
-          GITHUB_ACTOR: "bitwarden-devops-bot"
-          GITHUB_TOKEN: ${{ steps.retrieve-bot-secrets.outputs.github-pat-bitwarden-devops-bot-packages-scope }}
+          GITHUB_ACTOR: ""
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/languages/kotlin/app/build.gradle b/languages/kotlin/app/build.gradle
index 2b7bc02552..709e328899 100644
--- a/languages/kotlin/app/build.gradle
+++ b/languages/kotlin/app/build.gradle
@@ -48,7 +48,7 @@ android {
 }
 
 dependencies {
-    // implementation 'com.bitwarden.sdk'
+    // implementation 'com.bitwarden.sdk-android'
     implementation project(':sdk')
 
     implementation 'androidx.core:core-ktx:1.8.0'
diff --git a/languages/kotlin/sdk/build.gradle b/languages/kotlin/sdk/build.gradle
index 3d164e094c..99f83e75af 100644
--- a/languages/kotlin/sdk/build.gradle
+++ b/languages/kotlin/sdk/build.gradle
@@ -42,7 +42,7 @@ publishing {
     publications {
         maven(MavenPublication) {
             groupId = 'com.bitwarden'
-            artifactId = 'sdk'
+            artifactId = 'sdk-android'
 
             def details = versionDetails()
 
@@ -60,7 +60,7 @@ publishing {
     repositories {
         maven {
             name = "GitHubPackages"
-            url = "https://maven.pkg.github.com/bitwarden/sdk-maven"
+            url = "https://maven.pkg.github.com/bitwarden/sdk"
             credentials {
                 username = System.getenv("GITHUB_ACTOR")
                 password = System.getenv("GITHUB_TOKEN")