Skip to content

Commit da2a0a0

Browse files
committed
License, Build version configuration and User agent updated for the following branches:
nmcfeat/1240-license-branding feature/NMCLOUD-703 feature/NMC-1904
1 parent f59caa7 commit da2a0a0

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

LICENSE.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
Although the code for this android client is free and available under the GPL2 license, Deutsche Telekom
2+
(including T-Systems) fully reserves all rights to the Telekom brand. To prevent users from getting confused about
3+
the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
4+
even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
5+
replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.
6+
7+
To help you identify the brand elements, see:
8+
./drawable: folder contains brand-design specific icons or images
9+
Brand-protected Magenta colour definitions are (unfortunately) spread over the source code.
10+
11+
112
GNU GENERAL PUBLIC LICENSE
213
Version 2, June 1991
314

app/build.gradle

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ configurations.configureEach {
6161
}
6262

6363
// semantic versioning for version code
64-
def versionMajor = 3
64+
def versionMajor = 7
6565
def versionMinor = 29
6666
def versionPatch = 0
6767
def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
@@ -107,15 +107,9 @@ android {
107107

108108
multiDexEnabled true
109109

110-
versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
111-
112-
if (versionBuild > 89) {
113-
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
114-
} else if (versionBuild > 50) {
115-
versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50)
116-
} else {
117-
versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1)
118-
}
110+
//using short version number for more readability for NMC
111+
versionCode Integer.parseInt("${versionMajor}${versionMinor}${versionPatch}")
112+
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
119113

120114
// adapt structure from Eclipse to Gradle/Android Studio expectations;
121115
// see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
@@ -152,15 +146,15 @@ android {
152146
versionDev {
153147
applicationId "com.nextcloud.android.beta"
154148
dimension "default"
155-
versionCode 20220322
156-
versionName "20220322"
149+
versionCode 71200129
150+
versionName "71200129"
157151
}
158152

159153
qa {
160154
applicationId "com.nextcloud.android.qa"
161155
dimension "default"
162-
versionCode 1
163-
versionName "1"
156+
versionCode 74
157+
versionName "1.74"
164158
}
165159
}
166160

0 commit comments

Comments
 (0)