diff --git a/.prettierrc b/.prettierrc index 1e96993f..d23c7c93 100644 --- a/.prettierrc +++ b/.prettierrc @@ -5,6 +5,6 @@ "svelteSortOrder": "options-styles-scripts-markup", "arrowParens": "avoid", "bracketSpacing": false, - "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], + "plugins": ["prettier-plugin-tailwindcss", "prettier-plugin-svelte"], "overrides": [{"files": "*.svelte", "options": {"parser": "svelte"}}] } diff --git a/android/app/build.gradle b/android/app/build.gradle index a6111041..90e60bff 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - namespace "social.flotilla" - compileSdk rootProject.ext.compileSdkVersion + namespace = "social.flotilla" + compileSdk = rootProject.ext.compileSdkVersion defaultConfig { applicationId "social.flotilla" minSdk rootProject.ext.minSdkVersion @@ -13,7 +13,7 @@ android { aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 - ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' + ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' } } buildTypes { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index eac74c18..64ff6fe5 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,7 @@ android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/android/gradlew.bat b/android/gradlew.bat index 9b42019c..5eed7ee8 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/android/variables.gradle b/android/variables.gradle index b2f2ac12..bb18e31f 100644 --- a/android/variables.gradle +++ b/android/variables.gradle @@ -1,18 +1,18 @@ ext { - minSdkVersion = 23 + minSdkVersion = 24 compileSdkVersion = 36 targetSdkVersion = 36 - androidxActivityVersion = '1.9.2' + androidxActivityVersion = '1.11.0' //https://github.com/ionic-team/capacitor/issues/7866 - // androidxAppCompatVersion = '1.7.0' - androidxAppCompatVersion = '1.6.1' - androidxCoordinatorLayoutVersion = '1.2.0' - androidxCoreVersion = '1.15.0' - androidxFragmentVersion = '1.8.4' - coreSplashScreenVersion = '1.0.1' - androidxWebkitVersion = '1.12.1' + // androidxAppCompatVersion = '1.7.1' + androidxAppCompatVersion = '1.7.1' + androidxCoordinatorLayoutVersion = '1.3.0' + androidxCoreVersion = '1.17.0' + androidxFragmentVersion = '1.8.9' + coreSplashScreenVersion = '1.2.0' + androidxWebkitVersion = '1.14.0' junitVersion = '4.13.2' - androidxJunitVersion = '1.2.1' - androidxEspressoCoreVersion = '3.6.1' - cordovaAndroidVersion = '10.1.1' + androidxJunitVersion = '1.3.0' + androidxEspressoCoreVersion = '3.7.0' + cordovaAndroidVersion = '14.0.1' } diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 29122924..9813f8e9 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -291,7 +291,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -342,7 +342,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; @@ -363,7 +363,7 @@ INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.6.3; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; @@ -389,7 +389,7 @@ INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.6.3; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; diff --git a/ios/App/Podfile b/ios/App/Podfile index 03d6927d..a33ce4cd 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -1,6 +1,6 @@ require_relative '../../node_modules/.pnpm/@capacitor+ios@8.0.1_@capacitor+core@8.0.1/node_modules/@capacitor/ios/scripts/pods_helpers' -platform :ios, '14.0' +platform :ios, '15.0' use_frameworks! # workaround to avoid Xcode caching of Pods that requires diff --git a/package.json b/package.json index 1acdf500..8c4de29c 100644 --- a/package.json +++ b/package.json @@ -15,25 +15,25 @@ }, "devDependencies": { "@capacitor/assets": "^3.0.5", - "@eslint/js": "^9.37.0", - "@sveltejs/kit": "^2.46.5", + "@eslint/js": "^9.39.2", + "@sveltejs/kit": "^2.50.1", "@sveltejs/vite-plugin-svelte": "^4.0.4", "@types/eslint": "^9.6.1", - "autoprefixer": "^10.4.21", + "autoprefixer": "^10.4.23", "classnames": "^2.5.1", - "eslint": "^9.37.0", + "eslint": "^9.39.2", "eslint-config-prettier": "^9.1.2", "eslint-plugin-svelte": "^2.46.1", "globals": "^15.15.0", "postcss": "^8.5.6", - "prettier": "^3.6.2", - "prettier-plugin-svelte": "^3.4.0", - "svelte": "^5.39.12", - "svelte-check": "^4.3.3", - "tailwindcss": "^3.4.18", + "prettier": "^3.8.1", + "prettier-plugin-svelte": "^3.4.1", + "svelte": "^5.48.0", + "svelte-check": "^4.3.5", + "tailwindcss": "^3.4.19", "typescript": "^5.9.3", - "typescript-eslint": "^8.46.1", - "vite": "^5.4.20" + "typescript-eslint": "^8.53.1", + "vite": "^5.4.21" }, "type": "module", "dependencies": { @@ -49,13 +49,14 @@ "@capacitor/push-notifications": "^8.0.0", "@capawesome/capacitor-android-dark-mode-support": "^8.0.0", "@capawesome/capacitor-badge": "^8.0.0", - "@getalby/lightning-tools": "^6.0.0", + "@getalby/lightning-tools": "^6.1.0", "@getalby/sdk": "^5.1.2", + "@noble/curves": "^1.9.7", "@pomade/core": "^0.0.12", "@poppanator/sveltekit-svg": "^4.2.1", "@sveltejs/adapter-static": "^3.0.10", - "@tiptap/core": "^2.26.3", - "@types/qrcode": "^1.5.5", + "@tiptap/core": "^2.27.2", + "@types/qrcode": "^1.5.6", "@types/throttle-debounce": "^5.0.2", "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.8", @@ -71,9 +72,9 @@ "@welshman/util": "^0.8.1", "compressorjs": "^1.2.1", "daisyui": "^4.12.24", - "date-picker-svelte": "^2.16.0", + "date-picker-svelte": "^2.17.0", "dotenv": "^16.6.1", - "emoji-picker-element": "^1.27.0", + "emoji-picker-element": "^1.28.1", "fuse.js": "^7.1.0", "husky": "^9.1.7", "idb": "^8.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01667a8c..57ca8e3b 100644 Binary files a/pnpm-lock.yaml and b/pnpm-lock.yaml differ diff --git a/src/app/components/ProfileDetail.svelte b/src/app/components/ProfileDetail.svelte index 95ea0b76..8114fe2a 100644 --- a/src/app/components/ProfileDetail.svelte +++ b/src/app/components/ProfileDetail.svelte @@ -124,7 +124,7 @@ diff --git a/src/app/util/notifications.ts b/src/app/util/notifications.ts index e684613c..9cc7c595 100644 --- a/src/app/util/notifications.ts +++ b/src/app/util/notifications.ts @@ -16,8 +16,7 @@ import { loadRelay, waitForThunkError, } from "@welshman/app" -import type {Maybe -} from "@welshman/lib" +import type {Maybe} from "@welshman/lib" import { on, call, diff --git a/svelte.config.js b/svelte.config.js index 7b71079d..eab8cff2 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -27,7 +27,7 @@ export default { }, compilerOptions: { warningFilter: (warning) => { - return !['a11y_media_has_caption'].includes(warning.code) + return !['a11y_media_has_caption', 'state_referenced_locally'].includes(warning.code) }, } }