License, Build version configuration and User agent updated for the f…

…ollowing branches: nmcfeat/1240-license-branding feature/NMCLOUD-703 feature/NMC-1904
nextmcloud · Apr 25, 2024 · 7f4b63f · 7f4b63f
1 parent f0e1e3b
commit 7f4b63f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,3 +1,14 @@
+Although the code for this android client is free and available under the GPL2 license, Deutsche Telekom
+(including T-Systems) fully reserves all rights to the Telekom brand. To prevent users from getting confused about
+the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
+even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
+replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.
+
+To help you identify the brand elements, see:
+    ./drawable: folder contains brand-design specific icons or images
+    Brand-protected Magenta colour definitions are (unfortunately) spread over the source code.
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -100,6 +100,10 @@ android {
 
 
     defaultConfig {
+        // NMC: to avoid merge conflicts, we do not change the original version settings.
+        // NMC: Instead, we override the local values with our own here and not touch the definition above.
+        versionMajor = 7
+        // NMC: end
         minSdkVersion 24
         targetSdkVersion 34
         compileSdk 34
@@ -126,15 +130,9 @@ android {
 
         multiDexEnabled true
 
-        versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
-
-        if (versionBuild > 89) {
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}"
-        } else if (versionBuild > 50) {
-            versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50)
-        } else {
-            versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1)
-        }
+        //using short version number for more readability for NMC
+        versionCode Integer.parseInt("${versionMajor}${versionMinor}${versionPatch}${versionBuild}")
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
 
         // adapt structure from Eclipse to Gradle/Android Studio expectations;
         // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
@@ -171,15 +169,15 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20220322
-                versionName "20220322"
+                versionCode 71200129
+                versionName "71200129"
             }
 
             qa {
                 applicationId "com.nextcloud.android.qa"
                 dimension "default"
-                versionCode 1
-                versionName "1"
+                versionCode 74
+                versionName "1.74"
             }
         }
 

diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,5 @@ org.gradle.parallel=true
 org.gradle.configureondemand=true
 
 # Needed for local libs
-# org.gradle.dependency.verification=lenient
+# uncommented below line for NMC Customization so that build won't fail due to gradle dependency verification
+org.gradle.dependency.verification=lenient