diff --git a/changelog.d/7140.misc b/changelog.d/7140.misc new file mode 100644 index 0000000000..8f364e59bc --- /dev/null +++ b/changelog.d/7140.misc @@ -0,0 +1 @@ +Exclude legacy android support annotation library diff --git a/dependencies_groups.gradle b/dependencies_groups.gradle index bcd737acc9..433bc53568 100644 --- a/dependencies_groups.gradle +++ b/dependencies_groups.gradle @@ -69,8 +69,6 @@ ext.groups = [ 'com.gabrielittner.threetenbp', 'com.getkeepsafe.relinker', 'com.github.bumptech.glide', - 'com.github.filippudak', - 'com.github.filippudak.progresspieview', 'com.github.javaparser', 'com.github.piasy', 'com.github.shyiko.klob', diff --git a/library/jsonviewer/build.gradle b/library/jsonviewer/build.gradle index ad472b0b54..fcad3f1087 100644 --- a/library/jsonviewer/build.gradle +++ b/library/jsonviewer/build.gradle @@ -55,8 +55,9 @@ dependencies { implementation libs.airbnb.mavericks // Span utils - implementation 'me.gujun.android:span:1.7' - + implementation('me.gujun.android:span:1.7') { + exclude group: 'com.android.support', module: 'support-annotations' + } implementation libs.jetbrains.coroutinesCore implementation libs.jetbrains.coroutinesAndroid diff --git a/vector/build.gradle b/vector/build.gradle index f6db2a61df..ac3699454c 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -100,7 +100,6 @@ android { viewBinding true } } - dependencies { implementation project(":vector-config") api project(":matrix-sdk-android") @@ -177,7 +176,9 @@ dependencies { // UI implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' implementation libs.google.material - api 'me.gujun.android:span:1.7' + api('me.gujun.android:span:1.7') { + exclude group: 'com.android.support', module: 'support-annotations' + } implementation libs.markwon.core implementation libs.markwon.extLatex implementation libs.markwon.inlineParser @@ -206,7 +207,6 @@ dependencies { // Image Loading implementation libs.github.bigImageViewer implementation libs.github.glideImageLoader - implementation libs.github.progressPieIndicator implementation libs.github.glideImageViewFactory // implementation 'com.github.MikeOrtiz:TouchImageView:3.0.2' @@ -225,7 +225,9 @@ dependencies { kapt libs.dagger.hiltCompiler // Analytics - implementation 'com.posthog.android:posthog:1.1.2' + implementation('com.posthog.android:posthog:1.1.2') { + exclude group: 'com.android.support', module: 'support-annotations' + } // UnifiedPush implementation 'com.github.UnifiedPush:android-connector:2.0.1' @@ -242,12 +244,22 @@ dependencies { exclude group: 'com.google.firebase' exclude group: 'com.google.android.gms' exclude group: 'com.android.installreferrer' + + // Exclude jitsi's android-scalablevideoview fork's support library + // The library exports a jetified artifact but doesn't remove the support library dependency + // https://github.com/MatrixFrog/Android-ScalableVideoView/blob/master/gradle.properties#L1 + exclude group: 'com.android.support', module: 'appcompat-v7' } // QR-code // Stick to 3.3.3 because of https://github.com/zxing/zxing/issues/1170 implementation 'com.google.zxing:core:3.3.3' - implementation 'me.dm7.barcodescanner:zxing:1.9.13' + + // Excludes the legacy support library annotation usages + // https://github.com/dm77/barcodescanner/blob/d036996c8a6f36a68843ffe539c834c28944b2d5/core/src/main/java/me/dm7/barcodescanner/core/CameraWrapper.java#L4 + implementation ('me.dm7.barcodescanner:zxing:1.9.13') { + exclude group: 'com.android.support', module: 'support-v4' + } // Emoji Keyboard api libs.vanniktech.emojiMaterial