Merge pull request #2151 from owncloud/2.7.0_beta_v1

Release 2.7.0 beta v1

Author: davigonz

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 2.7.0 beta v1 (March 2018)
+- Fingerprint lock
+- Pattern lock (contribution)
+- Upload picture directly from camera (contribution)
+- GIF support
+- New features wizard
+- UI improvements, including:
+  + Display file size during upload (contribution)
+- Bug fixes, including:
+  + Hide always visible notification in Android 8
+
 ## 2.6.0 (February 2018)
 - Camera uploads, replacing instant uploads (Android 5 or higher required)
 - Android 8 support

beta/res/mipmap-hdpi/icon.png

@@ -100,8 +100,8 @@ android {
 
     defaultConfig {
 
-        manifestPlaceholders.versionCode = "20600000"
-        manifestPlaceholders.versionName = "2.6.0"
+        manifestPlaceholders.versionCode = "20600100"
+        manifestPlaceholders.versionName = "2.7.0-beta.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -135,10 +135,6 @@ android {
             assets.srcDirs = ['assets']
         }
 
-        beta {
-            res.srcDirs = ['beta/res']
-        }
-
         // move whole local unit tests structure as a whole from src/test/* to test/*
         test.setRoot('test')
 
@@ -181,14 +177,6 @@ android {
                 keyPassword System.env.OC_RELEASE_KEY_PASSWORD
             }
         }
-        beta {
-            if (System.env.OC_BETA_KEYSTORE) {
-                storeFile file(System.env.OC_BETA_KEYSTORE)  // use an absolute path
-                storePassword System.env.OC_BETA_KEYSTORE_PASSWORD
-                keyAlias System.env.OC_BETA_KEY_ALIAS
-                keyPassword System.env.OC_BETA_KEY_PASSWORD
-            }
-        }
     }
 
     buildTypes {
@@ -202,16 +190,6 @@ android {
         debug {
             applicationIdSuffix ".debug"
         }
-
-        beta {
-            manifestPlaceholders.versionCode = "20500001"
-            manifestPlaceholders.versionName = "2.5.1-beta.1"
-            applicationIdSuffix ".beta"
-
-            if (System.env.OC_BETA_KEYSTORE) {
-                signingConfig signingConfigs.beta
-            }
-        }
     }
 
     applicationVariants.all { variant ->