Skip to content

Commit 4671dde

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 228057d commit 4671dde

File tree

3 files changed

+21
-15
lines changed

3 files changed

+21
-15
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
@@ -76,7 +76,7 @@ configurations.configureEach {
7676
}
7777

7878
// semantic versioning for version code
79-
def versionMajor = 3
79+
def versionMajor = 7
8080
def versionMinor = 30
8181
def versionPatch = 0
8282
def versionBuild = 0 // 0-50=Alpha / 51-98=RC / 90-99=stable
@@ -126,15 +126,9 @@ android {
126126

127127
multiDexEnabled true
128128

129-
versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
130-
131-
if (versionBuild > 89) {
132-
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
133-
} else if (versionBuild > 50) {
134-
versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50)
135-
} else {
136-
versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1)
137-
}
129+
//using short version number for more readability for NMC
130+
versionCode Integer.parseInt("${versionMajor}${versionMinor}${versionPatch}")
131+
versionName "${versionMajor}.${versionMinor}.${versionPatch}"
138132

139133
// adapt structure from Eclipse to Gradle/Android Studio expectations;
140134
// see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
@@ -171,15 +165,15 @@ android {
171165
versionDev {
172166
applicationId "com.nextcloud.android.beta"
173167
dimension "default"
174-
versionCode 20220322
175-
versionName "20220322"
168+
versionCode 71200129
169+
versionName "71200129"
176170
}
177171

178172
qa {
179173
applicationId "com.nextcloud.android.qa"
180174
dimension "default"
181-
versionCode 1
182-
versionName "1"
175+
versionCode 74
176+
versionName "1.74"
183177
}
184178
}
185179

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ org.gradle.parallel=true
2121
org.gradle.configureondemand=true
2222

2323
# Needed for local libs
24-
# org.gradle.dependency.verification=lenient
24+
# uncommented below line for NMC Customization so that build won't fail due to gradle dependency verification
25+
org.gradle.dependency.verification=lenient

0 commit comments

Comments
 (0)