Skip to content

Commit 1e1c6a3

Browse files
lzlslzls
committed
chore: update dependencies
1 parent 61f422e commit 1e1c6a3

File tree

16 files changed

+422
-304
lines changed

16 files changed

+422
-304
lines changed

‎app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ dependencies {
5959
implementation 'com.sun.mail:android-mail:1.6.7'
6060
implementation 'com.sun.mail:android-activation:1.6.7'
6161

62-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
62+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
63+
debugImplementation 'com.squareup.leakcanary:leakcanary-android-process:2.14'
6364

6465
implementation 'com.aliyun.ams:alicloud-android-hotfix:3.4.1'
6566
}

‎app/src/main/java/com/liuzhenlin/videos/utils/AppUpdateChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import androidx.collection.ArrayMap;
4444
import androidx.core.app.NotificationCompat;
4545
import androidx.core.app.NotificationManagerCompat;
46+
import androidx.core.content.ContextCompat;
4647
import androidx.core.util.ObjectsCompat;
4748
import androidx.fragment.app.FragmentActivity;
4849
import androidx.fragment.app.FragmentManager;
@@ -52,7 +53,6 @@
5253
import com.google.gson.JsonElement;
5354
import com.google.gson.JsonObject;
5455
import com.google.gson.JsonParser;
55-
import com.liuzhenlin.common.compat.ContextCompatExt;
5656
import com.liuzhenlin.common.compat.FragmentManagerCompat;
5757
import com.liuzhenlin.common.utils.ActivityUtils;
5858
import com.liuzhenlin.common.utils.Executors;
@@ -778,9 +778,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
778778
intent.getStringExtra(AppUpdateChecker.EXTRA_APP_SHA1));
779779

780780
mReceiver = new CancelAppUpdateReceiver();
781-
ContextCompatExt.registerReceiver(
781+
ContextCompat.registerReceiver(
782782
this, mReceiver, new IntentFilter(CancelAppUpdateReceiver.ACTION),
783-
ContextCompatExt.RECEIVER_NOT_EXPORTED);
783+
ContextCompat.RECEIVER_NOT_EXPORTED);
784784

785785
return START_REDELIVER_INTENT;
786786
}

‎app/src/main/java/com/liuzhenlin/videos/utils/MergeAppUpdateChecker.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import androidx.collection.ArrayMap;
4444
import androidx.core.app.NotificationCompat;
4545
import androidx.core.app.NotificationManagerCompat;
46+
import androidx.core.content.ContextCompat;
4647
import androidx.core.util.ObjectsCompat;
4748
import androidx.fragment.app.FragmentActivity;
4849
import androidx.fragment.app.FragmentManager;
@@ -52,7 +53,6 @@
5253
import com.google.gson.JsonElement;
5354
import com.google.gson.JsonObject;
5455
import com.google.gson.JsonParser;
55-
import com.liuzhenlin.common.compat.ContextCompatExt;
5656
import com.liuzhenlin.common.compat.FragmentManagerCompat;
5757
import com.liuzhenlin.common.utils.ActivityUtils;
5858
import com.liuzhenlin.common.utils.Executors;
@@ -817,9 +817,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
817817
startForeground(ID_NOTIFICATION, mNotificationBuilder.build());
818818

819819
mReceiver = new CancelAppUpdateReceiver();
820-
ContextCompatExt.registerReceiver(
820+
ContextCompat.registerReceiver(
821821
this, mReceiver, new IntentFilter(CancelAppUpdateReceiver.ACTION),
822-
ContextCompatExt.RECEIVER_NOT_EXPORTED);
822+
ContextCompat.RECEIVER_NOT_EXPORTED);
823823

