diff --git a/android/app/build.gradle b/android/app/build.gradle
index d4768cd8a..029be1fa5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -92,7 +92,7 @@ android {
minSdkVersion 16
targetSdkVersion 23
versionCode 41
- versionName "1.0.1"
+ versionName "1.1"
multiDexEnabled true
ndk {
abiFilters "armeabi-v7a", "x86"
diff --git a/assets/base/config.json b/assets/base/config.json
index ee04e2a5d..72164bbdc 100644
--- a/assets/base/config.json
+++ b/assets/base/config.json
@@ -3,5 +3,5 @@
"TestServerUrl": "http://localhost:8065",
"DefaultTheme": "default",
"ShowErrorsList": false,
- "MinServerVersion": "3.8.0"
+ "MinServerVersion": "3.10.0"
}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8af2ce3cb..a39dd1641 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -1,4 +1,4 @@
-fastlane_version '2.29.1'
+fastlane_version '2.47.0'
skip_docs
platform :ios do
@@ -153,9 +153,10 @@ platform :ios do
end
if options[:increment_build]
+ current_build_number = get_build_number(xcodeproj: './ios/Mattermost.xcodeproj').to_i
increment_build_number(
xcodeproj: './ios/Mattermost.xcodeproj',
- build_number: latest_testflight_build_number + 1
+ build_number: current_build_number + 1
)
commit_version_bump(xcodeproj: './ios/Mattermost.xcodeproj')
end
diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock
index 35c20482e..0b2c4150d 100644
--- a/fastlane/Gemfile.lock
+++ b/fastlane/Gemfile.lock
@@ -91,13 +91,13 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_magick (4.5.1)
- mini_portile (0.6.2)
+ mini_portile2 (2.2.0)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nanaimo (0.2.3)
- nokogiri (1.6.6.2)
- mini_portile (~> 0.6.0)
+ nokogiri (1.8.0)
+ mini_portile2 (~> 2.2.0)
os (0.9.6)
plist (3.3.0)
public_suffix (2.0.5)
diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist
index c60457981..8aeac5f09 100644
--- a/ios/Mattermost/Info.plist
+++ b/ios/Mattermost/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.0.1
+ 1.1
CFBundleSignature
????
CFBundleVersion
diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist
index 53c535fbe..90561f676 100644
--- a/ios/MattermostTests/Info.plist
+++ b/ios/MattermostTests/Info.plist
@@ -15,7 +15,7 @@
CFBundlePackageType
BNDL
CFBundleShortVersionString
- 1.0.1
+ 1.1
CFBundleSignature
????
CFBundleVersion