diff --git a/Gemfile.lock b/Gemfile.lock index 15d02a8ec..13962cbeb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GEM algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) - arkana (1.2.0) + arkana (1.3.0) colorize (~> 0.8) dotenv (~> 2.7) yaml (~> 0.2) @@ -63,7 +63,7 @@ GEM concurrent-ruby (1.1.10) dotenv (2.8.1) escape (0.0.4) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) ffi (1.15.5) fourflusher (2.3.1) @@ -96,7 +96,7 @@ GEM xcpretty (0.3.0) rouge (~> 2.0.7) yaml (0.2.0) - zeitwerk (2.6.3) + zeitwerk (2.6.6) PLATFORMS arm64-darwin-21 @@ -111,4 +111,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.3.17 + 2.3.26 diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj index 42e7e56a4..6955c581d 100644 --- a/Mastodon.xcodeproj/project.pbxproj +++ b/Mastodon.xcodeproj/project.pbxproj @@ -3920,6 +3920,7 @@ DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets"; DEVELOPMENT_TEAM = 5Z4GVSS33P; INFOPLIST_FILE = Mastodon/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3950,6 +3951,7 @@ DEVELOPMENT_TEAM = 5Z4GVSS33P; EXCLUDED_SOURCE_FILE_NAMES = "Mastodon/Resources/Preview\\ Assets.xcassets"; INFOPLIST_FILE = Mastodon/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3980,6 +3982,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Mastodon.app/Mastodon"; @@ -4001,6 +4006,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Mastodon.app/Mastodon"; @@ -4021,6 +4029,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Mastodon; @@ -4041,6 +4052,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Mastodon; @@ -4123,6 +4137,7 @@ DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets"; DEVELOPMENT_TEAM = 5Z4GVSS33P; INFOPLIST_FILE = Mastodon/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4154,6 +4169,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Mastodon.app/Mastodon"; @@ -4174,6 +4192,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Mastodon; @@ -4406,6 +4427,7 @@ DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets"; DEVELOPMENT_TEAM = 5Z4GVSS33P; INFOPLIST_FILE = Mastodon/Info.plist; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4436,6 +4458,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonTests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Mastodon.app/Mastodon"; @@ -4456,6 +4481,9 @@ ); PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.MastodonUITests; PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_TARGET_NAME = Mastodon; diff --git a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved index 409b8820d..75afbc505 100644 --- a/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Mastodon.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Alamofire/Alamofire.git", "state" : { - "revision" : "354dda32d89fc8cd4f5c46487f64957d355f53d8", - "version" : "5.6.1" + "revision" : "8dd85aee02e39dd280c75eef88ffdb86eed4b07b", + "version" : "5.6.2" } }, { @@ -41,8 +41,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/Flipboard/FLAnimatedImage.git", "state" : { - "revision" : "e7f9fd4681ae41bf6f3056db08af4f401d61da52", - "version" : "1.0.16" + "revision" : "d4f07b6f164d53c1212c3e54d6460738b1981e9f", + "version" : "1.0.17" } }, { @@ -104,8 +104,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/kean/Nuke.git", "state" : { - "revision" : "0ea7545b5c918285aacc044dc75048625c8257cc", - "version" : "10.8.0" + "revision" : "a002b7fd786f2df2ed4333fe73a9727499fd9d97", + "version" : "10.11.2" } }, { @@ -122,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/uias/Pageboy", "state" : { - "revision" : "34ecb6e7c4e0e07494960ab2f7cc9a02293915a6", - "version" : "3.6.2" + "revision" : "af8fa81788b893205e1ff42ddd88c5b0b315d7c5", + "version" : "3.7.0" } }, { @@ -140,8 +140,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/SDWebImage/SDWebImage.git", "state" : { - "revision" : "2e63d0061da449ad0ed130768d05dceb1496de44", - "version" : "5.12.5" + "revision" : "3312bf5e67b52fbce7c3caf431b0cda721a9f7bb", + "version" : "5.14.2" } }, { @@ -185,8 +185,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/scinfu/SwiftSoup.git", "state" : { - "revision" : "41e7c263fb8c277e980ebcb9b0b5f6031d3d4886", - "version" : "2.4.2" + "revision" : "6778575285177365cbad3e5b8a72f2a20583cfec", + "version" : "2.4.3" } }, { diff --git a/Mastodon/Generated/AutoGenerateTableViewDelegate.generated.swift b/Mastodon/Generated/AutoGenerateTableViewDelegate.generated.swift index 4c65e1a3e..72560b896 100644 --- a/Mastodon/Generated/AutoGenerateTableViewDelegate.generated.swift +++ b/Mastodon/Generated/AutoGenerateTableViewDelegate.generated.swift @@ -1,4 +1,4 @@ -// Generated using Sourcery 1.6.1 — https://github.com/krzysztofzablocki/Sourcery +// Generated using Sourcery 1.9.0 — https://github.com/krzysztofzablocki/Sourcery // DO NOT EDIT // sourcery:inline:DiscoveryCommunityViewController.AutoGenerateTableViewDelegate diff --git a/Podfile b/Podfile index 5c8a0a47e..b86a50868 100644 --- a/Podfile +++ b/Podfile @@ -15,10 +15,10 @@ target 'Mastodon' do # misc pod 'SwiftGen', '~> 6.6.2' pod 'Kanna', '~> 5.2.2' - pod 'Sourcery', '~> 1.6.1' + pod 'Sourcery', '~> 1.9' # DEBUG - pod 'FLEX', '~> 4.4.0', :configurations => ['Debug', "Release Snapshot"] + pod 'FLEX', '~> 5.22.10', :configurations => ['Debug', "Release Snapshot"] target 'MastodonTests' do inherit! :search_paths diff --git a/Podfile.lock b/Podfile.lock index f0949d7ab..354d465a6 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - FLEX (4.4.1) + - FLEX (5.22.10) - Kanna (5.2.7) - - Sourcery (1.6.1): - - Sourcery/CLI-Only (= 1.6.1) - - Sourcery/CLI-Only (1.6.1) + - Sourcery (1.9.0): + - Sourcery/CLI-Only (= 1.9.0) + - Sourcery/CLI-Only (1.9.0) - SwiftGen (6.6.2) - XLPagerTabStrip (9.0.0) DEPENDENCIES: - - FLEX (~> 4.4.0) + - FLEX (~> 5.22.10) - Kanna (~> 5.2.2) - - Sourcery (~> 1.6.1) + - Sourcery (~> 1.9) - SwiftGen (~> 6.6.2) - XLPagerTabStrip (~> 9.0.0) @@ -23,12 +23,12 @@ SPEC REPOS: - XLPagerTabStrip SPEC CHECKSUMS: - FLEX: 7ca2c8cd3a435ff501ff6d2f2141e9bdc934eaab + FLEX: f21ee4f498eed3f8a1eded66b21939fd3b7a22ce Kanna: 01cfbddc127f5ff0963692f285fcbc8a9d62d234 - Sourcery: f3759f803bd0739f74fc92a4341eed0473ce61ac + Sourcery: d7c59d100e55bf59123c8ae7d65a24cf30748979 SwiftGen: 1366a7f71aeef49954ca5a63ba4bef6b0f24138c XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5 -PODFILE CHECKSUM: 5b1dbf90a3e6fff01240ad0a2ceb2bc7f7bb4e36 +PODFILE CHECKSUM: 219ef7456c1c3111c3f61653632501ce09918bf0 COCOAPODS: 1.11.3