Skip to content

Commit

Permalink
dep lib upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
REBOOTERS committed Sep 27, 2023
1 parent c679462 commit e818d9b
Show file tree
Hide file tree
Showing 10 changed files with 36 additions and 36 deletions.
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ dependencies {
implementation "androidx.cardview:cardview:1.0.0"
implementation "com.github.bumptech.glide:glide:$ext.glide"
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.7'
implementation 'com.squareup.okio:okio:3.3.0'
implementation 'com.squareup.okio:okio:3.5.0'
implementation 'androidx.multidex:multidex:2.0.1'
implementation "androidx.vectordrawable:vectordrawable:1.1.0"
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout"
Expand All @@ -157,16 +157,16 @@ dependencies {
kapt 'com.jakewharton:butterknife-compiler:10.2.3'
implementation 'com.facebook.stetho:stetho:1.6.0'
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
implementation 'com.airbnb.android:lottie:6.0.0'
implementation 'com.airbnb.android:lottie:6.1.0'
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'

implementation "com.alibaba:arouter-api:$ext.arouter_api"
kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"

implementation "androidx.palette:palette-ktx:1.0.0"
implementation 'com.tencent:mmkv:1.2.16'
implementation 'com.tencent:mmkv:1.3.1'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.5.2'
Expand All @@ -175,7 +175,7 @@ dependencies {
implementation 'com.jakewharton.hugo:hugo-runtime:1.2.1'


implementation 'com.facebook.fresco:fresco:3.0.0'
implementation 'com.facebook.fresco:fresco:3.1.0'
implementation 'com.github.chrisbanes:PhotoView:2.1.4'
implementation 'com.github.REBOOTERS:Matisse:0.5.3'
implementation 'com.guolindev.permissionx:permissionx:1.7.1'
Expand Down
20 changes: 10 additions & 10 deletions config.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
ext {
compileSdk = 33
compileSdk = 34

minSdk = 21
targetSdk = 33
targetSdk = 34


support_version = '1.3.0'
support_version = '1.3.1'
androidx_appcompat = '1.6.1'
androidx_material = '1.9.0'
androidx_preference = '1.2.0'
androidx_preference = '1.2.1'
constraint_layout = '2.1.4'
core_ktx = '1.10.1'
core_ktx = '1.12.0'

kotlin_version = '1.8.21'
gradle_version = '8.1.1'

doraemonkit = '3.5.0'
doraemonkit = '3.7.11'

glide = '4.15.1'
arouter_api = '1.5.2'
Expand All @@ -25,10 +25,10 @@ ext {
rxjava = '2.2.2'
rxandroid = '2.1.0'

roomVersion = '2.5.1'
roomVersion_runtime = '2.5.1'
roomVersion = '2.5.2'
roomVersion_runtime = '2.5.2'
archLifecycleVersion = '2.2.0'

kotlin_coroutines = '1.7.1'
kotlin_coroutines_android = '1.7.1'
kotlin_coroutines = '1.7.3'
kotlin_coroutines_android = '1.7.3'
}
14 changes: 7 additions & 7 deletions imitate/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -138,25 +138,25 @@ dependencies {
implementation "androidx.constraintlayout:constraintlayout:${ext.constraint_layout}"
implementation "com.github.bumptech.glide:glide:$ext.glide"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.lifecycle:lifecycle-process:2.6.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
implementation 'androidx.lifecycle:lifecycle-process:2.6.2'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2'
implementation project(path: ':subs:cpp_native')


testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.6.0-alpha02'
androidTestImplementation 'androidx.test:runner:1.6.0-alpha04'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0-alpha01'


implementation "com.alibaba:arouter-api:$ext.arouter_api"
kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
implementation 'com.facebook.fresco:fresco:2.6.0'
implementation 'com.facebook.fresco:fresco:3.1.0'
implementation 'com.github.REBOOTERS:Matisse:0.5.3'
implementation 'com.guolindev.permissionx:permissionx:1.7.1'
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'com.facebook.stetho:stetho:1.6.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
//
implementation 'com.github.andrefrsousa:SuperBottomSheet:1.3.0'
Expand Down Expand Up @@ -220,8 +220,8 @@ dependencies {
implementation 'com.beust:klaxon:5.6'
implementation 'com.alibaba:fastjson:2.0.19.graal'
implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.dagger:dagger:2.46.1'
kapt 'com.google.dagger:dagger-compiler:2.46.1'
implementation 'com.google.dagger:dagger:2.48'
kapt 'com.google.dagger:dagger-compiler:2.48'

// coroutines
// 👇 依赖协程核心库
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ class SelfDrawViewActivity : AppCompatActivity() {
paint.shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
}

override fun onDraw(canvas: Canvas?) {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
canvas?.drawCircle(size.toFloat(), size.toFloat(), size.toFloat(), paint)
canvas.drawCircle(size.toFloat(), size.toFloat(), size.toFloat(), paint)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CircleLoading: View, Animatable, ValueAnimator.AnimatorUpdateListener {
stopLoading()
}

override fun onDraw(canvas: Canvas?) {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
centerX = width / 2
centerY = height / 2
Expand All @@ -43,10 +43,10 @@ class CircleLoading: View, Animatable, ValueAnimator.AnimatorUpdateListener {
mOuterCircleRectF.set(centerX - outR, centerY - outR, centerX + outR, centerY + outR)
mInnerCircleRectF.set(centerX - inR, centerY - inR, centerX + inR, centerY + inR)

canvas?.save()
canvas?.drawArc(mOuterCircleRectF, mRotateAngle % 360, OUTER_CIRCLE_ANGLE, false, mStrokePaint)
canvas?.drawArc(mInnerCircleRectF, 270 - mRotateAngle % 360, INTER_CIRCLE_ANGLE, false, mStrokePaint)
canvas?.restore()
canvas.save()
canvas.drawArc(mOuterCircleRectF, mRotateAngle % 360, OUTER_CIRCLE_ANGLE, false, mStrokePaint)
canvas.drawArc(mInnerCircleRectF, 270 - mRotateAngle % 360, INTER_CIRCLE_ANGLE, false, mStrokePaint)
canvas.restore()
}

public fun startLoading() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CircleLoadingLite : View, Animatable, ValueAnimator.AnimatorUpdateListener
stopLoading()
}

override fun onDraw(canvas: Canvas?) {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
var outR = centerX - lineWidth
outR *= mRotateAngle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CircleLoadingPro: View, Animatable, ValueAnimator.AnimatorUpdateListener {
stopLoading()
}

override fun onDraw(canvas: Canvas?) {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
centerX = width / 2
centerY = height / 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CircleLoadingUltimate : View, Animatable, ValueAnimator.AnimatorUpdateList
stopLoading()
}

override fun onDraw(canvas: Canvas?) {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ class ShimmerLayout @JvmOverloads constructor(
shimmerDrawable.setBounds(0, 0, width, height)
}

override fun onDraw(canvas: Canvas?) {
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
canvas?.clipPath(path)
}

override fun dispatchDraw(canvas: Canvas?) {
override fun dispatchDraw(canvas: Canvas) {
super.dispatchDraw(canvas)
canvas?.let {
shimmerDrawable.draw(canvas)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class AnimationBorder : RelativeLayout {
)
}

override fun onDraw(canvas: Canvas?) {
canvas?.drawRoundRect(rect, mRadius, mRadius, mPaint)
override fun onDraw(canvas: Canvas) {
canvas.drawRoundRect(rect, mRadius, mRadius, mPaint)
super.onDraw(canvas)
}

Expand Down

0 comments on commit e818d9b

Please sign in to comment.