1.5.2

app.json

@@ -6,7 +6,7 @@
     "slug": "setlist-sherlock",
     "owner": "dylmye",
     "scheme": "setlist-sherlock",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "orientation": "portrait",
     "userInterfaceStyle": "automatic",
     "newArchEnabled": true,
@@ -98,13 +98,18 @@
       [
         "expo-check-installed-apps",
         {
-          "android": ["com.apple.android.music"]
+          "android": [
+            "com.apple.android.music"
+          ]
         }
       ],
       [
         "react-native-localization-settings",
         {
-          "languages": ["en", "fr"]
+          "languages": [
+            "en",
+            "fr"
+          ]
         }
       ],
       [

metadata/com.dylmye.setlists.yml

@@ -18,30 +18,30 @@ Repo: https://github.com/dylmye/setlist-sherlock.git
 Binaries: https://github.com/dylmye/setlist-sherlock/releases/download/%v/%v.apk
 
 Builds:
-  - versionName: 1.5.1
-    versionCode: 26
-    commit: 1.5.1
+  - versionName: 1.5.2
+    versionCode: 28
+    commit: 1.5.2
+    subdir: android/app
     sudo:
-      - apt install unzip
-      - curl -fsSL https://bun.sh/install | bash
-      - >-
-        curl -Lo node.tar.gz
-        https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz
-      - >-
-        echo "e7b80346bb586790ac6b29aa25c96716fcdf6039a6929c2ed506cec09cebc3c0
-        node.tar.gz" | sha256sum -c -
+      - curl -Lo node.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz
+      - echo "e7b80346bb586790ac6b29aa25c96716fcdf6039a6929c2ed506cec09cebc3c0 node.tar.gz"
+        | sha256sum -c -
       - tar xzf node.tar.gz --strip-components=1 -C /usr/local/
       - sysctl fs.inotify.max_user_watches=524288 || true
-    init: /root/.bun/bin/bun install --frozen-lockfile
-    scanignore:
-      - node_modules
+      - npm install -g bun
+    init: bun install --frozen-lockfile
     gradle:
       - yes
-    ndk: r26
+    forcevercode: true
+    prebuild: cd ../../ && bun x expo prebuild --platform android
+    scanignore:
+      - node_modules
+      - webhooks
+    ndk: 26.1.10909125
 
 AllowedAPKSigningKeys: f90e81f7e88e4d8c0fa51d9165573aa86ab4cb1384bf94d8bd651e423e7690f6
 
 AutoUpdateMode: Version
 UpdateCheckMode: Tags
-CurrentVersion: 1.5.1
-CurrentVersionCode: 26
+CurrentVersion: 1.5.2
+CurrentVersionCode: 28

metadata/en-GB/changelogs/28.txt

@@ -0,0 +1 @@
+Boring update time: some performance optimisations have been made to reduce the app size.

metadata/en-US/changelogs/28.txt

@@ -0,0 +1 @@
+Boring update time: some performance optimizations have been made to reduce the app size.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setlist-sherlock",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "license": "ISC",
   "private": true,
   "repository": "https://github.com/dylmye/setlist-sherlock",

scripts/bump-version.ts

@@ -23,7 +23,7 @@ const updateExpo = async (version: string): Promise<void> => {
   try {
     await Bun.write(
       filename,
-      JSON.stringify(Object.assign(json, { version }), null, 2),
+      JSON.stringify(Object.assign(json, { expo: { version } }), null, 2),
     );
   } catch {
     throw new Error("Unable to update app.json");
@@ -37,12 +37,20 @@ type FdroidMetadata = {
     versionCode: number;
     commit: string;
     subdir: string;
+    sudo: string[];
+    init: string;
     gradle: string[];
+    forcevercode: boolean;
+    prebuild: string;
+    scanignore: string[];
+    ndk: string;
   }[];
   CurrentVersion: string;
   CurrentVersionCode: number;
 };
 
+const NDK_VERSION = "26.1.10909125";
+
 const updateFdroid = async (version: string): Promise<void> => {
   console.log("Updating com.dylmye.setlists.yml...");
   const filename = "./metadata/com.dylmye.setlists.yml";
@@ -58,15 +66,27 @@ const updateFdroid = async (version: string): Promise<void> => {
         versionName: version,
         versionCode: fdroidYaml.CurrentVersionCode + 1,
         commit: version,
-        subdir: "android",
+        subdir: "android/app",
+        sudo: [
+          "curl -Lo node.tar.gz https://nodejs.org/dist/v18.20.5/node-v18.20.5-linux-x64.tar.gz",
+          'echo "e7b80346bb586790ac6b29aa25c96716fcdf6039a6929c2ed506cec09cebc3c0 node.tar.gz" | sha256sum -c -',
+          "tar xzf node.tar.gz --strip-components=1 -C /usr/local/",
+          "sysctl fs.inotify.max_user_watches=524288 || true",
+          "npm install -g bun",
+        ],
+        init: "bun install --frozen-lockfile",
         gradle: ["yes"],
+        forcevercode: true,
+        prebuild: "cd ../../ && bun x expo prebuild --platform android",
+        scanignore: ["node_modules", "webhooks"],
+        ndk: NDK_VERSION,
       },
     ],
   };
 
   // we have to use yes instead of true due to fdroid's formatter! fun!
   // they also require dumb spacing
-  const dumpedYaml = dump(Object.assign(fdroidYaml, yamlUpdates))
+  const dumpedYaml = dump(Object.assign(fdroidYaml, yamlUpdates), { lineWidth: -1 })
     .replaceAll("'yes'", "yes")
     .replace("AutoName:", `\nAutoName:`)
     .replace("RepoType:", `\nRepoType:`)