Skip to content

[stable-3.34] Nmc/1927 License versioning #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: stable-3.34
Choose a base branch
from
Open

[stable-3.34] Nmc/1927 License versioning #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
16 changes: 7 additions & 9 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,10 @@ android {

defaultConfig {
applicationId = "com.nextcloud.client"
// 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
minSdk = 27
targetSdk = 35
compileSdk = 35
Expand All @@ -138,15 +142,9 @@ android {
testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}"
testInstrumentationRunnerArguments disableAnalytics: "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
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ org.gradle.daemon=true
org.gradle.configuration-cache=true

# Needed for local libs
# org.gradle.dependency.verification=lenient
# uncomment below line for NMC Customization so that build won't fail due to gradle dependency verification
org.gradle.dependency.verification=lenient