From b72a174edf29e636908076dad459a6c024fa74c0 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 14:33:02 +0100 Subject: [PATCH 01/15] lifting nightly to the application module --- vector-app/build.gradle | 4 ++++ {vector => vector-app}/src/nightly/res/xml/shortcuts.xml | 0 vector/build.gradle | 8 -------- 3 files changed, 4 insertions(+), 8 deletions(-) rename {vector => vector-app}/src/nightly/res/xml/shortcuts.xml (100%) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 235c92cfc5..5f039dfbd5 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -340,6 +340,10 @@ android { "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi", ] } + + buildFeatures { + viewBinding true + } } dependencies { diff --git a/vector/src/nightly/res/xml/shortcuts.xml b/vector-app/src/nightly/res/xml/shortcuts.xml similarity index 100% rename from vector/src/nightly/res/xml/shortcuts.xml rename to vector-app/src/nightly/res/xml/shortcuts.xml diff --git a/vector/build.gradle b/vector/build.gradle index a5538053fc..0e9e03f31a 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -66,10 +66,6 @@ android { testCoverageEnabled = coverage.enableTestCoverage } } - nightly { - initWith release - matchingFallbacks = ['release'] - } release } @@ -111,10 +107,6 @@ android { test { java.srcDirs += "src/sharedTest/java" } - // Add sourceSets for `release` version when building `nightly` - nightly { - java.srcDirs += "src/release/java" - } } buildFeatures { From a947a53e14292ca59cdad2730e1645da2f4ff1dd Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 14:42:16 +0100 Subject: [PATCH 02/15] lifting the release build type to the application module --- .../src/release/java/im/vector/app/core/di/DebugModule.kt | 0 .../src/release/java/im/vector/app/core/di/FeaturesModule.kt | 0 .../src/release/java/im/vector/app/receivers/DebugReceiver.kt | 0 {vector => vector-app}/src/release/res/xml/shortcuts.xml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename {vector => vector-app}/src/release/java/im/vector/app/core/di/DebugModule.kt (100%) rename {vector => vector-app}/src/release/java/im/vector/app/core/di/FeaturesModule.kt (100%) rename {vector => vector-app}/src/release/java/im/vector/app/receivers/DebugReceiver.kt (100%) rename {vector => vector-app}/src/release/res/xml/shortcuts.xml (100%) diff --git a/vector/src/release/java/im/vector/app/core/di/DebugModule.kt b/vector-app/src/release/java/im/vector/app/core/di/DebugModule.kt similarity index 100% rename from vector/src/release/java/im/vector/app/core/di/DebugModule.kt rename to vector-app/src/release/java/im/vector/app/core/di/DebugModule.kt diff --git a/vector/src/release/java/im/vector/app/core/di/FeaturesModule.kt b/vector-app/src/release/java/im/vector/app/core/di/FeaturesModule.kt similarity index 100% rename from vector/src/release/java/im/vector/app/core/di/FeaturesModule.kt rename to vector-app/src/release/java/im/vector/app/core/di/FeaturesModule.kt diff --git a/vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt b/vector-app/src/release/java/im/vector/app/receivers/DebugReceiver.kt similarity index 100% rename from vector/src/release/java/im/vector/app/receivers/DebugReceiver.kt rename to vector-app/src/release/java/im/vector/app/receivers/DebugReceiver.kt diff --git a/vector/src/release/res/xml/shortcuts.xml b/vector-app/src/release/res/xml/shortcuts.xml similarity index 100% rename from vector/src/release/res/xml/shortcuts.xml rename to vector-app/src/release/res/xml/shortcuts.xml From 5d533d4ec9f0d445e07c2aaa3642f0e796b0b150 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 14:45:40 +0100 Subject: [PATCH 03/15] lifting debug build type to the application module --- vector-app/build.gradle | 11 +++++++++++ .../src/debug/AndroidManifest.xml | 0 .../app/features/debug/DebugMenuActivity.kt | 0 .../features/debug/DebugPermissionActivity.kt | 0 .../app/features/debug/TestLinkifyActivity.kt | 0 .../debug/analytics/DebugAnalyticsActivity.kt | 0 .../debug/analytics/DebugAnalyticsFragment.kt | 0 .../debug/analytics/DebugAnalyticsViewActions.kt | 0 .../debug/analytics/DebugAnalyticsViewModel.kt | 0 .../debug/analytics/DebugAnalyticsViewState.kt | 0 .../vector/app/features/debug/di/DebugModule.kt | 0 .../app/features/debug/di/FeaturesModule.kt | 0 .../debug/di/MavericksViewModelDebugModule.kt | 0 .../debug/features/BooleanFeatureItem.kt | 0 .../features/DebugFeaturesSettingsActivity.kt | 0 .../debug/features/DebugFeaturesStateFactory.kt | 0 .../debug/features/DebugVectorFeatures.kt | 0 .../debug/features/DebugVectorOverrides.kt | 0 .../features/debug/features/EnumFeatureItem.kt | 0 .../debug/features/FeaturesController.kt | 0 .../debug/leak/DebugMemoryLeaksActivity.kt | 0 .../debug/leak/DebugMemoryLeaksFragment.kt | 1 + .../debug/leak/DebugMemoryLeaksViewActions.kt | 0 .../debug/leak/DebugMemoryLeaksViewModel.kt | 2 +- .../debug/leak/DebugMemoryLeaksViewState.kt | 0 .../features/debug/sas/DebugSasEmojiActivity.kt | 0 .../app/features/debug/sas/SasEmojiController.kt | 0 .../app/features/debug/sas/SasEmojiItem.kt | 0 .../settings/DebugPrivateSettingsActivity.kt | 0 .../settings/DebugPrivateSettingsFragment.kt | 0 .../settings/DebugPrivateSettingsViewActions.kt | 0 .../settings/DebugPrivateSettingsViewModel.kt | 0 .../settings/DebugPrivateSettingsViewState.kt | 0 .../debug/settings/OverrideDropdownView.kt | 0 .../debug/settings/PrivateSettingOverrides.kt | 0 .../im/vector/app/flipper/VectorFlipperProxy.kt | 0 .../app/leakcanary/LeakCanaryLeakDetector.kt | 0 .../vector/app/receivers/VectorDebugReceiver.kt | 0 .../src/debug/res/layout/activity_debug_menu.xml | 0 .../res/layout/activity_debug_permission.xml | 0 .../debug/res/layout/activity_test_linkify.xml | 0 .../src/debug/res/layout/demo_theme_sample.xml | 0 .../src/debug/res/layout/demo_themes.xml | 0 .../res/layout/fragment_debug_analytics.xml | 0 .../res/layout/fragment_debug_memory_leaks.xml | 0 .../layout/fragment_debug_private_settings.xml | 0 .../src/debug/res/layout/item_feature.xml | 0 .../src/debug/res/layout/item_sas_emoji.xml | 0 .../src/debug/res/layout/item_test_linkify.xml | 0 .../debug/res/layout/view_boolean_dropdown.xml | 0 .../src/debug/res/values/strings.xml | 0 .../src/debug/res/xml/shortcuts.xml | 0 vector/build.gradle | 16 +--------------- 53 files changed, 14 insertions(+), 16 deletions(-) rename {vector => vector-app}/src/debug/AndroidManifest.xml (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt (96%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt (98%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt (100%) rename {vector => vector-app}/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt (100%) rename {vector => vector-app}/src/debug/res/layout/activity_debug_menu.xml (100%) rename {vector => vector-app}/src/debug/res/layout/activity_debug_permission.xml (100%) rename {vector => vector-app}/src/debug/res/layout/activity_test_linkify.xml (100%) rename {vector => vector-app}/src/debug/res/layout/demo_theme_sample.xml (100%) rename {vector => vector-app}/src/debug/res/layout/demo_themes.xml (100%) rename {vector => vector-app}/src/debug/res/layout/fragment_debug_analytics.xml (100%) rename {vector => vector-app}/src/debug/res/layout/fragment_debug_memory_leaks.xml (100%) rename {vector => vector-app}/src/debug/res/layout/fragment_debug_private_settings.xml (100%) rename {vector => vector-app}/src/debug/res/layout/item_feature.xml (100%) rename {vector => vector-app}/src/debug/res/layout/item_sas_emoji.xml (100%) rename {vector => vector-app}/src/debug/res/layout/item_test_linkify.xml (100%) rename {vector => vector-app}/src/debug/res/layout/view_boolean_dropdown.xml (100%) rename {vector => vector-app}/src/debug/res/values/strings.xml (100%) rename {vector => vector-app}/src/debug/res/xml/shortcuts.xml (100%) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 5f039dfbd5..783f8e0a4a 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -353,6 +353,16 @@ dependencies { implementation 'androidx.multidex:multidex:2.0.1' implementation "androidx.sharetarget:sharetarget:1.1.0" + // Flipper, debug builds only + debugImplementation(libs.flipper.flipper) { + exclude group: 'com.facebook.fbjni', module: 'fbjni' + } + debugImplementation(libs.flipper.flipperNetworkPlugin) { + exclude group: 'com.facebook.fbjni', module: 'fbjni' + } + debugImplementation 'com.facebook.soloader:soloader:0.10.4' + debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" + kapt libs.dagger.hiltCompiler androidTestImplementation libs.androidx.testCore @@ -378,5 +388,6 @@ dependencies { androidTestImplementation libs.androidx.fragmentTesting androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10" debugImplementation libs.androidx.fragmentTesting + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' } diff --git a/vector/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml similarity index 100% rename from vector/src/debug/AndroidManifest.xml rename to vector-app/src/debug/AndroidManifest.xml diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugMenuActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/DebugPermissionActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsFragment.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewActions.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewModel.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/analytics/DebugAnalyticsViewState.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/di/DebugModule.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/di/FeaturesModule.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt b/vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/di/MavericksViewModelDebugModule.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesSettingsActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugFeaturesStateFactory.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorFeatures.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/features/FeaturesController.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt similarity index 96% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt index 2abf6487e2..d62dc5dc4d 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt @@ -26,6 +26,7 @@ import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.epoxy.onClick import im.vector.app.core.platform.VectorBaseFragment import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding +import im.vector.application.databinding.FragmentDebugMemoryLeaksBinding @AndroidEntryPoint class DebugMemoryLeaksFragment : diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewActions.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt similarity index 98% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt index 5432cb0888..26eb1c1025 100644 --- a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewModel.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 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. diff --git a/vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksViewState.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/DebugSasEmojiActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiController.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsActivity.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewActions.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewModel.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsViewState.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt diff --git a/vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt rename to vector-app/src/debug/java/im/vector/app/features/debug/settings/PrivateSettingOverrides.kt diff --git a/vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt b/vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt rename to vector-app/src/debug/java/im/vector/app/flipper/VectorFlipperProxy.kt diff --git a/vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt b/vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt rename to vector-app/src/debug/java/im/vector/app/leakcanary/LeakCanaryLeakDetector.kt diff --git a/vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt b/vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt similarity index 100% rename from vector/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt rename to vector-app/src/debug/java/im/vector/app/receivers/VectorDebugReceiver.kt diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector-app/src/debug/res/layout/activity_debug_menu.xml similarity index 100% rename from vector/src/debug/res/layout/activity_debug_menu.xml rename to vector-app/src/debug/res/layout/activity_debug_menu.xml diff --git a/vector/src/debug/res/layout/activity_debug_permission.xml b/vector-app/src/debug/res/layout/activity_debug_permission.xml similarity index 100% rename from vector/src/debug/res/layout/activity_debug_permission.xml rename to vector-app/src/debug/res/layout/activity_debug_permission.xml diff --git a/vector/src/debug/res/layout/activity_test_linkify.xml b/vector-app/src/debug/res/layout/activity_test_linkify.xml similarity index 100% rename from vector/src/debug/res/layout/activity_test_linkify.xml rename to vector-app/src/debug/res/layout/activity_test_linkify.xml diff --git a/vector/src/debug/res/layout/demo_theme_sample.xml b/vector-app/src/debug/res/layout/demo_theme_sample.xml similarity index 100% rename from vector/src/debug/res/layout/demo_theme_sample.xml rename to vector-app/src/debug/res/layout/demo_theme_sample.xml diff --git a/vector/src/debug/res/layout/demo_themes.xml b/vector-app/src/debug/res/layout/demo_themes.xml similarity index 100% rename from vector/src/debug/res/layout/demo_themes.xml rename to vector-app/src/debug/res/layout/demo_themes.xml diff --git a/vector/src/debug/res/layout/fragment_debug_analytics.xml b/vector-app/src/debug/res/layout/fragment_debug_analytics.xml similarity index 100% rename from vector/src/debug/res/layout/fragment_debug_analytics.xml rename to vector-app/src/debug/res/layout/fragment_debug_analytics.xml diff --git a/vector/src/debug/res/layout/fragment_debug_memory_leaks.xml b/vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml similarity index 100% rename from vector/src/debug/res/layout/fragment_debug_memory_leaks.xml rename to vector-app/src/debug/res/layout/fragment_debug_memory_leaks.xml diff --git a/vector/src/debug/res/layout/fragment_debug_private_settings.xml b/vector-app/src/debug/res/layout/fragment_debug_private_settings.xml similarity index 100% rename from vector/src/debug/res/layout/fragment_debug_private_settings.xml rename to vector-app/src/debug/res/layout/fragment_debug_private_settings.xml diff --git a/vector/src/debug/res/layout/item_feature.xml b/vector-app/src/debug/res/layout/item_feature.xml similarity index 100% rename from vector/src/debug/res/layout/item_feature.xml rename to vector-app/src/debug/res/layout/item_feature.xml diff --git a/vector/src/debug/res/layout/item_sas_emoji.xml b/vector-app/src/debug/res/layout/item_sas_emoji.xml similarity index 100% rename from vector/src/debug/res/layout/item_sas_emoji.xml rename to vector-app/src/debug/res/layout/item_sas_emoji.xml diff --git a/vector/src/debug/res/layout/item_test_linkify.xml b/vector-app/src/debug/res/layout/item_test_linkify.xml similarity index 100% rename from vector/src/debug/res/layout/item_test_linkify.xml rename to vector-app/src/debug/res/layout/item_test_linkify.xml diff --git a/vector/src/debug/res/layout/view_boolean_dropdown.xml b/vector-app/src/debug/res/layout/view_boolean_dropdown.xml similarity index 100% rename from vector/src/debug/res/layout/view_boolean_dropdown.xml rename to vector-app/src/debug/res/layout/view_boolean_dropdown.xml diff --git a/vector/src/debug/res/values/strings.xml b/vector-app/src/debug/res/values/strings.xml similarity index 100% rename from vector/src/debug/res/values/strings.xml rename to vector-app/src/debug/res/values/strings.xml diff --git a/vector/src/debug/res/xml/shortcuts.xml b/vector-app/src/debug/res/xml/shortcuts.xml similarity index 100% rename from vector/src/debug/res/xml/shortcuts.xml rename to vector-app/src/debug/res/xml/shortcuts.xml diff --git a/vector/build.gradle b/vector/build.gradle index 0e9e03f31a..b84f9f96d1 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -66,7 +66,6 @@ android { testCoverageEnabled = coverage.enableTestCoverage } } - release } flavorDimensions "store" @@ -311,20 +310,7 @@ dependencies { testImplementation(libs.jetbrains.coroutinesTest) { exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" } - - // Flipper, debug builds only - debugImplementation(libs.flipper.flipper) { - exclude group: 'com.facebook.fbjni', module: 'fbjni' - } - debugImplementation(libs.flipper.flipperNetworkPlugin) { - exclude group: 'com.facebook.fbjni', module: 'fbjni' - } - debugImplementation 'com.facebook.soloader:soloader:0.10.4' - debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" - - // Activate when you want to check for leaks, from time to time. - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1' - + androidTestImplementation libs.androidx.testCore androidTestImplementation libs.androidx.testRunner androidTestImplementation libs.androidx.testRules From 373a0ca4fb8358e1c3dc29a84070795fe5376bf8 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 14:55:53 +0100 Subject: [PATCH 04/15] split commit to make debug changes to avoid files being seen as new! --- vector-app/build.gradle | 2 ++ vector-app/src/debug/AndroidManifest.xml | 19 +++++++++---------- .../app/features/debug/DebugMenuActivity.kt | 2 +- .../features/debug/DebugPermissionActivity.kt | 4 ++-- .../app/features/debug/TestLinkifyActivity.kt | 6 +++--- .../debug/analytics/DebugAnalyticsFragment.kt | 2 +- .../debug/features/BooleanFeatureItem.kt | 6 +++--- .../debug/features/DebugVectorOverrides.kt | 8 ++++---- .../debug/features/EnumFeatureItem.kt | 6 +++--- .../debug/leak/DebugMemoryLeaksFragment.kt | 1 - .../app/features/debug/sas/SasEmojiItem.kt | 2 +- .../settings/DebugPrivateSettingsFragment.kt | 2 +- .../debug/settings/OverrideDropdownView.kt | 2 +- vector/build.gradle | 2 +- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 783f8e0a4a..ea321c9e83 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -349,6 +349,7 @@ android { dependencies { implementation project(':vector') implementation project(':vector-config') + debugImplementation project(':library:ui-styles') implementation libs.dagger.hilt implementation 'androidx.multidex:multidex:2.0.1' implementation "androidx.sharetarget:sharetarget:1.1.0" @@ -364,6 +365,7 @@ dependencies { debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" kapt libs.dagger.hiltCompiler + kapt libs.airbnb.epoxyProcessor androidTestImplementation libs.androidx.testCore androidTestImplementation libs.androidx.testRunner diff --git a/vector-app/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml index 94fdb1b389..3860a37319 100644 --- a/vector-app/src/debug/AndroidManifest.xml +++ b/vector-app/src/debug/AndroidManifest.xml @@ -1,16 +1,15 @@ - + - - - - - - - - + + + + + + + + () { diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt index 1e9b88c048..38765bfa9b 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/BooleanFeatureItem.kt @@ -23,9 +23,9 @@ import android.widget.Spinner import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.application.R @EpoxyModelClass abstract class BooleanFeatureItem : VectorEpoxyModel(R.layout.item_feature) { @@ -70,8 +70,8 @@ abstract class BooleanFeatureItem : VectorEpoxyModel( } class Holder : VectorEpoxyHolder() { - val label by bind(im.vector.app.R.id.feature_label) - val optionsSpinner by bind(im.vector.app.R.id.feature_options) + val label by bind(R.id.feature_label) + val optionsSpinner by bind(R.id.feature_options) } interface Listener { diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt index 5e16182f3c..57138b9a47 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/DebugVectorOverrides.kt @@ -66,13 +66,13 @@ class DebugVectorOverrides(private val context: Context) : VectorOverrides { suspend fun setHomeserverCapabilities(block: HomeserverCapabilitiesOverride.() -> HomeserverCapabilitiesOverride) { val capabilitiesOverride = block(forceHomeserverCapabilities.firstOrNull() ?: HomeserverCapabilitiesOverride(null, null)) context.dataStore.edit { settings -> - when (capabilitiesOverride.canChangeDisplayName) { + when (val canChangeDisplayName = capabilitiesOverride.canChangeDisplayName) { null -> settings.remove(forceCanChangeDisplayName) - else -> settings[forceCanChangeDisplayName] = capabilitiesOverride.canChangeDisplayName + else -> settings[forceCanChangeDisplayName] = canChangeDisplayName } - when (capabilitiesOverride.canChangeAvatar) { + when (val canChangeAvatar = capabilitiesOverride.canChangeAvatar) { null -> settings.remove(forceCanChangeAvatar) - else -> settings[forceCanChangeAvatar] = capabilitiesOverride.canChangeAvatar + else -> settings[forceCanChangeAvatar] = canChangeAvatar } } } diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt index 5231e591da..00f74515cc 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/features/EnumFeatureItem.kt @@ -23,9 +23,9 @@ import android.widget.Spinner import android.widget.TextView import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.application.R @EpoxyModelClass abstract class EnumFeatureItem : VectorEpoxyModel(R.layout.item_feature) { @@ -70,8 +70,8 @@ abstract class EnumFeatureItem : VectorEpoxyModel(R.layo } class Holder : VectorEpoxyHolder() { - val label by bind(im.vector.app.R.id.feature_label) - val optionsSpinner by bind(im.vector.app.R.id.feature_options) + val label by bind(R.id.feature_label) + val optionsSpinner by bind(R.id.feature_options) } interface Listener { diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt index d62dc5dc4d..e9afa9aea9 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/leak/DebugMemoryLeaksFragment.kt @@ -25,7 +25,6 @@ import com.airbnb.mvrx.withState import dagger.hilt.android.AndroidEntryPoint import im.vector.app.core.epoxy.onClick import im.vector.app.core.platform.VectorBaseFragment -import im.vector.app.databinding.FragmentDebugMemoryLeaksBinding import im.vector.application.databinding.FragmentDebugMemoryLeaksBinding @AndroidEntryPoint diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt index 179ee35693..bbc438e4b2 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/sas/SasEmojiItem.kt @@ -21,9 +21,9 @@ import android.widget.TextView import androidx.core.content.ContextCompat import com.airbnb.epoxy.EpoxyAttribute import com.airbnb.epoxy.EpoxyModelClass -import im.vector.app.R import im.vector.app.core.epoxy.VectorEpoxyHolder import im.vector.app.core.epoxy.VectorEpoxyModel +import im.vector.application.R import me.gujun.android.span.image import me.gujun.android.span.span import org.matrix.android.sdk.api.session.crypto.verification.EmojiRepresentation diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt index be3d41e0e1..020c228521 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/DebugPrivateSettingsFragment.kt @@ -25,8 +25,8 @@ import android.view.ViewGroup import com.airbnb.mvrx.fragmentViewModel import com.airbnb.mvrx.withState import im.vector.app.core.platform.VectorBaseFragment -import im.vector.app.databinding.FragmentDebugPrivateSettingsBinding import im.vector.app.features.home.room.list.home.release.ReleaseNotesActivity +import im.vector.application.databinding.FragmentDebugPrivateSettingsBinding class DebugPrivateSettingsFragment : VectorBaseFragment() { diff --git a/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt index 7f510ee5e9..2800b7bd8d 100644 --- a/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt +++ b/vector-app/src/debug/java/im/vector/app/features/debug/settings/OverrideDropdownView.kt @@ -24,7 +24,7 @@ import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter import android.widget.LinearLayout -import im.vector.app.databinding.ViewBooleanDropdownBinding +import im.vector.application.databinding.ViewBooleanDropdownBinding class OverrideDropdownView @JvmOverloads constructor( context: Context, diff --git a/vector/build.gradle b/vector/build.gradle index b84f9f96d1..3b802c8316 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -195,7 +195,7 @@ dependencies { // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation libs.google.material - implementation 'me.gujun.android:span:1.7' + api 'me.gujun.android:span:1.7' implementation libs.markwon.core implementation libs.markwon.extLatex implementation libs.markwon.inlineParser From 3a38898961f9e3b3499d47bb3c97322a2d725729 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 15:00:46 +0100 Subject: [PATCH 05/15] lifting fdroid and gplay variants to the application module --- vector-app/build.gradle | 16 +++++++++ .../src/fdroid/AndroidManifest.xml | 0 .../java/im/vector/app/di/FlavorModule.kt | 0 .../vector/app/di/NotificationTestModule.kt | 0 .../app/fdroid/BackgroundSyncStarter.kt | 0 .../troubleshoot/TestAutoStartBoot.kt | 0 .../TestBackgroundRestrictions.kt | 0 .../troubleshoot/TestBatteryOptimization.kt | 0 .../java/im/vector/app/fdroid/package-info.kt | 0 .../receiver/AlarmSyncBroadcastReceiver.kt | 0 .../OnApplicationUpgradeOrRebootReceiver.kt | 0 .../service/FDroidGuardServiceStarter.kt | 0 .../app/fdroid/service/GuardAndroidService.kt | 0 .../im/vector/app/push/fcm/FdroidFcmHelper.kt | 0 ...ificationTroubleshootTestManagerFactory.kt | 0 .../java/im/vector/app/GoogleFlavorLegals.kt | 0 .../java/im/vector/app/di/FlavorModule.kt | 0 .../vector/app/di/NotificationTestModule.kt | 0 .../troubleshoot/TestFirebaseToken.kt | 0 .../settings/troubleshoot/TestPlayServices.kt | 0 .../troubleshoot/TestTokenRegistration.kt | 0 .../java/im/vector/app/gplay/package-info.kt | 0 .../app/nightly/FirebaseNightlyProxy.kt | 0 .../im/vector/app/push/fcm/GoogleFcmHelper.kt | 0 ...ificationTroubleshootTestManagerFactory.kt | 0 .../fcm/VectorFirebaseMessagingService.kt | 0 vector/build.gradle | 35 ++----------------- 27 files changed, 19 insertions(+), 32 deletions(-) rename {vector => vector-app}/src/fdroid/AndroidManifest.xml (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/di/FlavorModule.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/package-info.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/di/FlavorModule.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/di/NotificationTestModule.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/package-info.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt (100%) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index ea321c9e83..3f5c7a6c16 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -364,6 +364,22 @@ dependencies { debugImplementation 'com.facebook.soloader:soloader:0.10.4' debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" + gplayImplementation "com.google.android.gms:play-services-location:16.0.0" + // UnifiedPush gplay flavor only + gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.2') { + exclude group: 'com.google.firebase', module: 'firebase-core' + exclude group: 'com.google.firebase', module: 'firebase-analytics' + exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' + } + + // Nightly + // API-only library + gplayImplementation libs.google.appdistributionApi + // Full SDK implementation + gplayImplementation libs.google.appdistribution + + // OSS License, gplay flavor only + gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' kapt libs.dagger.hiltCompiler kapt libs.airbnb.epoxyProcessor diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml similarity index 100% rename from vector/src/fdroid/AndroidManifest.xml rename to vector-app/src/fdroid/AndroidManifest.xml diff --git a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt rename to vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt diff --git a/vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt rename to vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt diff --git a/vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt b/vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt rename to vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt diff --git a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/di/FlavorModule.kt rename to vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt diff --git a/vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt rename to vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/package-info.kt b/vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/package-info.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt diff --git a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt b/vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt rename to vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt diff --git a/vector/build.gradle b/vector/build.gradle index 3b802c8316..f6db2a61df 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -68,18 +68,6 @@ android { } } - flavorDimensions "store" - - productFlavors { - gplay { - dimension "store" - } - - fdroid { - dimension "store" - } - } - compileOptions { sourceCompatibility versions.sourceCompat targetCompatibility versions.targetCompat @@ -174,12 +162,6 @@ dependencies { // Snap Helper https://github.com/rubensousa/GravitySnapHelper api 'com.github.rubensousa:gravitysnaphelper:2.2.2' - // Nightly - // API-only library - gplayImplementation libs.google.appdistributionApi - // Full SDK implementation - gplayImplementation libs.google.appdistribution - // Work api libs.androidx.work @@ -247,15 +229,6 @@ dependencies { // UnifiedPush implementation 'com.github.UnifiedPush:android-connector:2.0.1' - // UnifiedPush gplay flavor only - gplayImplementation('com.google.firebase:firebase-messaging:23.0.8') { - exclude group: 'com.google.firebase', module: 'firebase-core' - exclude group: 'com.google.firebase', module: 'firebase-analytics' - exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' - } - - // OSS License, gplay flavor only - gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' implementation "androidx.emoji2:emoji2:1.1.0" @@ -291,14 +264,12 @@ dependencies { implementation 'commons-codec:commons-codec:1.15' // MapTiler - fdroidApi(libs.maplibre.androidSdk) { + api(libs.maplibre.androidSdk) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - fdroidApi(libs.maplibre.pluginAnnotation) { + api(libs.maplibre.pluginAnnotation) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - gplayApi libs.maplibre.androidSdk - gplayApi libs.maplibre.pluginAnnotation // TESTS testImplementation libs.tests.junit @@ -310,7 +281,7 @@ dependencies { testImplementation(libs.jetbrains.coroutinesTest) { exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" } - + androidTestImplementation libs.androidx.testCore androidTestImplementation libs.androidx.testRunner androidTestImplementation libs.androidx.testRules From 069104660131dc9e2d0faf9a2f5a0cc5e41ecc34 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 15:07:35 +0100 Subject: [PATCH 06/15] enabling build caching by default to improve build times --- gradle.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/gradle.properties b/gradle.properties index 2af9214ed5..0e561faa8d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,7 @@ org.gradle.jvmargs=-Xmx4g -Xms512M -XX:MaxPermSize=2048m -XX:MaxMetaspaceSize=1g org.gradle.configureondemand=true org.gradle.parallel=true org.gradle.vfs.watch=true +org.gradle.caching=true # Android Settings android.enableJetifier=true From 32a15bee04ba4b8bb5fab6107e22122f4b2252cc Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 1 Sep 2022 16:47:52 +0100 Subject: [PATCH 07/15] adding changelog entry --- changelog.d/6779.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6779.misc diff --git a/changelog.d/6779.misc b/changelog.d/6779.misc new file mode 100644 index 0000000000..70eda0eb2f --- /dev/null +++ b/changelog.d/6779.misc @@ -0,0 +1 @@ +[Modules] Lifts the application variants to the app module From 0c469ae07999028a2ca4c4687c6d50c36487c60a Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 12 Sep 2022 13:51:37 +0100 Subject: [PATCH 08/15] removing extra application id declaration --- vector-app/src/fdroid/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vector-app/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml index 15db89ca13..65630590d2 100644 --- a/vector-app/src/fdroid/AndroidManifest.xml +++ b/vector-app/src/fdroid/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> From 1d50bbdbda3ffd2804031b899e1b5bf74c70f634 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 12 Sep 2022 16:15:03 +0100 Subject: [PATCH 09/15] fixing manifest imports and giving androidTest its own dedicated manifest --- vector-app/src/debug/AndroidManifest.xml | 2 -- vector-app/src/fdroid/AndroidManifest.xml | 6 +++--- vector/src/androidTest/AndroidManifest.xml | 8 ++++++++ 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 vector/src/androidTest/AndroidManifest.xml diff --git a/vector-app/src/debug/AndroidManifest.xml b/vector-app/src/debug/AndroidManifest.xml index 3860a37319..a7867f4081 100644 --- a/vector-app/src/debug/AndroidManifest.xml +++ b/vector-app/src/debug/AndroidManifest.xml @@ -15,8 +15,6 @@ android:name="com.facebook.flipper.android.diagnostics.FlipperDiagnosticActivity" android:exported="true" /> - - diff --git a/vector-app/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml index 65630590d2..354d450958 100644 --- a/vector-app/src/fdroid/AndroidManifest.xml +++ b/vector-app/src/fdroid/AndroidManifest.xml @@ -14,7 +14,7 @@ @@ -23,12 +23,12 @@ diff --git a/vector/src/androidTest/AndroidManifest.xml b/vector/src/androidTest/AndroidManifest.xml new file mode 100644 index 0000000000..002b12f0db --- /dev/null +++ b/vector/src/androidTest/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + + + + + From 9e5f07a855df480d39a20c68f0903f5e80198aee Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 12 Sep 2022 16:15:11 +0100 Subject: [PATCH 10/15] suppressing lint warning for constant that delegates to the correct value --- .../vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt index bd1e0eb0ee..bccbf42e92 100644 --- a/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt +++ b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt @@ -16,6 +16,7 @@ package im.vector.app.fdroid.receiver +import android.annotation.SuppressLint import android.app.AlarmManager import android.app.PendingIntent import android.content.BroadcastReceiver @@ -65,6 +66,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() { companion object { private const val REQUEST_CODE = 0 + @SuppressLint("WrongConstant") // PendingIntentCompat.FLAG_IMMUTABLE is a false positive fun scheduleAlarm(context: Context, sessionId: String, delayInSeconds: Int, clock: Clock) { // Reschedule Timber.v("## Sync: Scheduling alarm for background sync in $delayInSeconds seconds") @@ -87,6 +89,7 @@ class AlarmSyncBroadcastReceiver : BroadcastReceiver() { } } + @SuppressLint("WrongConstant") // PendingIntentCompat.FLAG_IMMUTABLE is a false positive fun cancelAlarm(context: Context) { Timber.v("## Sync: Cancel alarm for background sync") val intent = Intent(context, AlarmSyncBroadcastReceiver::class.java) From e9e29603de140d7dad9f8ab0a75361c3d4c1cee9 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Mon, 12 Sep 2022 16:58:27 +0100 Subject: [PATCH 11/15] adding missing nightly source inclusions --- vector-app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 3f5c7a6c16..82c433d2df 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -291,6 +291,12 @@ android { } } + sourceSets { + nightly { + java.srcDirs += "src/release/java" + } + } + flavorDimensions "store" productFlavors { From 68da403f2f22c555757f7ae548d3d2d9ba2173e2 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 14 Sep 2022 11:23:16 +0100 Subject: [PATCH 12/15] using the top level debug unit test task when executing tests for coverage to avoid needing to specify every module --- coverage.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coverage.gradle b/coverage.gradle index 716f9b7cc7..8f6feacee2 100644 --- a/coverage.gradle +++ b/coverage.gradle @@ -81,7 +81,7 @@ task generateCoverageReport(type: JacocoReport) { task unitTestsWithCoverage(type: GradleBuild) { // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage startParameter.projectProperties.coverage = [enableTestCoverage: false] - tasks = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest'] + tasks = ['testDebugUnitTest'] } task instrumentationTestsWithCoverage(type: GradleBuild) { From 619ea819edc8253237ef4dc435531ce16c22e403 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 14 Sep 2022 14:47:04 +0100 Subject: [PATCH 13/15] using debug variant for the vector CA tests, gplay only exists at the root level --- coverage.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coverage.gradle b/coverage.gradle index 8f6feacee2..2c0af25368 100644 --- a/coverage.gradle +++ b/coverage.gradle @@ -87,5 +87,5 @@ task unitTestsWithCoverage(type: GradleBuild) { task instrumentationTestsWithCoverage(type: GradleBuild) { startParameter.projectProperties.coverage = [enableTestCoverage: true] startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui' - tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] + tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] } From e9d15b46d8ed11452efe9fbe6a06f2c0a02d09c4 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Wed, 14 Sep 2022 16:50:11 +0100 Subject: [PATCH 14/15] lifting the activity alias entry to the application module - fixes the androidTests expecting a shortcuts xml --- vector-app/src/main/AndroidManifest.xml | 18 ++++++++++++++++++ vector/src/main/AndroidManifest.xml | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/vector-app/src/main/AndroidManifest.xml b/vector-app/src/main/AndroidManifest.xml index 84607cf3d7..bff594c0de 100644 --- a/vector-app/src/main/AndroidManifest.xml +++ b/vector-app/src/main/AndroidManifest.xml @@ -18,6 +18,24 @@ tools:ignore="UnusedAttribute" tools:replace="android:allowBackup"> + + + + + + + + + + + + + diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml index 94f2abe78b..d60620dddf 100644 --- a/vector/src/main/AndroidManifest.xml +++ b/vector/src/main/AndroidManifest.xml @@ -90,23 +90,6 @@ android:name=".features.MainActivity" android:theme="@style/Theme.Vector.Launcher" /> - - - - - - - - - - - - Date: Thu, 15 Sep 2022 15:17:11 +0100 Subject: [PATCH 15/15] using fully qualified path to test activity, fixes missing reference --- vector/src/androidTest/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/androidTest/AndroidManifest.xml b/vector/src/androidTest/AndroidManifest.xml index 002b12f0db..5c3b99d4d1 100644 --- a/vector/src/androidTest/AndroidManifest.xml +++ b/vector/src/androidTest/AndroidManifest.xml @@ -2,7 +2,7 @@ - +