change aab to apk, update sentry packages

TheCacophonyProject · Nov 20, 2024 · 7628729 · 7628729
1 parent 8745d3e
commit 7628729
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 155 deletions.
diff --git a/package.json b/package.json
@@ -56,8 +56,8 @@
     "@capacitor/network": "^6.0.1",
     "@capacitor/preferences": "^6.0.1",
     "@libsql/client": "^0.12.0",
-    "@sentry/capacitor": "^1.0.0",
-    "@sentry/solid": "8.27.0",
+    "@sentry/capacitor": "^1.0.2",
+    "@sentry/solid": "8.37.1",
     "@sentry/vite-plugin": "^2.22.4",
     "@solid-devtools/debugger": "^0.23.4",
     "@solid-devtools/logger": "^0.8.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/sidekick/App/App/public/index.html b/sidekick/App/App/public/index.html
@@ -7,7 +7,7 @@
     <link rel="shortcut icon" type="image/ico" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=no"/>
     <title>Sidekick</title>
-    <script type="module" crossorigin src="/assets/index-d6f06f05.js"></script>
+    <script type="module" crossorigin src="/assets/index-297c7efd.js"></script>
     <link rel="stylesheet" href="/assets/index-019629f6.css">
   </head>
   <body>

diff --git a/sidekick/app/src/main/assets/capacitor.config.json b/sidekick/app/src/main/assets/capacitor.config.json
@@ -6,7 +6,8 @@
 	"backgroundColor": "#f9fafb",
 	"server": {
 		"hostname": "cacophony.org.nz",
-		"androidScheme": "http"
+		"androidScheme": "http",
+		"url": "http://localhost:5173"
 	},
 	"android": {
 		"path": "sidekick"

diff --git a/sidekick/capacitor.settings.gradle b/sidekick/capacitor.settings.gradle
@@ -39,7 +39,7 @@ include ':capacitor-preferences'
 project(':capacitor-preferences').projectDir = new File('../node_modules/.pnpm/@[email protected]_@[email protected]/node_modules/@capacitor/preferences/android')
 
 include ':sentry-capacitor'
-project(':sentry-capacitor').projectDir = new File('../node_modules/.pnpm/@[email protected].1_@[email protected]/node_modules/@sentry/capacitor/android')
+project(':sentry-capacitor').projectDir = new File('../node_modules/.pnpm/@[email protected].2_@[email protected]/node_modules/@sentry/capacitor/android')
 
 include ':capacitor-native-settings'
 project(':capacitor-native-settings').projectDir = new File('../node_modules/.pnpm/[email protected]_@[email protected]/node_modules/capacitor-native-settings/android')
diff --git a/sidekick/fastlane/Fastfile b/sidekick/fastlane/Fastfile
@@ -18,7 +18,7 @@ platform :android do
 
     # Configure signing
     gradle(
-      task: "bundle",
+      task: "assemble", 
       build_type: "Release",
       project_dir: ".", # Specify the relative path to your Android project
       gradle_path: "./gradlew", # Specify the path to your gradlew script
@@ -33,7 +33,7 @@ platform :android do
     # Upload to Google Play
     upload_to_play_store(
       track: 'alpha',
-      aab: 'app/build/outputs/bundle/release/app-release.aab',   # Correct relative path
+      apk: 'app/build/outputs/apk/release/app-release.apk',  # Updated to point to the APK
       json_key: ENV['GOOGLE_PLAY_JSON_KEY']
     )
   end