diff --git a/LICENSE.txt b/LICENSE.txt index 4fc88098775c..74f1504175fd 100644 --- 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.kts b/app/build.gradle.kts index c822052f1d13..e5b5c0606001 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -72,6 +72,12 @@ configurations.configureEach { } } +// NMC: semantic versioning for version code +val versionMajor = 10 +val versionMinor = 1 +val versionPatch = 0 +val versionBuild = 90 + val ndkEnv = buildMap { file("${project.rootDir}/ndk.env").readLines().forEach { val (key, value) = it.split("=") @@ -109,10 +115,6 @@ android { minSdk = 28 compileSdk = 37 targetSdk = 36 - // mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable) - // xx .xxx .xx .xx - versionCode = 350010050 - versionName = "35.1.0 Alpha 51" buildConfigField("boolean", "CI", ciBuild.toString()) buildConfigField("boolean", "RUNTIME_PERF_ANALYSIS", perfAnalysis.toString()) @@ -121,6 +123,10 @@ android { testInstrumentationRunner = if (shotTest) "com.karumi.shot.ShotTestRunner" else "com.nextcloud.client.TestRunner" + versionCode = versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild + // NMC: using short version name + 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 diff --git a/gradle.properties b/gradle.properties index 91f3dedc1c10..41c1ccfbe4ee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,8 @@ org.gradle.configuration-cache=true org.gradle.workers.max=4 # Needed for local libs -# org.gradle.dependency.verification=off +# uncomment below line for NMC Customization so that build won't fail due to gradle dependency verification +org.gradle.dependency.verification=off # systemProp.org.gradle.internal.publish.checksums.insecure=true # Enabled parallel sync for Gradle 9.4+