Merge pull request #958 from monal-im/6.0rc1-2

6.0rc1-2
monal-im · Oct 13, 2023 · 47a8f97 · 47a8f97
2 parents 35ce130 + 8d0d38c
commit 47a8f97
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 47 deletions.
diff --git a/Monal/Images.xcassets/AppIcon.appiconset/Contents.json b/Monal/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "Monal.png",
+      "filename" : "Monal-ios_1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
@@ -42,18 +42,19 @@
       "size" : "256x256"
     },
     {
+      "filename" : "Monal-macos-512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "Monal-512.png",
+      "filename" : "Monal-macos-512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "Monal 1.png",
+      "filename" : "Monal-macos-1024.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"

diff --git a/Monal/Images.xcassets/AppIcon.appiconset/Monal-ios_1024.png b/Monal/Images.xcassets/AppIcon.appiconset/Monal-ios_1024.png
diff --git a/...s.xcassets/AppIcon.appiconset/Monal 1.png → ...s/AppIcon.appiconset/Monal-macos-1024.png b/...s.xcassets/AppIcon.appiconset/Monal 1.png → ...s/AppIcon.appiconset/Monal-macos-1024.png
diff --git a/...xcassets/AppIcon.appiconset/Monal-512.png → ...ts/AppIcon.appiconset/Monal-macos-512.png b/...xcassets/AppIcon.appiconset/Monal-512.png → ...ts/AppIcon.appiconset/Monal-macos-512.png
diff --git a/Monal/Images.xcassets/AppIcon.appiconset/Monal.png b/Monal/Images.xcassets/AppIcon.appiconset/Monal.png
diff --git a/Monal/Images.xcassets/AppLogo.imageset/Contents.json b/Monal/Images.xcassets/AppLogo.imageset/Contents.json
@@ -9,7 +9,7 @@
       "scale" : "2x"
     },
     {
-      "filename" : "Monal.png",
+      "filename" : "Monal-ios_1024.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

diff --git a/Monal/Images.xcassets/AppLogo.imageset/Monal-ios_1024.png b/Monal/Images.xcassets/AppLogo.imageset/Monal-ios_1024.png
diff --git a/Monal/Images.xcassets/AppLogo.imageset/Monal.png b/Monal/Images.xcassets/AppLogo.imageset/Monal.png
diff --git a/Monal/Podfile.lock b/Monal/Podfile.lock
@@ -71,9 +71,9 @@ PODS:
     - MarqueeLabel (~> 4.3.0)
     - SnapKit (~> 5.6.0)
   - SAMKeychain (1.5.3)
-  - SDWebImage (5.18.2):
-    - SDWebImage/Core (= 5.18.2)
-  - SDWebImage/Core (5.18.2)
+  - SDWebImage (5.18.3):
+    - SDWebImage/Core (= 5.18.3)
+  - SDWebImage/Core (5.18.3)
   - SignalProtocolC (2.3.3)
   - SignalProtocolObjC (1.1.1):
     - SignalProtocolC (~> 2.3.3)
@@ -82,7 +82,7 @@ PODS:
   - sqlite3/perf-threadsafe (3.43.1):
     - sqlite3/common
   - TOCropViewController (2.6.1)
-  - WebRTC-lib (117.0.0)
+  - WebRTC-lib (118.0.0)
 
 DEPENDENCIES:
   - ASN1Decoder
@@ -145,13 +145,13 @@ SPEC CHECKSUMS:
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
   NotificationBannerSwift: dce54ded532b26e30cd8e7f4d80e124a0f2ba7d1
   SAMKeychain: 483e1c9f32984d50ca961e26818a534283b4cd5c
-  SDWebImage: c0de394d7cf7f9838aed1fd6bb6037654a4572e4
+  SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958
   SignalProtocolC: 8092866e45b663a6bc3e45a8d13bad2571dbf236
   SignalProtocolObjC: 1beb46b1d35733e7ab96a919f88bac20ec771c73
   SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
   sqlite3: e0a0623a33a20a47cb5921552aebc6e9e437dc91
   TOCropViewController: edfd4f25713d56905ad1e0b9f5be3fbe0f59c863
-  WebRTC-lib: 8e6d3ec41aea480ef844bb5d537cbefb83e7c2c2
+  WebRTC-lib: 6ac0d12bc164192a9cc6adb10a082d65c49ee0b8
 
 PODFILE CHECKSUM: 99af97fbdbc651c2f1c5558cb9ba7107ef30aa28
 

diff --git a/rust/Cargo.lock b/rust/Cargo.lock