diff --git a/android/app/build.gradle b/android/app/build.gradle index 3c791de00..bae832a58 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -130,7 +130,7 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 277 + versionCode 278 versionName "1.30.0" multiDexEnabled = true ndk { diff --git a/fastlane/Gemfile b/fastlane/Gemfile index 2848e7afe..1e864103e 100644 --- a/fastlane/Gemfile +++ b/fastlane/Gemfile @@ -1,8 +1,7 @@ source "https://rubygems.org" -gem "fastlane", "2.141.0" +gem "fastlane" gem "nokogiri" -gem "aws-sdk-s3" plugins_path = File.join(File.dirname(__FILE__), '.', 'Pluginfile') eval(File.read(plugins_path), binding) if File.exist?(plugins_path) diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index f5e0e5cf5..da44a3a28 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -6,8 +6,8 @@ GEM public_suffix (>= 2.0.2, < 5.0) atomos (0.1.3) aws-eventstream (1.0.3) - aws-partitions (1.281.0) - aws-sdk-core (3.91.0) + aws-partitions (1.289.0) + aws-sdk-core (3.92.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) @@ -15,7 +15,7 @@ GEM aws-sdk-kms (1.30.0) aws-sdk-core (~> 3, >= 3.71.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.61.0) + aws-sdk-s3 (1.61.1) aws-sdk-core (~> 3, >= 3.83.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -34,7 +34,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.5) emoji_regex (1.0.1) - excon (0.72.0) + excon (0.73.0) faraday (0.17.3) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) @@ -43,9 +43,10 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) fastimage (2.1.7) - fastlane (2.141.0) + fastlane (2.144.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.3, < 3.0.0) + aws-sdk-s3 (~> 1.0) babosa (>= 1.0.2, < 2.0.0) bundler (>= 1.12.0, < 3.0.0) colored @@ -143,7 +144,7 @@ GEM rouge (2.0.7) rubyzip (1.3.0) security (0.1.3) - signet (0.13.0) + signet (0.13.2) addressable (~> 2.3) faraday (>= 0.17.3, < 2.0) jwt (>= 1.5, < 3.0) @@ -180,8 +181,7 @@ PLATFORMS ruby DEPENDENCIES - aws-sdk-s3 - fastlane (= 2.141.0) + fastlane fastlane-plugin-android_change_package_identifier fastlane-plugin-android_change_string_app_name fastlane-plugin-find_replace_string diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 21c21dd70..cb643ab1b 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -1118,7 +1118,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 277; + CURRENT_PROJECT_VERSION = 278; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -1156,7 +1156,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 277; + CURRENT_PROJECT_VERSION = 278; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index 1dad6d5e3..9a3459390 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 277 + 278 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index debf8195d..ebc78340b 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.30.0 CFBundleVersion - 277 + 278 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index cd7d01387..8764a7088 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 277 + 278 diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist index d5524fe59..ac28315ba 100644 --- a/ios/NotificationService/Info.plist +++ b/ios/NotificationService/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.30.0 CFBundleVersion - 277 + 278 NSExtension NSExtensionPointIdentifier diff --git a/package-lock.json b/package-lock.json index 681a12c1a..fdf751449 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16519,8 +16519,8 @@ } }, "mattermost-redux": { - "version": "github:mattermost/mattermost-redux#21d68fc617f44cad43adc2f1d79169bf7245e3c0", - "from": "github:mattermost/mattermost-redux#21d68fc617f44cad43adc2f1d79169bf7245e3c0", + "version": "github:mattermost/mattermost-redux#5dc6ca1b655e10b312f97c3066803dedf5bde6c1", + "from": "github:mattermost/mattermost-redux#5dc6ca1b655e10b312f97c3066803dedf5bde6c1", "requires": { "core-js": "3.1.4", "form-data": "2.5.1", diff --git a/package.json b/package.json index 9d02e1bb9..c3f0d5dc2 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "fuse.js": "3.6.1", "intl": "1.2.5", "jail-monkey": "2.3.2", - "mattermost-redux": "github:mattermost/mattermost-redux#21d68fc617f44cad43adc2f1d79169bf7245e3c0", + "mattermost-redux": "github:mattermost/mattermost-redux#5dc6ca1b655e10b312f97c3066803dedf5bde6c1", "mime-db": "1.43.0", "moment-timezone": "0.5.28", "prop-types": "15.7.2",