Merge Release 2.9.1

CONTRIBUTING.md

@@ -49,37 +49,35 @@ pnpm run dev
 
 If the feature you're working on is native-only, you can compile and run Voyager in an iOS Simulator or real device.
 
-To build the iOS native app:
+To build the iOS native app, install:
 
-1. Install [Node](https://nodejs.org/en)
-2. Install [Ionic CLI](https://ionicframework.com/docs/cli)
-3. Install [Xcode](https://developer.apple.com/xcode/)
-4. [Cocoapods](https://cocoapods.org/)
+1. [Node](https://nodejs.org)
+2. [Xcode](https://developer.apple.com/xcode/)
+3. [Cocoapods](https://cocoapods.org)
 
-Then, build the project and copy web dependencies over:
+Then, in Voyager's source code directory, build the project:
 
 ```sh
 corepack enable
 pnpm install
-ionic capacitor build ios
+pnpm exec ionic capacitor build ios
 ```
 
-Finally, can run the project with `CMD+R`.
+Xcode should automatically open. You can then run the project with `CMD+R`.
 
 ### Android Native App
 
-To build the Android native app:
+To build the Android native app, install:
 
-1. Install [Node](https://nodejs.org/en)
-2. Install [Ionic CLI](https://ionicframework.com/docs/cli)
-3. Install [Android Studio](https://developer.android.com/studio)
+1. [Node](https://nodejs.org)
+2. [Android Studio](https://developer.android.com/studio)
 
-In Voyager source code directory:
+Then, in Voyager's source code directory, build the project:
 
 ```sh
 corepack enable
 pnpm install
-ionic capacitor build android
+pnpm exec ionic capacitor build android
 ```
 
 Android Studio should open.

Dockerfile

@@ -26,7 +26,7 @@ COPY patches ./patches
 RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile --ignore-scripts
 
 # Copy all source files
-COPY build.sh disable_in_app_purchases.sh index.html vite.config.ts manifest.json tsconfig.json tsconfig.node.json ./
+COPY build.sh disable_in_app_purchases.sh index.html vite.config.ts manifest.json tsconfig.json ./
 COPY public ./public
 COPY src ./src
 

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "app.vger.voyager"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 244
-        versionName "2.8.1"
+        versionCode 246
+        versionName "2.9.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App/Info.plist

@@ -17,7 +17,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.8.1</string>
+    <string>2.9.1</string>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>
@@ -32,7 +32,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>244</string>
+    <string>246</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSRequiresIPhoneOS</key>

package.json

@@ -2,7 +2,7 @@
   "name": "voyager",
   "description": "A progressive webapp Lemmy client",
   "private": true,
-  "version": "2.8.1",
+  "version": "2.9.1",
   "type": "module",
   "packageManager": "pnpm@9.0.6+sha256.0624e30eff866cdeb363b15061bdb7fd9425b17bc1bb42c22f5f4efdea21f6b3",
   "scripts": {
@@ -113,6 +113,7 @@
     "@babel/preset-react": "^7.23.3",
     "@babel/preset-typescript": "^7.23.3",
     "@capacitor/cli": "^6.0.0",
+    "@ionic/cli": "^7.2.0",
     "@playwright/test": "^1.43.0",
     "@testing-library/jest-dom": "^6.4.2",
     "@testing-library/react": "^15.0.6",