From 79de2e1176bcb6afad9ba52d3c46f3964062e544 Mon Sep 17 00:00:00 2001 From: Jon Staab Date: Thu, 17 Jul 2025 14:30:18 -0700 Subject: [PATCH] Bump version --- CHANGELOG.md | 10 ++++++++++ android/app/build.gradle | 4 ++-- ios/App/App.xcodeproj/project.pbxproj | 8 ++++---- package.json | 24 ++++++++++++------------ pnpm-lock.yaml | Bin 338663 -> 338588 bytes 5 files changed, 28 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c2d010..44302d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +# 1.2.1 + +* Add zaps to chat, threads, and events +* Add funding goals +* Add NWC support +* Add wallet settings page +* Handle invalid bunker url +* Fix sidebar overflow +* Fix profile npub display + # 1.2.0 * Fix sort order of thread comments diff --git a/android/app/build.gradle b/android/app/build.gradle index 4f76605..579846f 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "social.flotilla" minSdk rootProject.ext.minSdkVersion targetSdk rootProject.ext.targetSdkVersion - versionCode 21 - versionName "1.2.0" + versionCode 22 + versionName "1.2.1" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 9758145..4cf7a19 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -354,14 +354,14 @@ CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = S26U9DYW3A; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.2.1; OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\""; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -380,14 +380,14 @@ CODE_SIGN_ENTITLEMENTS = "Flotilla Chat.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 14; + CURRENT_PROJECT_VERSION = 15; DEVELOPMENT_TEAM = S26U9DYW3A; INFOPLIST_FILE = App/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = "Flotilla Chat"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; IPHONEOS_DEPLOYMENT_TARGET = 14.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.2.0; + MARKETING_VERSION = 1.2.1; PRODUCT_BUNDLE_IDENTIFIER = social.flotilla; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/package.json b/package.json index f03a8fe..eee85ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "flotilla", - "version": "1.2.0", + "version": "1.2.1", "private": true, "scripts": { "dev": "vite dev", @@ -56,17 +56,17 @@ "@types/throttle-debounce": "^5.0.2", "@vite-pwa/assets-generator": "^0.2.6", "@vite-pwa/sveltekit": "^0.6.6", - "@welshman/app": "^0.3.10", - "@welshman/content": "^0.3.10", - "@welshman/editor": "^0.3.10", - "@welshman/feeds": "^0.3.10", - "@welshman/lib": "^0.3.10", - "@welshman/net": "^0.3.10", - "@welshman/relay": "^0.3.10", - "@welshman/router": "^0.3.10", - "@welshman/signer": "^0.3.10", - "@welshman/store": "^0.3.10", - "@welshman/util": "^0.3.10", + "@welshman/app": "^0.4.0", + "@welshman/content": "^0.4.0", + "@welshman/editor": "^0.4.0", + "@welshman/feeds": "^0.4.0", + "@welshman/lib": "^0.4.0", + "@welshman/net": "^0.4.0", + "@welshman/relay": "^0.4.0", + "@welshman/router": "^0.4.0", + "@welshman/signer": "^0.4.0", + "@welshman/store": "^0.4.0", + "@welshman/util": "^0.4.0", "compressorjs": "^1.2.1", "daisyui": "^4.12.10", "date-picker-svelte": "^2.13.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0554ffee2806b40605538b0de102f658c7c308f0..0bd51a023c461d47780358804c7503ee64bab826 100644 GIT binary patch delta 2284 zcmcIm&u`o28HQ}Svb8vdV=u0g$ngrSNg>oCB~r461*k}hGDT4$Em8ad3-E9YA;9=V#MTgzGZao+~?hhD{9(rmID~4jHVC```45KV1bE34j5#WK} z%lCbs=lMQ9FaPn`{%=0p|2Wu+!2Vx$_g@1~;1lq^|K)Bxpnea;gD2kyK>sLqya=y{ z;Xq#7*!LM=%LlJ*`R~T=E<(UO^WvKrU`Cd~d*4wq_}eXD!~grWgDc6wr%~W_|LyJN z+Vft)o!da%|K;}4w_$j?y~OZ5_+(d^i%NfT$}(zM=}Y&m(xl&doDB9t)H@N-D)a`})*aIz1~g$$dR z9hZd_d{!8>Y97%`l_|@~2qGbjrAfvh1PZSY6P1aBj4Gm7;+m5rHiNyiTxQKwcR~(k zIW(Y5TzpGiIVEgX!Y_eyui*@40$@|cLLt~QS3Op zY{fAR{}1t795SmjHJs7t^V9@EG;_pu;8Ha$sHjkI9av9#n3ivf65iolub4e!y*^H- z21rIGY-*^IX*V&nP7TQLk`Sfn4mCl$eDL^2WG^spM&?ct?&Eu{mgVJGyOiaIX^hO; zNoI;x-6~j2raXN>2^G*Q^SK;LI7uF|uTiP)u$2Eiq?S zyJC1aSD89pb)eWQRQ-?Qw>dHa8<5(sp$%3iM&k_HN94Tc5Q0%aOhLgMPDm7MPQ3{- zDx|=~piZlbOr|~hbkxGieHkuLiF6;&irpM7OLR>XPDTHr`-9+ z7a3h647#6#Ofjo#L%T~#?w~>vPTEj-vRNwfLb(lFZMZ`dbhb&2tMzfg8Jy{8Zlvjo zFt+n;ksgjUz>2jW z1&?lpCjaQ)>l^-dbU#3%z#FS?fpfRsT!T;M4t+bam;jfq9NgUmV#|f+p8Irr6F6QO z6y@ui(fR7ibeWs*)f#i-z45=A(V(#fJbBji;k6L17z2J4qL~kyuQryj_5yGV2#@Bo z=@bo~#DUi?Uf%`YUSDOj=1t(|;qxDv^}E5g59|b=-vr2Kl)~xu zy~Q?MfwT9rvMZ{5c>w(4S&2(kUdVn?jE&&vPwQ~-MJya^i!b<6reHPirTu)V>y&gUDg_Kar0_oJ9eDd z(!?YtO@c`X1@s-pVG`OAv0E=3IBITb5k?JMAbf8pD zh$X(`7%HAqDoEF-=p-#9Ek6O{#UA)z$#rRh@NOFqWh1dBR;YFwoULjZFior%z;#<3_i3{l>S*(_bIK@fjP|jf*QM0Kwg=oX)3x^%E>}MKz z0_lOTmR%PnQ;H@chJ{wErB&=yQH}AcSx?vNU7N0$RD(7GyoERG70&UP1d`Eu^iG26 z)4W_H(hgaUi*Y3r3hAtaI()F4?sP<)jwXoea7rMpLMsyx!7j5Uxzq9$<1v3UCdFt@ z!R@Xl`-oo4(j~lA_h6_a>j>9u_8ET}&k%JS%ZXMxTMa7ximLK0xmvPVvRUJEUXh|w zWDw|&kG%rcR$OQI39A$(EXTD;Ek~97am`zXiAqRrKoHyAms^)&FVu2I5Dd4aL)aG~%hUL!AV#%|qW!%X-1~0`v(q#GkB+z2T|| z&rbe_E9G$J-Y;h$WM&^}Jk<8M&j0Tmyt4vzr#&r$dw7cN3yPA&ft&kb%}f(p|lFSz;5 a%yF>10lhRf-MtT8zAbJ*d*a4ybn$Pye_O)<