Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Excluding legacy support library annotation usages #7140

Merged
merged 7 commits into from
Sep 16, 2022
Merged

Excluding legacy support library annotation usages #7140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca92ad2
excluding compile time legacy support annotations from dependencies
ouchadam Sep 15, 2022
c61df89
removing unused dependency
ouchadam Sep 15, 2022
4e99217
excluding jitsi's android-scalablevideoview fork's support library
ouchadam Sep 15, 2022
1d8b4ce
excluding support annotations from jsonviewer module dependency
ouchadam Sep 15, 2022
be9c9f1
formatting
ouchadam Sep 15, 2022
ae50f5a
adding changelog entry
ouchadam Sep 15, 2022
11e6ca1
moving the jitsi exclude directly to the dependency so that other mod…
ouchadam Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/7140.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Exclude legacy android support annotation library
2 changes: 0 additions & 2 deletions dependencies_groups.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
5 changes: 3 additions & 2 deletions library/jsonviewer/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 17 additions & 5 deletions vector/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ android {
viewBinding true
}
}

dependencies {
implementation project(":vector-config")
api project(":matrix-sdk-android")
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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
Expand Down