From f0bc18d5ca5d376c4cea076c0b8ad2add71d9309 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 2 Aug 2022 16:14:08 +0100 Subject: [PATCH] introducing vector-app module to act as the top level application --- settings.gradle | 1 + vector-app/build.gradle | 354 ++++++++++++++++++ {vector => vector-app}/proguard-rules.pro | 0 {vector => vector-app}/signature/README.md | 0 .../signature/debug.keystore | Bin .../signature/nightly.keystore | Bin .../src/gplay/AndroidManifest.xml | 0 .../src/gplay/debug/google-services.json | 0 .../src/gplay/nightly/google-services.json | 0 .../src/gplay/release/google-services.json | 0 vector-app/src/main/AndroidManifest.xml | 2 + .../java/im/vector/app/VectorApplication.kt | 4 +- .../im/vector/app/core/di/SingletonModule.kt | 4 +- vector/build.gradle | 272 ++------------ 14 files changed, 382 insertions(+), 255 deletions(-) create mode 100644 vector-app/build.gradle rename {vector => vector-app}/proguard-rules.pro (100%) rename {vector => vector-app}/signature/README.md (100%) rename {vector => vector-app}/signature/debug.keystore (100%) rename {vector => vector-app}/signature/nightly.keystore (100%) rename {vector => vector-app}/src/gplay/AndroidManifest.xml (100%) rename {vector => vector-app}/src/gplay/debug/google-services.json (100%) rename {vector => vector-app}/src/gplay/nightly/google-services.json (100%) rename {vector => vector-app}/src/gplay/release/google-services.json (100%) create mode 100644 vector-app/src/main/AndroidManifest.xml rename {vector => vector-app}/src/main/java/im/vector/app/VectorApplication.kt (99%) rename {vector => vector-app}/src/main/java/im/vector/app/core/di/SingletonModule.kt (98%) diff --git a/settings.gradle b/settings.gradle index 782d2caf4a..023d09e74a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':vector-app' include ':vector' include ':vector-config' include ':matrix-sdk-android' diff --git a/vector-app/build.gradle b/vector-app/build.gradle new file mode 100644 index 0000000000..5860cddbb3 --- /dev/null +++ b/vector-app/build.gradle @@ -0,0 +1,354 @@ +import com.android.build.OutputFile + +apply plugin: 'com.android.application' +apply plugin: 'com.google.firebase.appdistribution' +apply plugin: 'com.google.android.gms.oss-licenses-plugin' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-parcelize' +apply plugin: 'kotlin-kapt' +apply plugin: 'dagger.hilt.android.plugin' +apply plugin: 'kotlinx-knit' + +if (project.hasProperty("coverage")) { + apply plugin: 'jacoco' +} + +kapt { + correctErrorTypes = true +} + +knit { + files = fileTree(project.rootDir) { + include '**/*.md' + include '**/*.kt' + include '**/*.kts' + exclude '**/build/**' + exclude '**/.gradle/**' + exclude '**/towncrier/template.md' + exclude '**/CHANGES.md' + } +} + +// Note: 2 digits max for each value +ext.versionMajor = 1 +ext.versionMinor = 4 +// Note: even values are reserved for regular release, odd values for hotfix release. +// When creating a hotfix, you should decrease the value, since the current value +// is the value for the next regular release. +ext.versionPatch = 36 + +static def getGitTimestamp() { + def cmd = 'git show -s --format=%ct' + return cmd.execute().text.trim() as Long +} + +static def generateVersionCodeFromTimestamp() { + // It's unix timestamp, minus timestamp of October 3rd 2018 (first commit date) divided by 100: It's incremented by one every 100 seconds. + // plus 20_000_000 for compatibility reason with the previous way the Version Code was computed + // Note that the result will be multiplied by 10 when adding the digit for the arch + return ((getGitTimestamp() - 1_538_524_800) / 100).toInteger() + 20_000_000 +} + +def generateVersionCodeFromVersionName() { + // plus 4_000_000 for compatibility reason with the previous way the Version Code was computed + // Note that the result will be multiplied by 10 when adding the digit for the arch + return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000 +} + +def getVersionCode() { + if (gitBranchName() == "develop") { + return generateVersionCodeFromTimestamp() + } else { + return generateVersionCodeFromVersionName() + } +} + +static def gitRevision() { + def cmd = "git rev-parse --short=8 HEAD" + return cmd.execute().text.trim() +} + +static def gitRevisionDate() { + def cmd = "git show -s --format=%ci HEAD^{commit}" + return cmd.execute().text.trim() +} + +static def gitBranchName() { + def fromEnv = System.env.BUILDKITE_BRANCH as String ?: "" + + if (!fromEnv.isEmpty()) { + return fromEnv + } else { + // Note: this command return "HEAD" on Buildkite, so use the system env 'BUILDKITE_BRANCH' content first + def cmd = "git rev-parse --abbrev-ref HEAD" + return cmd.execute().text.trim() + } +} + +// For Google Play build, build on any other branch than main will have a "-dev" suffix +static def getGplayVersionSuffix() { + if (gitBranchName() == "main") { + return "" + } else { + return "-dev" + } +} + +static def gitTag() { + def cmd = "git describe --exact-match --tags" + return cmd.execute().text.trim() +} + +// For F-Droid build, build on a not tagged commit will have a "-dev" suffix +static def getFdroidVersionSuffix() { + if (gitTag() == "") { + return "-dev" + } else { + return "" + } +} + +project.android.buildTypes.all { buildType -> + buildType.javaCompileOptions.annotationProcessorOptions.arguments = + [ + validateEpoxyModelUsage: String.valueOf(buildType.name == 'debug') + ] +} + +// map for the version codes last digit +// x86 must have greater values than arm +// 64 bits have greater value than 32 bits +ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 } + +def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0 + +android { + // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use + // Ref: https://issuetracker.google.com/issues/144111441 + ndkVersion "21.3.6528147" + + compileSdk versions.compileSdk + + defaultConfig { + applicationId "im.vector.app" + // Set to API 21: see #405 + minSdk versions.minSdk + targetSdk versions.targetSdk + multiDexEnabled true + + renderscriptTargetApi 24 + renderscriptSupportModeEnabled true + + // `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode. + // Other branches (main, features, etc.) will have version code based on application version. + versionCode project.getVersionCode() + + // Required for sonar analysis + versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar" + + // Generate a random app task affinity + manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"] + + buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\"" + buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\"" + buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\"" + buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\"" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + // Keep abiFilter for the universalApk + ndk { + abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64' + } + + // Ref: https://developer.android.com/studio/build/configure-apk-splits.html + splits { + // Configures multiple APKs based on ABI. + abi { + // Enables building multiple APKs per ABI. + enable true + + // By default all ABIs are included, so use reset() and include to specify that we only + // want APKs for armeabi-v7a, x86, arm64-v8a and x86_64. + + // Resets the list of ABIs that Gradle should create APKs for to none. + reset() + + // Specifies a list of ABIs that Gradle should create APKs for. + include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" + + // Generate a universal APK that includes all ABIs, so user who install from CI tool can use this one by default. + universalApk true + } + } + + applicationVariants.all { variant -> + // assign different version code for each output + def baseVariantVersion = variant.versionCode * 10 + variant.outputs.each { output -> + def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI)) + // Known limitation: it does not modify the value in the BuildConfig.java generated file + // See https://issuetracker.google.com/issues/171133218 + output.versionCodeOverride = baseVariantVersion + baseAbiVersionCode + print "ABI " + output.getFilter(OutputFile.ABI) + " \t-> VersionCode = " + output.versionCodeOverride + "\n" + } + } + + // The following argument makes the Android Test Orchestrator run its + // "pm clear" command after each test invocation. This command ensures + // that the app's state is completely cleared between tests. + testInstrumentationRunnerArguments clearPackageData: 'true' + } + + testOptions { + // Disables animations during instrumented tests you run from the command line… + // This property does not affect tests that you run using Android Studio.” + animationsDisabled = true + + // Comment to run on Android 12 +// execution 'ANDROIDX_TEST_ORCHESTRATOR' + } + + signingConfigs { + debug { + keyAlias 'androiddebugkey' + keyPassword 'android' + storeFile file('./signature/debug.keystore') + storePassword 'android' + } + nightly { + keyAlias System.env.ELEMENT_ANDROID_NIGHTLY_KEYID ?: project.property("signing.element.nightly.keyId") + keyPassword System.env.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD ?: project.property("signing.element.nightly.keyPassword") + storeFile file('./signature/nightly.keystore') + storePassword System.env.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD ?: project.property("signing.element.nightly.storePassword") + } + release { + keyAlias project.property("signing.element.keyId") + keyPassword project.property("signing.element.keyPassword") + storeFile file(project.property("signing.element.storePath")) + storePassword project.property("signing.element.storePassword") + } + } + + buildTypes { + debug { + applicationIdSuffix ".debug" + resValue "string", "app_name", "Element dbg" + + signingConfig signingConfigs.debug + + if (project.hasProperty("coverage")) { + testCoverageEnabled = coverage.enableTestCoverage + } + } + + release { + resValue "string", "app_name", "Element" + postprocessing { + removeUnusedCode true + removeUnusedResources true + // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :) + obfuscate false + optimizeCode true + proguardFiles 'proguard-rules.pro' + } + // signingConfig signingConfigs.release + } + + nightly { + initWith release + applicationIdSuffix ".nightly" + versionNameSuffix "-nightly" + + // Just override the background color of the launcher icon for the nightly build. + resValue "color", "launcher_background", "#07007E" + + // We need to copy paste this block, this is not done automatically by `initWith release` + postprocessing { + removeUnusedCode true + removeUnusedResources true + // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :) + obfuscate false + optimizeCode true + proguardFiles 'proguard-rules.pro' + } + matchingFallbacks = ['release'] + signingConfig signingConfigs.nightly + firebaseAppDistribution { + artifactType = "APK" + // We upload the universal APK to fix this error: + // "App Distribution found more than 1 output file for this variant. + // Please contact firebase-support@google.com for help using APK splits with App Distribution." + artifactPath = "$rootDir/vector/build/outputs/apk/gplay/nightly/vector-gplay-universal-nightly.apk" + // This file will be generated by the GitHub action + releaseNotesFile = "CHANGES_NIGHTLY.md" + groups = "external-testers" + // This should not be required, but if I do not add the appId, I get this error: + // "App Distribution halted because it had a problem uploading the APK: [404] Requested entity was not found." + appId = "1:912726360885:android:efd8545af52a9f9300427c" + } + } + } + + flavorDimensions "store" + + productFlavors { + gplay { + apply plugin: 'com.google.gms.google-services' + afterEvaluate { + tasks.matching { it.name.contains("GoogleServices") && !it.name.contains("Gplay") }*.enabled = false + } + + dimension "store" + isDefault = true + versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}" + buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"" + buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"" + } + + fdroid { + dimension "store" + versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" + buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\"" + buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\"" + } + } + + lintOptions { + lintConfig file("lint.xml") + + checkDependencies true + abortOnError true + } + + compileOptions { + sourceCompatibility versions.sourceCompat + targetCompatibility versions.targetCompat + } + + kotlinOptions { + jvmTarget = "11" + freeCompilerArgs += [ + "-opt-in=kotlin.RequiresOptIn", + // Fixes false positive "This is an internal Mavericks API. It is not intended for external use." + // of MvRx `by viewModel()` calls. Maybe due to the inlining of code... This is a temporary fix... + "-opt-in=com.airbnb.mvrx.InternalMavericksApi", + // Opt in for kotlinx.coroutines.FlowPreview too + "-opt-in=kotlinx.coroutines.FlowPreview", + // Opt in for kotlinx.coroutines.ExperimentalCoroutinesApi too + "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", + ] + } + + buildFeatures { + viewBinding true + } +} + +dependencies { + implementation project(':vector') + implementation project(':vector-config') + implementation libs.dagger.hilt + implementation 'androidx.multidex:multidex:2.0.1' + kapt libs.dagger.hiltCompiler +} diff --git a/vector/proguard-rules.pro b/vector-app/proguard-rules.pro similarity index 100% rename from vector/proguard-rules.pro rename to vector-app/proguard-rules.pro diff --git a/vector/signature/README.md b/vector-app/signature/README.md similarity index 100% rename from vector/signature/README.md rename to vector-app/signature/README.md diff --git a/vector/signature/debug.keystore b/vector-app/signature/debug.keystore similarity index 100% rename from vector/signature/debug.keystore rename to vector-app/signature/debug.keystore diff --git a/vector/signature/nightly.keystore b/vector-app/signature/nightly.keystore similarity index 100% rename from vector/signature/nightly.keystore rename to vector-app/signature/nightly.keystore diff --git a/vector/src/gplay/AndroidManifest.xml b/vector-app/src/gplay/AndroidManifest.xml similarity index 100% rename from vector/src/gplay/AndroidManifest.xml rename to vector-app/src/gplay/AndroidManifest.xml diff --git a/vector/src/gplay/debug/google-services.json b/vector-app/src/gplay/debug/google-services.json similarity index 100% rename from vector/src/gplay/debug/google-services.json rename to vector-app/src/gplay/debug/google-services.json diff --git a/vector/src/gplay/nightly/google-services.json b/vector-app/src/gplay/nightly/google-services.json similarity index 100% rename from vector/src/gplay/nightly/google-services.json rename to vector-app/src/gplay/nightly/google-services.json diff --git a/vector/src/gplay/release/google-services.json b/vector-app/src/gplay/release/google-services.json similarity index 100% rename from vector/src/gplay/release/google-services.json rename to vector-app/src/gplay/release/google-services.json diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..33d4692546 --- /dev/null +++ b/vector-app/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/vector/src/main/java/im/vector/app/VectorApplication.kt b/vector-app/src/main/java/im/vector/app/VectorApplication.kt similarity index 99% rename from vector/src/main/java/im/vector/app/VectorApplication.kt rename to vector-app/src/main/java/im/vector/app/VectorApplication.kt index 46cb6ec79b..e68df3bbce 100644 --- a/vector/src/main/java/im/vector/app/VectorApplication.kt +++ b/vector-app/src/main/java/im/vector/app/VectorApplication.kt @@ -1,11 +1,11 @@ /* - * Copyright 2019 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt similarity index 98% rename from vector/src/main/java/im/vector/app/core/di/SingletonModule.kt rename to vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt index a060ebe731..431afab6ef 100644 --- a/vector/src/main/java/im/vector/app/core/di/SingletonModule.kt +++ b/vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt @@ -1,11 +1,11 @@ /* - * Copyright 2019 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/vector/build.gradle b/vector/build.gradle index d63fbf59e8..67372bd7ba 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -1,14 +1,8 @@ -import com.android.build.OutputFile - -apply plugin: 'com.android.application' -apply plugin: 'com.google.firebase.appdistribution' -apply plugin: 'com.google.android.gms.oss-licenses-plugin' +apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-parcelize' apply plugin: 'kotlin-kapt' -apply plugin: 'com.likethesalad.stem' apply plugin: 'dagger.hilt.android.plugin' -apply plugin: 'kotlinx-knit' if (project.hasProperty("coverage")) { apply plugin: 'jacoco' @@ -18,98 +12,6 @@ kapt { correctErrorTypes = true } -knit { - files = fileTree(project.rootDir) { - include '**/*.md' - include '**/*.kt' - include '**/*.kts' - exclude '**/build/**' - exclude '**/.gradle/**' - exclude '**/towncrier/template.md' - exclude '**/CHANGES.md' - exclude '/node_modules' - } -} - -// Note: 2 digits max for each value -ext.versionMajor = 1 -ext.versionMinor = 4 -// Note: even values are reserved for regular release, odd values for hotfix release. -// When creating a hotfix, you should decrease the value, since the current value -// is the value for the next regular release. -ext.versionPatch = 36 - -static def getGitTimestamp() { - def cmd = 'git show -s --format=%ct' - return cmd.execute().text.trim() as Long -} - -static def generateVersionCodeFromTimestamp() { - // It's unix timestamp, minus timestamp of October 3rd 2018 (first commit date) divided by 100: It's incremented by one every 100 seconds. - // plus 20_000_000 for compatibility reason with the previous way the Version Code was computed - // Note that the result will be multiplied by 10 when adding the digit for the arch - return ((getGitTimestamp() - 1_538_524_800) / 100).toInteger() + 20_000_000 -} - -def generateVersionCodeFromVersionName() { - // plus 4_000_000 for compatibility reason with the previous way the Version Code was computed - // Note that the result will be multiplied by 10 when adding the digit for the arch - return (versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch) + 4_000_000 -} - -def getVersionCode() { - if (gitBranchName() == "develop") { - return generateVersionCodeFromTimestamp() - } else { - return generateVersionCodeFromVersionName() - } -} - -static def gitRevision() { - def cmd = "git rev-parse --short=8 HEAD" - return cmd.execute().text.trim() -} - -static def gitRevisionDate() { - def cmd = "git show -s --format=%ci HEAD^{commit}" - return cmd.execute().text.trim() -} - -static def gitBranchName() { - def fromEnv = System.env.BUILDKITE_BRANCH as String ?: "" - - if (!fromEnv.isEmpty()) { - return fromEnv - } else { - // Note: this command return "HEAD" on Buildkite, so use the system env 'BUILDKITE_BRANCH' content first - def cmd = "git rev-parse --abbrev-ref HEAD" - return cmd.execute().text.trim() - } -} - -// For Google Play build, build on any other branch than main will have a "-dev" suffix -static def getGplayVersionSuffix() { - if (gitBranchName() == "main") { - return "" - } else { - return "-dev" - } -} - -static def gitTag() { - def cmd = "git describe --exact-match --tags" - return cmd.execute().text.trim() -} - -// For F-Droid build, build on a not tagged commit will have a "-dev" suffix -static def getFdroidVersionSuffix() { - if (gitTag() == "") { - return "-dev" - } else { - return "" - } -} - project.android.buildTypes.all { buildType -> buildType.javaCompileOptions.annotationProcessorOptions.arguments = [ @@ -117,13 +19,6 @@ project.android.buildTypes.all { buildType -> ] } -// map for the version codes last digit -// x86 must have greater values than arm -// 64 bits have greater value than 32 bits -ext.abiVersionCodes = ["armeabi-v7a": 1, "arm64-v8a": 2, "x86": 3, "x86_64": 4].withDefault { 0 } - -def buildNumber = System.env.BUILDKITE_BUILD_NUMBER as Integer ?: 0 - android { // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use // Ref: https://issuetracker.google.com/issues/144111441 @@ -132,29 +27,9 @@ android { compileSdk versions.compileSdk defaultConfig { - applicationId "im.vector.app" // Set to API 21: see #405 minSdk versions.minSdk targetSdk versions.targetSdk - multiDexEnabled true - - renderscriptTargetApi 24 - renderscriptSupportModeEnabled true - - // `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode. - // Other branches (main, features, etc.) will have version code based on application version. - versionCode project.getVersionCode() - - // Required for sonar analysis - versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar" - - // Generate a random app task affinity - manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"] - - buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\"" - buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\"" - buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\"" - buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\"" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -163,38 +38,6 @@ android { abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64' } - // Ref: https://developer.android.com/studio/build/configure-apk-splits.html - splits { - // Configures multiple APKs based on ABI. - abi { - // Enables building multiple APKs per ABI. - enable true - - // By default all ABIs are included, so use reset() and include to specify that we only - // want APKs for armeabi-v7a, x86, arm64-v8a and x86_64. - - // Resets the list of ABIs that Gradle should create APKs for to none. - reset() - - // Specifies a list of ABIs that Gradle should create APKs for. - include "armeabi-v7a", "x86", "arm64-v8a", "x86_64" - - // Generate a universal APK that includes all ABIs, so user who install from CI tool can use this one by default. - universalApk true - } - } - - applicationVariants.all { variant -> - // assign different version code for each output - def baseVariantVersion = variant.versionCode * 10 - variant.outputs.each { output -> - def baseAbiVersionCode = project.ext.abiVersionCodes.get(output.getFilter(OutputFile.ABI)) - // Known limitation: it does not modify the value in the BuildConfig.java generated file - // See https://issuetracker.google.com/issues/171133218 - output.versionCodeOverride = baseVariantVersion + baseAbiVersionCode - print "ABI " + output.getFilter(OutputFile.ABI) + " \t-> VersionCode = " + output.versionCodeOverride + "\n" - } - } // The following argument makes the Android Test Orchestrator run its // "pm clear" command after each test invocation. This command ensures @@ -210,102 +53,30 @@ android { // Comment to run on Android 12 // execution 'ANDROIDX_TEST_ORCHESTRATOR' } - signingConfigs { - debug { - keyAlias 'androiddebugkey' - keyPassword 'android' - storeFile file('./signature/debug.keystore') - storePassword 'android' - } - nightly { - keyAlias System.env.ELEMENT_ANDROID_NIGHTLY_KEYID ?: project.property("signing.element.nightly.keyId") - keyPassword System.env.ELEMENT_ANDROID_NIGHTLY_KEYPASSWORD ?: project.property("signing.element.nightly.keyPassword") - storeFile file('./signature/nightly.keystore') - storePassword System.env.ELEMENT_ANDROID_NIGHTLY_STOREPASSWORD ?: project.property("signing.element.nightly.storePassword") - } - release { - keyAlias project.property("signing.element.keyId") - keyPassword project.property("signing.element.keyPassword") - storeFile file(project.property("signing.element.storePath")) - storePassword project.property("signing.element.storePassword") - } - } - buildTypes { debug { - applicationIdSuffix ".debug" resValue "string", "app_name", "Element dbg" resValue "color", "launcher_background", "#0DBD8B" - - signingConfig signingConfigs.debug - if (project.hasProperty("coverage")) { testCoverageEnabled = coverage.enableTestCoverage } } - + nightly { + initWith release + } release { resValue "string", "app_name", "Element" resValue "color", "launcher_background", "#0DBD8B" - - postprocessing { - removeUnusedCode true - removeUnusedResources true - // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :) - obfuscate false - optimizeCode true - proguardFiles 'proguard-rules.pro' - } - // signingConfig signingConfigs.release } - nightly { - initWith release - applicationIdSuffix ".nightly" - versionNameSuffix "-nightly" - - // Just override the background color of the launcher icon for the nightly build. - resValue "color", "launcher_background", "#07007E" - - // We need to copy paste this block, this is not done automatically by `initWith release` - postprocessing { - removeUnusedCode true - removeUnusedResources true - // We do not activate obfuscation as it makes it hard then to read crash reports, and it's a bit useless on an open source project :) - obfuscate false - optimizeCode true - proguardFiles 'proguard-rules.pro' - } - matchingFallbacks = ['release'] - signingConfig signingConfigs.nightly - firebaseAppDistribution { - artifactType = "APK" - // We upload the universal APK to fix this error: - // "App Distribution found more than 1 output file for this variant. - // Please contact firebase-support@google.com for help using APK splits with App Distribution." - artifactPath = "$rootDir/vector/build/outputs/apk/gplay/nightly/vector-gplay-universal-nightly.apk" - // This file will be generated by the GitHub action - releaseNotesFile = "CHANGES_NIGHTLY.md" - groups = "external-testers" - // This should not be required, but if I do not add the appId, I get this error: - // "App Distribution halted because it had a problem uploading the APK: [404] Requested entity was not found." - appId = "1:912726360885:android:efd8545af52a9f9300427c" - } - } } flavorDimensions "store" productFlavors { gplay { - apply plugin: 'com.google.gms.google-services' - afterEvaluate { - tasks.matching { it.name.contains("GoogleServices") && !it.name.contains("Gplay") }*.enabled = false - } - dimension "store" isDefault = true - versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}" buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\"" buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\"" @@ -367,7 +138,7 @@ android { dependencies { implementation project(":vector-config") - implementation project(":matrix-sdk-android") + api project(":matrix-sdk-android") implementation project(":matrix-sdk-android-flow") implementation project(":library:jsonviewer") implementation project(":library:ui-styles") @@ -375,7 +146,6 @@ dependencies { implementation project(":library:attachment-viewer") implementation project(":library:diff-match-patch") implementation project(":library:multipicker") - implementation 'androidx.multidex:multidex:2.0.1' implementation libs.jetbrains.coroutinesCore implementation libs.jetbrains.coroutinesAndroid @@ -390,15 +160,15 @@ dependencies { implementation "androidx.transition:transition:1.4.1" implementation libs.androidx.biometric - implementation "org.threeten:threetenbp:1.4.0:no-tzdb" - implementation "com.gabrielittner.threetenbp:lazythreetenbp:0.11.0" + api "org.threeten:threetenbp:1.4.0:no-tzdb" + api "com.gabrielittner.threetenbp:lazythreetenbp:0.11.0" implementation libs.squareup.moshi kapt libs.squareup.moshiKotlin // Lifecycle implementation libs.androidx.lifecycleLivedata - implementation libs.androidx.lifecycleProcess + api libs.androidx.lifecycleProcess implementation libs.androidx.lifecycleRuntimeKtx implementation libs.androidx.datastorepreferences @@ -407,10 +177,10 @@ dependencies { implementation libs.element.opusencoder // Log - implementation libs.jakewharton.timber + api libs.jakewharton.timber // Debug - implementation 'com.facebook.stetho:stetho:1.6.0' + api 'com.facebook.stetho:stetho:1.6.0' // Phone number https://github.com/google/libphonenumber implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.54' @@ -419,11 +189,11 @@ dependencies { implementation libs.github.flowBinding implementation libs.github.flowBindingAppcompat - implementation libs.airbnb.epoxy + api libs.airbnb.epoxy implementation libs.airbnb.epoxyGlide kapt libs.airbnb.epoxyProcessor implementation libs.airbnb.epoxyPaging - implementation libs.airbnb.mavericks + api libs.airbnb.mavericks // Snap Helper https://github.com/rubensousa/GravitySnapHelper implementation 'com.github.rubensousa:gravitysnaphelper:2.2.2' @@ -435,7 +205,7 @@ dependencies { gplayImplementation libs.google.appdistribution // Work - implementation libs.androidx.work + api libs.androidx.work // Paging implementation libs.androidx.pagingRuntimeKtx @@ -444,7 +214,7 @@ dependencies { implementation libs.arrow.core // Pref - implementation libs.androidx.preferenceKtx + api libs.androidx.preferenceKtx // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' @@ -519,7 +289,7 @@ dependencies { implementation('com.facebook.react:react-native-webrtc:1.94.2-jitsi-10227332@aar') // Jitsi - implementation('org.jitsi.react:jitsi-meet-sdk:5.0.2') { + api('org.jitsi.react:jitsi-meet-sdk:5.0.2') { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' @@ -531,8 +301,8 @@ dependencies { implementation 'me.dm7.barcodescanner:zxing:1.9.13' // Emoji Keyboard - implementation libs.vanniktech.emojiMaterial - implementation libs.vanniktech.emojiGoogle + api libs.vanniktech.emojiMaterial + api libs.vanniktech.emojiGoogle implementation 'im.dlg:android-dialer:1.2.5' @@ -545,14 +315,14 @@ dependencies { implementation 'commons-codec:commons-codec:1.15' // MapTiler - fdroidImplementation(libs.maplibre.androidSdk) { + fdroidApi(libs.maplibre.androidSdk) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - fdroidImplementation(libs.maplibre.pluginAnnotation) { + fdroidApi(libs.maplibre.pluginAnnotation) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - gplayImplementation libs.maplibre.androidSdk - gplayImplementation libs.maplibre.pluginAnnotation + gplayApi libs.maplibre.androidSdk + gplayApi libs.maplibre.pluginAnnotation // TESTS testImplementation libs.tests.junit