824824
Executors.THREAD_POOL_EXECUTOR.execute(() -> {
825825
//noinspection ConstantConditions

‎build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.8.21'
4+
ext.kotlin_version = '1.9.23'
55

66
repositories {
77
google()
@@ -36,7 +36,7 @@ ext {
3636
compileSdkVersion = 34
3737
targetSdkVersion = 34
3838

39-
appcompatVersion = '1.4.2' // Avoid using 1.6.*, which rolls the night mode issue back
39+
appcompatVersion = '1.6.1'
4040
exoplayer2Version = '2.18.7'
4141

4242
testJunitVersion = '4.13.2'

‎common/build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ android {
2020
}
2121

2222
dependencies {
23-
//noinspection GradleDependency (limited by used appcompat version 1.4.2)
24-
api 'com.google.android.material:material:1.6.1'
23+
//noinspection GradleDependency (limited by the minimum SDK version (16) supported by this app)
24+
api 'com.google.android.material:material:1.11.0'
2525
api 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
2626
api 'androidx.palette:palette:1.0.0'
27+
//noinspection GradleDependency (limited by the minimum SDK version (16) supported by this app)
2728
api 'androidx.media:media:1.6.0'
2829

2930
api 'com.google.code.findbugs:jsr305:3.0.2'
3031
api 'com.google.code.gson:gson:2.10.1'
3132

32-
api 'com.github.bumptech.glide:glide:4.15.1'
33-
annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
33+
api 'com.github.bumptech.glide:glide:4.16.0'
34+
annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
3435
}

‎common/src/main/java/androidx/appcompat/app/AppCompatDelegateWrapper.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import android.view.MenuInflater;
1919
import android.view.View;
2020
import android.view.ViewGroup;
21+
import android.window.OnBackInvokedDispatcher;
2122

2223
import androidx.annotation.NonNull;
2324
import androidx.annotation.Nullable;
@@ -152,6 +153,13 @@ public void setHostCallback(@Nullable HostCallback callback) {
152153
mHostCallback = callback;
153154
}
154155

156+
@SuppressLint("MissingSuperCall")
157+
@RequiresApi(api = Build.VERSION_CODES.TIRAMISU)
158+
@Override
159+
public void setOnBackInvokedDispatcher(@Nullable OnBackInvokedDispatcher dispatcher) {
160+
mDelegate.setOnBackInvokedDispatcher(dispatcher);
161+
}
162+
155163
@Nullable
156164
@Override
157165
public ActionBar getSupportActionBar() {
@@ -809,6 +817,12 @@ private void updateResourcesConfigurationForLanguage(
809817
}
810818
}
811819

820+
@Nullable
821+
@Override
822+
public Context getContextForDelegate() {
823+
return mDelegate.getContextForDelegate();
824+
}
825+
812826
@Override
813827
public boolean applyDayNight() {
814828
return mDelegate.applyDayNight();

‎common/src/main/java/com/liuzhenlin/common/compat/ContextCompatExt.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎common/src/main/java/com/liuzhenlin/common/receiver/HeadsetEventsReceiver.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515

1616
import androidx.annotation.NonNull;
1717
import androidx.annotation.Nullable;
18-
19-
import com.liuzhenlin.common.compat.ContextCompatExt;
18+
import androidx.core.content.ContextCompat;
2019

2120
/**
2221
* @author 刘振林
@@ -65,7 +64,7 @@ public void register() {
6564
IntentFilter filter = new IntentFilter(ACTION_HEADSET_PLUG);
6665
filter.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
6766
filter.addAction(BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED);
68-
ContextCompatExt.registerReceiver(mContext, this, filter, ContextCompatExt.RECEIVER_EXPORTED);
67+
ContextCompat.registerReceiver(mContext, this, filter, ContextCompat.RECEIVER_EXPORTED);
6968
}
7069

7170
public void register(@Nullable String... actions) {
@@ -81,7 +80,7 @@ public void register(@Nullable String... actions) {
8180
|| BluetoothHeadset.ACTION_AUDIO_STATE_CHANGED.equals(action)) {
8281
filter.addAction(action);
8382
}
84-
ContextCompatExt.registerReceiver(mContext, this, filter, ContextCompatExt.RECEIVER_EXPORTED);
83+
ContextCompat.registerReceiver(mContext, this, filter, ContextCompat.RECEIVER_EXPORTED);
8584
}
8685

8786
public void unregister() {

‎common/src/main/java/com/liuzhenlin/common/receiver/VolumeReceiver.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
import androidx.annotation.IntDef;
1515
import androidx.annotation.NonNull;
1616
import androidx.annotation.Nullable;
17-
18-
import com.liuzhenlin.common.compat.ContextCompatExt;
17+
import androidx.core.content.ContextCompat;
1918

2019
import java.lang.annotation.Retention;
2120
import java.lang.annotation.RetentionPolicy;
@@ -102,7 +101,7 @@ public void onReceive(Context context, Intent intent) {
102101
public void register() {
103102
IntentFilter filter = new IntentFilter(VolumeReceiver.VOLUME_CHANGED_ACTION);
104103
filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION);
105-
ContextCompatExt.registerReceiver(mContext, this, filter, ContextCompatExt.RECEIVER_EXPORTED);
104+
ContextCompat.registerReceiver(mContext, this, filter, ContextCompat.RECEIVER_EXPORTED);
106105
}
107106

108107
public void register(@Nullable String... actions) {
@@ -117,7 +116,7 @@ public void register(@Nullable String... actions) {
117116
|| AudioManager.RINGER_MODE_CHANGED_ACTION.equals(action)) {
118117
filter.addAction(action);
119118
}
120-
ContextCompatExt.registerReceiver(mContext, this, filter, ContextCompatExt.RECEIVER_EXPORTED);
119+
ContextCompat.registerReceiver(mContext, this, filter, ContextCompat.RECEIVER_EXPORTED);
121120
}
122121

123122
public void unregister() {

‎common/src/main/java/com/liuzhenlin/common/utils/PictureInPictureHelper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
import androidx.annotation.Nullable;
2828
import androidx.annotation.RequiresApi;
2929
import androidx.appcompat.app.AppCompatActivity;
30+
import androidx.core.content.ContextCompat;
3031
import androidx.core.graphics.drawable.IconCompat;
3132
import androidx.lifecycle.Lifecycle;
3233
import androidx.lifecycle.LifecycleEventObserver;
3334

3435
import com.liuzhenlin.common.BuildConfig;
3536
import com.liuzhenlin.common.Consts;
3637
import com.liuzhenlin.common.R;
37-
import com.liuzhenlin.common.compat.ContextCompatExt;
3838

3939
import java.util.LinkedList;
4040
import java.util.List;
@@ -225,8 +225,8 @@ public void onReceive(Context context, Intent intent) {
225225
}
226226
}
227227
};
228-
ContextCompatExt.registerReceiver(mActivity, mReceiver,
229-
new IntentFilter(ACTION_MEDIA_CONTROL), ContextCompatExt.RECEIVER_NOT_EXPORTED);
228+
ContextCompat.registerReceiver(mActivity, mReceiver,
229+
new IntentFilter(ACTION_MEDIA_CONTROL), ContextCompat.RECEIVER_NOT_EXPORTED);
230230

231231
setOnPipLayoutChangeListener(mAdapter, mOnPipLayoutChangeListener);
232232
} else {

0 commit comments

Comments
 (0)