moving imports around to match application/library split

This commit is contained in:
Adam Brown 2022-08-03 14:56:46 +01:00
parent f67ec6d14e
commit 615ab414ff
5 changed files with 6 additions and 4 deletions

View File

@ -345,5 +345,7 @@ dependencies {
implementation project(':vector-config') implementation project(':vector-config')
implementation libs.dagger.hilt implementation libs.dagger.hilt
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation "androidx.sharetarget:sharetarget:1.1.0"
kapt libs.dagger.hiltCompiler kapt libs.dagger.hiltCompiler
} }

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"> <manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application> <application android:name="im.vector.app.VectorApplication">
<!-- Firebase components --> <!-- Firebase components -->
<meta-data <meta-data
@ -9,8 +9,8 @@
android:value="true" /> android:value="true" />
<receiver <receiver
android:name="im.vector.app.push.fcm.EmbeddedFCMDistributor"
android:enabled="true" android:enabled="true"
android:name=".push.fcm.EmbeddedFCMDistributor"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>

View File

@ -66,6 +66,7 @@ import im.vector.app.features.settings.VectorLocale
import im.vector.app.features.settings.VectorPreferences import im.vector.app.features.settings.VectorPreferences
import im.vector.app.features.themes.ThemeUtils import im.vector.app.features.themes.ThemeUtils
import im.vector.app.features.version.VersionProvider import im.vector.app.features.version.VersionProvider
import im.vector.application.R
import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler import org.jitsi.meet.sdk.log.JitsiMeetDefaultLogHandler
import org.matrix.android.sdk.api.Matrix import org.matrix.android.sdk.api.Matrix
import org.matrix.android.sdk.api.auth.AuthenticationService import org.matrix.android.sdk.api.auth.AuthenticationService

View File

@ -164,7 +164,6 @@ dependencies {
implementation libs.androidx.appCompat implementation libs.androidx.appCompat
implementation libs.androidx.fragmentKtx implementation libs.androidx.fragmentKtx
implementation libs.androidx.constraintLayout implementation libs.androidx.constraintLayout
api "androidx.sharetarget:sharetarget:1.1.0"
implementation libs.androidx.core implementation libs.androidx.core
implementation "androidx.media:media:1.6.0" implementation "androidx.media:media:1.6.0"
implementation "androidx.transition:transition:1.4.1" implementation "androidx.transition:transition:1.4.1"

View File

@ -15,6 +15,7 @@
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- Call feature --> <!-- Call feature -->
<uses-permission android:name="android.permission.MANAGE_OWN_CALLS" /> <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
@ -75,7 +76,6 @@
</queries> </queries>
<application <application
android:name=".VectorApplication"
android:allowBackup="false" android:allowBackup="false"
android:hasFragileUserData="true" android:hasFragileUserData="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"