Skip to content

Commit 8bcf746

Browse files
committed
Merge branch 'main' into dependabot/gradle/androidx-47a5871663
2 parents 34e6d42 + 4d7dddf commit 8bcf746

File tree

3 files changed

+20
-215
lines changed

3 files changed

+20
-215
lines changed

.github/workflows/dependency-update.yml

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

app/build.gradle

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdk 33
4+
compileSdk 34
55
buildFeatures {
66
buildConfig true
77
}
88
defaultConfig {
99
applicationId "me.ghui.v2er"
1010
minSdkVersion 27
11-
targetSdkVersion 33
11+
targetSdkVersion 34
1212
versionCode rootProject.ext.app.versionCode
1313
versionName rootProject.ext.app.versionName
1414
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -79,38 +79,38 @@ dependencies {
7979
})
8080
testImplementation 'junit:junit:4.13.2'
8181

82-
implementation 'androidx.appcompat:appcompat:1.6.1'
82+
implementation 'androidx.appcompat:appcompat:1.7.1'
8383
implementation 'com.google.android.material:material:1.3.0'
84-
implementation 'androidx.recyclerview:recyclerview:1.3.2'
84+
implementation 'androidx.recyclerview:recyclerview:1.4.0'
8585
implementation 'androidx.cardview:cardview:1.0.0'
86-
implementation 'androidx.browser:browser:1.7.0'
86+
implementation 'androidx.browser:browser:1.8.0'
8787
implementation 'androidx.palette:palette:1.0.0'
88-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
88+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
8989
implementation 'com.google.android.flexbox:flexbox:3.0.0'
90-
implementation "androidx.annotation:annotation:1.7.1"
90+
implementation "androidx.annotation:annotation:1.9.1"
9191
// JSR305 annotations for javax.annotation
9292
implementation 'com.google.code.findbugs:jsr305:3.0.2'
9393
// 3rd part Dependencies...
94-
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
95-
implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
96-
implementation 'com.squareup.retrofit2:retrofit:2.6.1'
97-
implementation 'com.squareup.retrofit2:converter-gson:2.6.1'
98-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.1'
99-
implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0'
94+
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
95+
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
96+
implementation 'com.squareup.retrofit2:retrofit:3.0.0'
97+
implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
98+
implementation 'com.squareup.retrofit2:adapter-rxjava2:3.0.0'
99+
implementation 'com.squareup.okhttp3:logging-interceptor:5.1.0'
100100
def butterknifeVersion = '10.2.3'
101101
implementation "com.jakewharton:butterknife:10.2.3"
102102
annotationProcessor "com.jakewharton:butterknife-compiler:10.2.3"
103-
implementation 'com.google.dagger:dagger:2.28.3'
104-
annotationProcessor "com.google.dagger:dagger-compiler:2.28.3"
103+
implementation 'com.google.dagger:dagger:2.56.2'
104+
annotationProcessor "com.google.dagger:dagger-compiler:2.56.2"
105105
implementation 'com.github.bumptech.glide:glide:4.11.0'
106106
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
107107
implementation 'jp.wasabeef:glide-transformations:4.3.0'
108-
implementation 'de.hdodenhof:circleimageview:2.1.0'
108+
implementation 'de.hdodenhof:circleimageview:3.1.0'
109109
// Using Maven Central version of FlycoTabLayout (AndroidX version)
110110
implementation 'io.github.h07000223:flycoTabLayout:3.0.0'
111111
implementation 'com.orhanobut:logger:2.2.0'
112-
implementation 'com.trello.rxlifecycle2:rxlifecycle:2.2.0'
113-
implementation 'com.trello.rxlifecycle2:rxlifecycle-android:2.2.0'
112+
implementation 'com.trello.rxlifecycle2:rxlifecycle:2.2.2'
113+
implementation 'com.trello.rxlifecycle2:rxlifecycle-android:2.2.2'
114114
implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.0.1'
115115
implementation 'com.github.GrenderG:Prefs:1.3'
116116
implementation 'me.ghui:Fruit:1.0.4'
@@ -120,7 +120,7 @@ dependencies {
120120
implementation 'com.github.mazenrashed:RecyclerView-FlexibleDivider:1.5.0'
121121
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.6.0'
122122
//noinspection GradleDynamicVersion
123-
implementation 'com.r0adkll:slidableactivity:2.0.5'
123+
implementation 'com.r0adkll:slidableactivity:2.1.0'
124124
implementation 'com.github.bumptech.glide:okhttp3-integration:4.1.1'
125125
implementation 'pub.devrel:easypermissions:3.0.0'
126126
implementation 'org.greenrobot:eventbus:3.3.1'

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
maven { url "https://plugins.gradle.org/m2/" }
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.1.1'
10+
classpath 'com.android.tools.build:gradle:8.11.0'
1111
}
1212
}
1313

0 commit comments

Comments
 (0)