diff --git a/.arkana.yml b/.arkana.yml
new file mode 100644
index 000000000..d18507aba
--- /dev/null
+++ b/.arkana.yml
@@ -0,0 +1,16 @@
+import_name: 'ArkanaKeys'
+namespace: 'Keys'
+result_path: 'Dependencies'
+flavors:
+ - AppStore
+swift_declaration_strategy: let
+should_generate_unit_tests: true
+package_manager: spm
+environments:
+ - Debug
+ - Release
+global_secrets:
+ # nothing
+environment_secrets:
+ # Mastodon Push Notification Endpoint
+ - NotificationEndpoint
diff --git a/.gitignore b/.gitignore
index 6f4802cab..2d787576b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,4 +122,7 @@ xcuserdata
# Localization/StringsConvertor/input
Localization/StringsConvertor/output
-.DS_Store
\ No newline at end of file
+.DS_Store
+
+env/**/**
+!env/.env
\ No newline at end of file
diff --git a/AppShared/AppSecret.swift b/AppShared/AppSecret.swift
index 9110f2490..45c2e3546 100644
--- a/AppShared/AppSecret.swift
+++ b/AppShared/AppSecret.swift
@@ -9,7 +9,7 @@
import Foundation
import CryptoKit
import KeychainAccess
-import Keys
+import ArkanaKeys
import MastodonCommon
public final class AppSecret {
@@ -36,12 +36,12 @@ public final class AppSecret {
}()
init() {
- let keys = MastodonKeys()
-
#if DEBUG
- self.notificationEndpoint = keys.notification_endpoint_debug
+ let keys = Keys.Debug()
+ self.notificationEndpoint = keys.notificationEndpoint
#else
- self.notificationEndpoint = keys.notification_endpoint
+ let keys = Keys.Release()
+ self.notificationEndpoint = keys.notificationEndpoint
#endif
}
diff --git a/AppShared/Info.plist b/AppShared/Info.plist
index 529741c4e..9f09d489c 100644
--- a/AppShared/Info.plist
+++ b/AppShared/Info.plist
@@ -17,6 +17,6 @@
CFBundleShortVersionString
1.4.6
CFBundleVersion
- 146
+ 147
diff --git a/Documentation/Setup.md b/Documentation/Setup.md
index 1c2f0a6c5..60722e5fb 100644
--- a/Documentation/Setup.md
+++ b/Documentation/Setup.md
@@ -12,7 +12,7 @@ Intell the latest version of Xcode from the App Store or Apple Developer Downloa
This guide may not suit your machine and actually setup procedure may change in the future. Please file the issue or Pull Request if there are any problems.
## CocoaPods
-The app use [CocoaPods]() and [CocoaPods-Keys](https://github.com/orta/cocoapods-keys). Ruby Gems are managed through Bundler. The M1 Mac needs virtual ruby env to workaround compatibility issues.
+The app use [CocoaPods]() and [Arkana](https://github.com/rogerluan/arkana). Ruby Gems are managed through Bundler. The M1 Mac needs virtual ruby env to workaround compatibility issues.
#### Intel Mac
@@ -52,6 +52,9 @@ bundle install
bundle install
bundle exec pod clean
+# setup arkana
+bundle exec arkana -e ./env/.env
+
# make install
bundle exec pod install --repo-update
@@ -59,14 +62,14 @@ bundle exec pod install --repo-update
open Mastodon.xcworkspace
```
-The CocoaPods-Key plugin will request the push notification endpoint. You can fufill the empty string and set it later. To setup the push notification. Please check section `Push Notification` below.
+The Arkana plugin will setup the push notification endpoint. You can use the empty template from `./env/.env` or use your own `.env` file. To setup the push notification. Please check section `Push Notification` below.
The app requires the `App Group` capability. To make sure it works for your developer membership. Please check [AppSecret.swift](../AppShared/AppSecret.swift) file and set another unique `groupID` and update `App Group` settings.
#### Push Notification (Optional)
-The app is compatible with [toot-relay](https://github.com/DagAgren/toot-relay) APNs. You can set your push notification endpoint via Cocoapod-Keys. There are two endpoints:
-- notification_endpoint: for `RELEASE` usage
-- notification_endpoint_debug: for `DEBUG` usage
+The app is compatible with [toot-relay](https://github.com/DagAgren/toot-relay) APNs. You can set your push notification endpoint via Arkana. There are two endpoints:
+- NotificationEndpointDebug: for `DEBUG` usage. e.g. `https:///relay-to/development`
+- NotificationEndpointRelease: for `RELEASE` usage. e.g. `https:///relay-to/production`
Please check the [Establishing a Certificate-Based Connection to APNs
](https://developer.apple.com/documentation/usernotifications/setting_up_a_remote_notification_server/establishing_a_certificate-based_connection_to_apns) document to generate the certificate and exports the p12 file.
diff --git a/Gemfile b/Gemfile
index 48aae3d82..7ecafafc1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,7 @@
source "https://rubygems.org"
+gem 'arkana'
gem "cocoapods"
gem "cocoapods-clean"
-gem "cocoapods-keys"
+gem "xcpretty"
diff --git a/Gemfile.lock b/Gemfile.lock
index b27a44a97..8ea5aa35f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,9 +3,6 @@ GEM
specs:
CFPropertyList (3.0.5)
rexml
- RubyInline (3.12.5)
- ZenTest (~> 4.3)
- ZenTest (4.12.1)
activesupport (6.1.5.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
@@ -17,6 +14,10 @@ GEM
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
+ arkana (1.1.1)
+ colorize (~> 0.8)
+ dotenv (~> 2.7)
+ yaml (~> 0.2)
atomos (0.1.3)
claide (1.1.0)
cocoapods (1.11.3)
@@ -50,9 +51,6 @@ GEM
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (1.6.3)
- cocoapods-keys (2.2.1)
- dotenv
- osx_keychain
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
@@ -61,6 +59,7 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
+ colorize (0.8.1)
concurrent-ruby (1.1.10)
dotenv (2.7.6)
escape (0.0.4)
@@ -79,10 +78,9 @@ GEM
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
- osx_keychain (1.0.2)
- RubyInline (~> 3)
public_suffix (4.0.7)
rexml (3.2.5)
+ rouge (2.0.7)
ruby-macho (2.5.1)
typhoeus (1.4.0)
ethon (>= 0.9.0)
@@ -95,15 +93,19 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
+ xcpretty (0.3.0)
+ rouge (~> 2.0.7)
+ yaml (0.2.0)
zeitwerk (2.5.4)
PLATFORMS
ruby
DEPENDENCIES
+ arkana
cocoapods
cocoapods-clean
- cocoapods-keys
+ xcpretty
BUNDLED WITH
- 2.3.11
+ 2.3.17
diff --git a/Mastodon.xcodeproj/project.pbxproj b/Mastodon.xcodeproj/project.pbxproj
index c3f10e505..0a81bbdfe 100644
--- a/Mastodon.xcodeproj/project.pbxproj
+++ b/Mastodon.xcodeproj/project.pbxproj
@@ -56,7 +56,6 @@
2D607AD826242FC500B70763 /* NotificationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D607AD726242FC500B70763 /* NotificationViewModel.swift */; };
2D61254D262547C200299647 /* APIService+Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D61254C262547C200299647 /* APIService+Notification.swift */; };
2D61335E25C1894B00CAE157 /* APIService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D61335D25C1894B00CAE157 /* APIService.swift */; };
- 2D61336925C18A4F00CAE157 /* AlamofireNetworkActivityIndicator in Frameworks */ = {isa = PBXBuildFile; productRef = 2D61336825C18A4F00CAE157 /* AlamofireNetworkActivityIndicator */; };
2D650FAB25ECDC9300851B58 /* Mastodon+Entity+Error+Detail.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D650FAA25ECDC9300851B58 /* Mastodon+Entity+Error+Detail.swift */; };
2D694A7425F9EB4E0038ADDC /* ContentWarningOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D694A7325F9EB4E0038ADDC /* ContentWarningOverlayView.swift */; };
2D6DE40026141DF600A63F6A /* SearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D6DE3FF26141DF600A63F6A /* SearchViewModel.swift */; };
@@ -122,7 +121,6 @@
DB029E95266A20430062874E /* MastodonAuthenticationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB029E94266A20430062874E /* MastodonAuthenticationController.swift */; };
DB02CDAB26256A9500D0A2AF /* ThreadReplyLoaderTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB02CDAA26256A9500D0A2AF /* ThreadReplyLoaderTableViewCell.swift */; };
DB02CDBF2625AE5000D0A2AF /* AdaptiveUserInterfaceStyleBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB02CDBE2625AE5000D0A2AF /* AdaptiveUserInterfaceStyleBarButtonItem.swift */; };
- DB02EA0B280D180D00E751C5 /* KeychainAccess in Frameworks */ = {isa = PBXBuildFile; productRef = DB02EA0A280D180D00E751C5 /* KeychainAccess */; };
DB03A793272A7E5700EE37C5 /* SidebarListHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB03A792272A7E5700EE37C5 /* SidebarListHeaderView.swift */; };
DB03A795272A981400EE37C5 /* ContentSplitViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB03A794272A981400EE37C5 /* ContentSplitViewController.swift */; };
DB03F7F32689AEA3007B274C /* ComposeRepliedToStatusContentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB03F7F22689AEA3007B274C /* ComposeRepliedToStatusContentTableViewCell.swift */; };
@@ -232,18 +230,7 @@
DB3EA8EF281B837000598866 /* DiscoveryCommunityViewController+DataSourceProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB3EA8EE281B837000598866 /* DiscoveryCommunityViewController+DataSourceProvider.swift */; };
DB3EA8F1281B9EF600598866 /* DiscoveryCommunityViewModel+Diffable.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB3EA8F0281B9EF600598866 /* DiscoveryCommunityViewModel+Diffable.swift */; };
DB3EA8F5281BB65200598866 /* MastodonSDK in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA8F4281BB65200598866 /* MastodonSDK */; };
- DB3EA8FC281BBAE100598866 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA8FB281BBAE100598866 /* AlamofireImage */; };
- DB3EA8FE281BBAF200598866 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA8FD281BBAF200598866 /* Alamofire */; };
DB3EA902281BBD5D00598866 /* CommonOSLog in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA901281BBD5D00598866 /* CommonOSLog */; };
- DB3EA904281BBD9400598866 /* Introspect in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA903281BBD9400598866 /* Introspect */; };
- DB3EA906281BBE8200598866 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA905281BBE8200598866 /* AlamofireImage */; };
- DB3EA908281BBE8200598866 /* AlamofireNetworkActivityIndicator in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA907281BBE8200598866 /* AlamofireNetworkActivityIndicator */; };
- DB3EA90A281BBE8200598866 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA909281BBE8200598866 /* Alamofire */; };
- DB3EA90C281BBE9600598866 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA90B281BBE9600598866 /* AlamofireImage */; };
- DB3EA90E281BBE9600598866 /* AlamofireNetworkActivityIndicator in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA90D281BBE9600598866 /* AlamofireNetworkActivityIndicator */; };
- DB3EA910281BBE9600598866 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA90F281BBE9600598866 /* Alamofire */; };
- DB3EA912281BBEA800598866 /* AlamofireImage in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA911281BBEA800598866 /* AlamofireImage */; };
- DB3EA914281BBEA800598866 /* Alamofire in Frameworks */ = {isa = PBXBuildFile; productRef = DB3EA913281BBEA800598866 /* Alamofire */; };
DB427DD625BAA00100D1B89D /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB427DD525BAA00100D1B89D /* AppDelegate.swift */; };
DB427DD825BAA00100D1B89D /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = DB427DD725BAA00100D1B89D /* SceneDelegate.swift */; };
DB427DDD25BAA00100D1B89D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DB427DDB25BAA00100D1B89D /* Main.storyboard */; };
@@ -1424,7 +1411,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DB3EA914281BBEA800598866 /* Alamofire in Frameworks */,
2D939AC825EE14620076FA61 /* CropViewController in Frameworks */,
DBB525082611EAC0002F1F29 /* Tabman in Frameworks */,
DB6804862637CD4C00430867 /* AppShared.framework in Frameworks */,
@@ -1432,14 +1418,12 @@
DBAC6483267D0B21007FE9FD /* DifferenceKit in Frameworks */,
DB486C0F282E41F200F69423 /* TabBarPager in Frameworks */,
DB552D4F26BBD10C00E481F6 /* OrderedCollections in Frameworks */,
- 2D61336925C18A4F00CAE157 /* AlamofireNetworkActivityIndicator in Frameworks */,
DBAC64A1267E6D02007FE9FD /* Fuzi in Frameworks */,
DBAC649E267DFE43007FE9FD /* DiffableDataSources in Frameworks */,
2D5981BA25E4D7F8000FB903 /* ThirdPartyMailer in Frameworks */,
87FFDA5D898A5C42ADCB35E7 /* Pods_Mastodon.framework in Frameworks */,
DBF7A0FC26830C33004176A2 /* FPSIndicator in Frameworks */,
DBA5A52F26F07ED800CACBAA /* PanModal in Frameworks */,
- DB3EA912281BBEA800598866 /* AlamofireImage in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1464,12 +1448,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DB3EA8FE281BBAF200598866 /* Alamofire in Frameworks */,
DB3EA8F5281BB65200598866 /* MastodonSDK in Frameworks */,
- DB3EA8FC281BBAE100598866 /* AlamofireImage in Frameworks */,
- DB02EA0B280D180D00E751C5 /* KeychainAccess in Frameworks */,
EE93E8E8F9E0C39EAAEBD92F /* Pods_AppShared.framework in Frameworks */,
- DB3EA904281BBD9400598866 /* Introspect in Frameworks */,
DB3EA902281BBD5D00598866 /* CommonOSLog in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1487,10 +1467,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DB3EA90E281BBE9600598866 /* AlamofireNetworkActivityIndicator in Frameworks */,
- DB3EA910281BBE9600598866 /* Alamofire in Frameworks */,
DBE3CA6B27A39CAF00AFE27B /* AppShared.framework in Frameworks */,
- DB3EA90C281BBE9600598866 /* AlamofireImage in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1498,10 +1475,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- DB3EA908281BBE8200598866 /* AlamofireNetworkActivityIndicator in Frameworks */,
- DB3EA90A281BBE8200598866 /* Alamofire in Frameworks */,
DBE3CA6827A39CAB00AFE27B /* AppShared.framework in Frameworks */,
- DB3EA906281BBE8200598866 /* AlamofireImage in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3448,7 +3422,6 @@
);
name = Mastodon;
packageProductDependencies = (
- 2D61336825C18A4F00CAE157 /* AlamofireNetworkActivityIndicator */,
2D5981B925E4D7F8000FB903 /* ThirdPartyMailer */,
2D939AC725EE14620076FA61 /* CropViewController */,
DBB525072611EAC0002F1F29 /* Tabman */,
@@ -3458,8 +3431,6 @@
DBF7A0FB26830C33004176A2 /* FPSIndicator */,
DB552D4E26BBD10C00E481F6 /* OrderedCollections */,
DBA5A52E26F07ED800CACBAA /* PanModal */,
- DB3EA911281BBEA800598866 /* AlamofireImage */,
- DB3EA913281BBEA800598866 /* Alamofire */,
DB486C0E282E41F200F69423 /* TabBarPager */,
);
productName = Mastodon;
@@ -3521,12 +3492,8 @@
);
name = AppShared;
packageProductDependencies = (
- DB02EA0A280D180D00E751C5 /* KeychainAccess */,
DB3EA8F4281BB65200598866 /* MastodonSDK */,
- DB3EA8FB281BBAE100598866 /* AlamofireImage */,
- DB3EA8FD281BBAF200598866 /* Alamofire */,
DB3EA901281BBD5D00598866 /* CommonOSLog */,
- DB3EA903281BBD9400598866 /* Introspect */,
);
productName = AppShared;
productReference = DB68047F2637CD4C00430867 /* AppShared.framework */;
@@ -3565,9 +3532,6 @@
);
name = ShareActionExtension;
packageProductDependencies = (
- DB3EA90B281BBE9600598866 /* AlamofireImage */,
- DB3EA90D281BBE9600598866 /* AlamofireNetworkActivityIndicator */,
- DB3EA90F281BBE9600598866 /* Alamofire */,
);
productName = ShareActionExtension;
productReference = DBC6461226A170AB00B0E31B /* ShareActionExtension.appex */;
@@ -3588,9 +3552,6 @@
);
name = NotificationService;
packageProductDependencies = (
- DB3EA905281BBE8200598866 /* AlamofireImage */,
- DB3EA907281BBE8200598866 /* AlamofireNetworkActivityIndicator */,
- DB3EA909281BBE8200598866 /* Alamofire */,
);
productName = NotificationService;
productReference = DBF8AE13263293E400C9C23C /* NotificationService.appex */;
@@ -3665,13 +3626,10 @@
);
mainGroup = DB427DC925BAA00100D1B89D;
packageReferences = (
- DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */,
- 2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */,
DB0140BB25C40D7500F9F3CF /* XCRemoteSwiftPackageReference "CommonOSLog" */,
2D5981B825E4D7F8000FB903 /* XCRemoteSwiftPackageReference "ThirdPartyMailer" */,
2D939AC625EE14620076FA61 /* XCRemoteSwiftPackageReference "TOCropViewController" */,
DBB525062611EAC0002F1F29 /* XCRemoteSwiftPackageReference "Tabman" */,
- DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */,
DBAC6481267D0B21007FE9FD /* XCRemoteSwiftPackageReference "DifferenceKit" */,
DBAC649C267DFE43007FE9FD /* XCRemoteSwiftPackageReference "DiffableDataSources" */,
DBAC649F267E6D01007FE9FD /* XCRemoteSwiftPackageReference "Fuzi" */,
@@ -3679,8 +3637,6 @@
DB0E2D2C26833FF600865C3C /* XCRemoteSwiftPackageReference "Nuke-FLAnimatedImage-Plugin" */,
DB552D4D26BBD10C00E481F6 /* XCRemoteSwiftPackageReference "swift-collections" */,
DBA5A52D26F07ED800CACBAA /* XCRemoteSwiftPackageReference "PanModal" */,
- DB8D8E2D28192EED009FD90F /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */,
- DB3EA8F6281BBA4C00598866 /* XCRemoteSwiftPackageReference "Alamofire" */,
DB486C0D282E41F200F69423 /* XCRemoteSwiftPackageReference "TabBarPager" */,
);
productRefGroup = DB427DD325BAA00100D1B89D /* Products */;
@@ -4850,7 +4806,7 @@
CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = Mastodon/Info.plist;
@@ -4880,7 +4836,7 @@
CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = Mastodon/Info.plist;
@@ -4988,11 +4944,11 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 146;
+ DYLIB_CURRENT_VERSION = 147;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AppShared/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -5019,11 +4975,11 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 146;
+ DYLIB_CURRENT_VERSION = 147;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AppShared/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -5114,7 +5070,7 @@
CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = Mastodon/Info.plist;
@@ -5182,11 +5138,11 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 146;
+ DYLIB_CURRENT_VERSION = 147;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AppShared/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -5212,7 +5168,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5235,7 +5191,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = ShareActionExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5259,7 +5215,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonIntent/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5283,7 +5239,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonIntent/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5307,7 +5263,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonIntent/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5331,7 +5287,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = ShareActionExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5355,7 +5311,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = ShareActionExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5442,7 +5398,7 @@
CODE_SIGN_ENTITLEMENTS = Mastodon/Mastodon.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_ASSET_PATHS = "Mastodon/Resources/Preview\\ Assets.xcassets";
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = Mastodon/Info.plist;
@@ -5509,11 +5465,11 @@
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
DYLIB_COMPATIBILITY_VERSION = 1;
- DYLIB_CURRENT_VERSION = 146;
+ DYLIB_CURRENT_VERSION = 147;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = AppShared/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -5538,7 +5494,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5561,7 +5517,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = ShareActionExtension/ShareActionExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = ShareActionExtension/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5585,7 +5541,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = MastodonIntent/MastodonIntent.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = MastodonIntent/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5610,7 +5566,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5634,7 +5590,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements;
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 146;
+ CURRENT_PROJECT_VERSION = 147;
DEVELOPMENT_TEAM = 5Z4GVSS33P;
INFOPLIST_FILE = NotificationService/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
@@ -5754,14 +5710,6 @@
minimumVersion = 1.7.1;
};
};
- 2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */ = {
- isa = XCRemoteSwiftPackageReference;
- repositoryURL = "https://github.com/Alamofire/AlamofireNetworkActivityIndicator";
- requirement = {
- kind = upToNextMajorVersion;
- minimumVersion = 3.1.0;
- };
- };
2D939AC625EE14620076FA61 /* XCRemoteSwiftPackageReference "TOCropViewController" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/TimOliver/TOCropViewController.git";
@@ -5786,22 +5734,6 @@
minimumVersion = 8.0.0;
};
};
- DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */ = {
- isa = XCRemoteSwiftPackageReference;
- repositoryURL = "https://github.com/Alamofire/AlamofireImage.git";
- requirement = {
- kind = upToNextMajorVersion;
- minimumVersion = 4.1.0;
- };
- };
- DB3EA8F6281BBA4C00598866 /* XCRemoteSwiftPackageReference "Alamofire" */ = {
- isa = XCRemoteSwiftPackageReference;
- repositoryURL = "https://github.com/Alamofire/Alamofire.git";
- requirement = {
- kind = upToNextMajorVersion;
- minimumVersion = 5.4.0;
- };
- };
DB486C0D282E41F200F69423 /* XCRemoteSwiftPackageReference "TabBarPager" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/TwidereProject/TabBarPager.git";
@@ -5818,22 +5750,6 @@
minimumVersion = 0.0.5;
};
};
- DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */ = {
- isa = XCRemoteSwiftPackageReference;
- repositoryURL = "https://github.com/kishikawakatsumi/KeychainAccess.git";
- requirement = {
- kind = upToNextMajorVersion;
- minimumVersion = 4.2.2;
- };
- };
- DB8D8E2D28192EED009FD90F /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */ = {
- isa = XCRemoteSwiftPackageReference;
- repositoryURL = "https://github.com/siteline/SwiftUI-Introspect.git";
- requirement = {
- kind = upToNextMajorVersion;
- minimumVersion = 0.1.4;
- };
- };
DBA5A52D26F07ED800CACBAA /* XCRemoteSwiftPackageReference "PanModal" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/slackhq/PanModal.git";
@@ -5890,85 +5806,20 @@
package = 2D5981B825E4D7F8000FB903 /* XCRemoteSwiftPackageReference "ThirdPartyMailer" */;
productName = ThirdPartyMailer;
};
- 2D61336825C18A4F00CAE157 /* AlamofireNetworkActivityIndicator */ = {
- isa = XCSwiftPackageProductDependency;
- package = 2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */;
- productName = AlamofireNetworkActivityIndicator;
- };
2D939AC725EE14620076FA61 /* CropViewController */ = {
isa = XCSwiftPackageProductDependency;
package = 2D939AC625EE14620076FA61 /* XCRemoteSwiftPackageReference "TOCropViewController" */;
productName = CropViewController;
};
- DB02EA0A280D180D00E751C5 /* KeychainAccess */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB6804722637CC1200430867 /* XCRemoteSwiftPackageReference "KeychainAccess" */;
- productName = KeychainAccess;
- };
DB3EA8F4281BB65200598866 /* MastodonSDK */ = {
isa = XCSwiftPackageProductDependency;
productName = MastodonSDK;
};
- DB3EA8FB281BBAE100598866 /* AlamofireImage */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
- productName = AlamofireImage;
- };
- DB3EA8FD281BBAF200598866 /* Alamofire */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3EA8F6281BBA4C00598866 /* XCRemoteSwiftPackageReference "Alamofire" */;
- productName = Alamofire;
- };
DB3EA901281BBD5D00598866 /* CommonOSLog */ = {
isa = XCSwiftPackageProductDependency;
package = DB0140BB25C40D7500F9F3CF /* XCRemoteSwiftPackageReference "CommonOSLog" */;
productName = CommonOSLog;
};
- DB3EA903281BBD9400598866 /* Introspect */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB8D8E2D28192EED009FD90F /* XCRemoteSwiftPackageReference "SwiftUI-Introspect" */;
- productName = Introspect;
- };
- DB3EA905281BBE8200598866 /* AlamofireImage */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
- productName = AlamofireImage;
- };
- DB3EA907281BBE8200598866 /* AlamofireNetworkActivityIndicator */ = {
- isa = XCSwiftPackageProductDependency;
- package = 2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */;
- productName = AlamofireNetworkActivityIndicator;
- };
- DB3EA909281BBE8200598866 /* Alamofire */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3EA8F6281BBA4C00598866 /* XCRemoteSwiftPackageReference "Alamofire" */;
- productName = Alamofire;
- };
- DB3EA90B281BBE9600598866 /* AlamofireImage */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
- productName = AlamofireImage;
- };
- DB3EA90D281BBE9600598866 /* AlamofireNetworkActivityIndicator */ = {
- isa = XCSwiftPackageProductDependency;
- package = 2D61336725C18A4F00CAE157 /* XCRemoteSwiftPackageReference "AlamofireNetworkActivityIndicator" */;
- productName = AlamofireNetworkActivityIndicator;
- };
- DB3EA90F281BBE9600598866 /* Alamofire */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3EA8F6281BBA4C00598866 /* XCRemoteSwiftPackageReference "Alamofire" */;
- productName = Alamofire;
- };
- DB3EA911281BBEA800598866 /* AlamofireImage */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3D0FF125BAA61700EAA174 /* XCRemoteSwiftPackageReference "AlamofireImage" */;
- productName = AlamofireImage;
- };
- DB3EA913281BBEA800598866 /* Alamofire */ = {
- isa = XCSwiftPackageProductDependency;
- package = DB3EA8F6281BBA4C00598866 /* XCRemoteSwiftPackageReference "Alamofire" */;
- productName = Alamofire;
- };
DB486C0E282E41F200F69423 /* TabBarPager */ = {
isa = XCSwiftPackageProductDependency;
package = DB486C0D282E41F200F69423 /* XCRemoteSwiftPackageReference "TabBarPager" */;
diff --git a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
index 21c3ac33d..103cb88d9 100644
--- a/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Mastodon.xcodeproj/xcuserdata/mainasuk.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -9,7 +9,7 @@
isShown
orderHint
- 7
+ 6
CoreDataStack.xcscheme_^#shared#^_
@@ -24,7 +24,7 @@
Mastodon - RTL.xcscheme_^#shared#^_
orderHint
- 8
+ 7
Mastodon - Release.xcscheme_^#shared#^_
@@ -34,12 +34,12 @@
Mastodon - Snapshot.xcscheme_^#shared#^_
orderHint
- 5
+ 4
Mastodon - ar.xcscheme
orderHint
- 6
+ 5
Mastodon - ar.xcscheme_^#shared#^_
@@ -114,7 +114,7 @@
MastodonIntent.xcscheme_^#shared#^_
orderHint
- 42
+ 31
MastodonIntents.xcscheme_^#shared#^_
@@ -129,12 +129,12 @@
NotificationService.xcscheme_^#shared#^_
orderHint
- 43
+ 30
ShareActionExtension.xcscheme_^#shared#^_
orderHint
- 41
+ 32
SuppressBuildableAutocreation
diff --git a/Mastodon/Info.plist b/Mastodon/Info.plist
index e1b5816f3..ce2875109 100644
--- a/Mastodon/Info.plist
+++ b/Mastodon/Info.plist
@@ -43,7 +43,7 @@
CFBundleVersion
- 146
+ 147
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/MastodonIntent/Info.plist b/MastodonIntent/Info.plist
index 5da7221e2..3816b660b 100644
--- a/MastodonIntent/Info.plist
+++ b/MastodonIntent/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
1.4.6
CFBundleVersion
- 146
+ 147
NSExtension
NSExtensionAttributes
diff --git a/MastodonSDK/Package.swift b/MastodonSDK/Package.swift
index aa349f8e0..ea3f2b01d 100644
--- a/MastodonSDK/Package.swift
+++ b/MastodonSDK/Package.swift
@@ -30,10 +30,13 @@ let package = Package(
.package(url: "https://github.com/TwidereProject/MetaTextKit.git", .exact("2.2.5")),
.package(url: "https://github.com/Alamofire/Alamofire.git", from: "5.4.0"),
.package(url: "https://github.com/Alamofire/AlamofireImage.git", from: "4.1.0"),
+ .package(url: "https://github.com/Alamofire/AlamofireNetworkActivityIndicator", from: "3.1.0"),
+ .package(url: "https://github.com/kishikawakatsumi/KeychainAccess.git", from: "4.2.2"),
.package(name: "NukeFLAnimatedImagePlugin", url: "https://github.com/kean/Nuke-FLAnimatedImage-Plugin.git", from: "8.0.0"),
.package(name: "UITextView+Placeholder", url: "https://github.com/MainasuK/UITextView-Placeholder.git", from: "1.4.1"),
.package(name: "Introspect", url: "https://github.com/siteline/SwiftUI-Introspect.git", from: "0.1.3"),
.package(name: "FaviconFinder", url: "https://github.com/will-lumley/FaviconFinder.git", from: "3.2.2"),
+ .package(name: "ArkanaKeys", path: "../Dependencies/ArkanaKeys"),
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -57,7 +60,9 @@ let package = Package(
.target(
name: "MastodonCommon",
dependencies: [
- "MastodonExtension"
+ "ArkanaKeys",
+ "MastodonExtension",
+ .product(name: "KeychainAccess", package: "KeychainAccess"),
]
),
.target(
@@ -85,6 +90,7 @@ let package = Package(
"MastodonLocalization",
.product(name: "Alamofire", package: "Alamofire"),
.product(name: "AlamofireImage", package: "AlamofireImage"),
+ .product(name: "AlamofireNetworkActivityIndicator", package: "AlamofireNetworkActivityIndicator"),
.product(name: "FLAnimatedImage", package: "FLAnimatedImage"),
.product(name: "FaviconFinder", package: "FaviconFinder"),
.product(name: "MetaTextKit", package: "MetaTextKit"),
diff --git a/MastodonTests/Info.plist b/MastodonTests/Info.plist
index 529741c4e..9f09d489c 100644
--- a/MastodonTests/Info.plist
+++ b/MastodonTests/Info.plist
@@ -17,6 +17,6 @@
CFBundleShortVersionString
1.4.6
CFBundleVersion
- 146
+ 147
diff --git a/MastodonUITests/Info.plist b/MastodonUITests/Info.plist
index 529741c4e..9f09d489c 100644
--- a/MastodonUITests/Info.plist
+++ b/MastodonUITests/Info.plist
@@ -17,6 +17,6 @@
CFBundleShortVersionString
1.4.6
CFBundleVersion
- 146
+ 147
diff --git a/NotificationService/Info.plist b/NotificationService/Info.plist
index 1379a2eaf..854a8a529 100644
--- a/NotificationService/Info.plist
+++ b/NotificationService/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
1.4.6
CFBundleVersion
- 146
+ 147
NSExtension
NSExtensionPointIdentifier
diff --git a/Podfile b/Podfile
index a64cd0e55..774148fa0 100644
--- a/Podfile
+++ b/Podfile
@@ -35,14 +35,6 @@ target 'AppShared' do
use_frameworks!
end
-plugin 'cocoapods-keys', {
- :project => "Mastodon",
- :keys => [
- "notification_endpoint",
- "notification_endpoint_debug"
- ]
-}
-
post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
diff --git a/Podfile.lock b/Podfile.lock
index 629a48a87..453610694 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -2,7 +2,6 @@ PODS:
- DateToolsSwift (5.0.0)
- FLEX (4.4.1)
- Kanna (5.2.7)
- - Keys (1.0.1)
- Sourcery (1.6.1):
- Sourcery/CLI-Only (= 1.6.1)
- Sourcery/CLI-Only (1.6.1)
@@ -14,7 +13,6 @@ DEPENDENCIES:
- DateToolsSwift (~> 5.0.0)
- FLEX (~> 4.4.0)
- Kanna (~> 5.2.2)
- - Keys (from `Pods/CocoaPodsKeys`)
- Sourcery (~> 1.6.1)
- SwiftGen (~> 6.4.0)
- "UITextField+Shake (~> 1.2)"
@@ -30,20 +28,15 @@ SPEC REPOS:
- "UITextField+Shake"
- XLPagerTabStrip
-EXTERNAL SOURCES:
- Keys:
- :path: Pods/CocoaPodsKeys
-
SPEC CHECKSUMS:
DateToolsSwift: 4207ada6ad615d8dc076323d27037c94916dbfa6
FLEX: 7ca2c8cd3a435ff501ff6d2f2141e9bdc934eaab
Kanna: 01cfbddc127f5ff0963692f285fcbc8a9d62d234
- Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
Sourcery: f3759f803bd0739f74fc92a4341eed0473ce61ac
SwiftGen: 67860cc7c3cfc2ed25b9b74cfd55495fc89f9108
"UITextField+Shake": 298ac5a0f239d731bdab999b19b628c956ca0ac3
XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5
-PODFILE CHECKSUM: 1ac960a2c981ef98f7c24a3bba57bdabc1f66103
+PODFILE CHECKSUM: d95968ab70ea5121c21dfd801aa36b12bcd59c9d
COCOAPODS: 1.11.3
diff --git a/ShareActionExtension/Info.plist b/ShareActionExtension/Info.plist
index ef2a91fac..4372c5048 100644
--- a/ShareActionExtension/Info.plist
+++ b/ShareActionExtension/Info.plist
@@ -19,7 +19,7 @@
CFBundleShortVersionString
1.4.6
CFBundleVersion
- 146
+ 147
NSExtension
NSExtensionAttributes
diff --git a/env/.env b/env/.env
new file mode 100644
index 000000000..2458052ab
--- /dev/null
+++ b/env/.env
@@ -0,0 +1,3 @@
+# Required
+NotificationEndpointDebug=""
+NotificationEndpointRelease=""
\ No newline at end of file