Skip to content

Commit b909656

Browse files
committed
lib upgrade
1 parent 9210511 commit b909656

File tree

12 files changed

+64
-45
lines changed

12 files changed

+64
-45
lines changed

app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ configurations.all {
133133

134134
dependencies {
135135
implementation fileTree(include: ['*.jar'], dir: 'libs')
136-
implementation 'com.google.code.gson:gson:2.10.1'
136+
implementation 'com.google.code.gson:gson:2.11.0'
137137
implementation "androidx.appcompat:appcompat:${ext.androidx_appcompat}"
138138
implementation "com.google.android.material:material:${ext.androidx_material}"
139139
implementation 'com.orhanobut:logger:2.2.0'
@@ -142,10 +142,10 @@ dependencies {
142142
implementation "androidx.legacy:legacy-support-v4:1.0.0"
143143
implementation "androidx.cardview:cardview:1.0.0"
144144
implementation "com.github.bumptech.glide:glide:$ext.glide"
145-
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.12'
145+
implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.14'
146146
implementation 'com.squareup.okio:okio:3.9.0'
147147
implementation 'androidx.multidex:multidex:2.0.1'
148-
implementation "androidx.vectordrawable:vectordrawable:1.1.0"
148+
implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
149149
implementation "androidx.constraintlayout:constraintlayout:$constraint_layout"
150150

151151
implementation 'com.github.bingoogolapple:BGARefreshLayout-Android:2.0.1'
@@ -156,9 +156,9 @@ dependencies {
156156
kapt 'com.jakewharton:butterknife-compiler:10.2.3'
157157
implementation 'com.facebook.stetho:stetho:1.6.0'
158158
implementation "androidx.dynamicanimation:dynamicanimation:1.0.0"
159-
implementation 'com.airbnb.android:lottie:6.4.0'
159+
implementation 'com.airbnb.android:lottie:6.4.1'
160160
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
161-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
161+
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
162162
implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
163163

164164
implementation "com.alibaba:arouter-api:$ext.arouter_api"
@@ -174,10 +174,10 @@ dependencies {
174174
implementation 'com.jakewharton.hugo:hugo-runtime:1.2.1'
175175

176176

177-
implementation 'com.facebook.fresco:fresco:3.1.3'
177+
implementation 'com.facebook.fresco:fresco:3.2.0'
178178
implementation 'com.github.chrisbanes:PhotoView:2.1.4'
179179
implementation 'com.github.REBOOTERS:Matisse:v0.5.7'
180-
implementation 'com.guolindev.permissionx:permissionx:1.7.1'
180+
implementation 'com.guolindev.permissionx:permissionx:1.8.0'
181181
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
182182
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
183183
implementation 'com.squareup.picasso:picasso:2.71828'

build.gradle

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

33
plugins {
4-
id 'com.android.application' version '8.4.0' apply false
5-
id 'com.android.library' version '8.4.0' apply false
4+
id 'com.android.application' version '8.5.0' apply false
5+
id 'com.android.library' version '8.5.0' apply false
66
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
77
id 'com.google.devtools.ksp' version '1.9.10-1.0.13' apply false
88
}

buildSrc/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ dependencies {
77
// groovy sdk
88
implementation gradleApi()
99
// implementation localGroovy()
10-
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.23'
10+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0'
1111
// 添加了这个,就可以看 Android Gradle 插件的源码了
12-
implementation 'com.android.tools.build:gradle-api:8.4.0'
12+
implementation 'com.android.tools.build:gradle-api:8.5.0'
1313
// implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.40"
14-
implementation 'com.google.code.gson:gson:2.10.1'
15-
implementation 'com.android.tools:common:31.3.2'
14+
implementation 'com.google.code.gson:gson:2.11.0'
15+
implementation 'com.android.tools:common:31.5.0'
1616
implementation 'commons-io:commons-io:2.16.1'
1717
// implementation 'org.ow2.asm:asm:7.0'
1818
implementation 'org.ow2.asm:asm-commons:9.7'

config.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ ext {
66

77

88
support_version = '1.3.2'
9-
androidx_appcompat = '1.6.1'
10-
androidx_material = '1.11.0'
9+
androidx_appcompat = '1.7.0'
10+
androidx_material = '1.12.0'
1111
androidx_preference = '1.2.1'
1212
constraint_layout = '2.1.4'
13-
core_ktx = '1.12.0'
13+
core_ktx = '1.13.1'
1414

15-
kotlin_version = '1.9.23'
15+
kotlin_version = '2.0.0'
1616
gradle_version = '8.1.1'
1717

1818
doraemonkit = '3.7.11'
@@ -29,6 +29,6 @@ ext {
2929
roomVersion_runtime = '2.6.1'
3030
archLifecycleVersion = '2.2.0'
3131

32-
kotlin_coroutines = '1.7.3'
33-
kotlin_coroutines_android = '1.7.3'
32+
kotlin_coroutines = '1.8.1'
33+
kotlin_coroutines_android = '1.8.1'
3434
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip

imitate/build.gradle

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -138,34 +138,34 @@ dependencies {
138138
implementation "androidx.constraintlayout:constraintlayout:${ext.constraint_layout}"
139139
implementation "com.github.bumptech.glide:glide:$ext.glide"
140140
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
141-
implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
142-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
141+
implementation 'androidx.lifecycle:lifecycle-process:2.8.2'
142+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2'
143143
implementation project(path: ':subs:cpp_native')
144144

145145

146146
testImplementation 'junit:junit:4.13.2'
147-
androidTestImplementation 'androidx.test:runner:1.6.0-alpha04'
148-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0-alpha01'
147+
androidTestImplementation 'androidx.test:runner:1.6.0-rc01'
148+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0-rc01'
149149

150150

151151
implementation "com.alibaba:arouter-api:$ext.arouter_api"
152152
kapt "com.alibaba:arouter-compiler:$ext.arouter_compiler"
153-
implementation('com.facebook.fresco:fresco:3.1.3') {
153+
implementation('com.facebook.fresco:fresco:3.2.0') {
154154
exclude group: 'com.facebook.soloader', module: 'soloader'
155155
exclude group: 'com.facebook.fresco', module: 'soloader'
156156
exclude group: 'com.facebook.fresco', module: 'nativeimagefilters'
157157
exclude group: 'com.facebook.fresco', module: 'nativeimagetranscoder'
158158
exclude group: 'com.facebook.fresco', module: 'memory-type-native'
159159
exclude group: 'com.facebook.fresco', module: 'imagepipeline-native'
160160
}
161-
implementation 'com.facebook.fresco:animated-webp:3.1.3'
162-
implementation 'com.facebook.fresco:webpsupport:3.1.3'
161+
implementation 'com.facebook.fresco:animated-webp:3.2.0'
162+
implementation 'com.facebook.fresco:webpsupport:3.2.0'
163163
implementation 'com.github.REBOOTERS:Matisse:v0.5.7'
164-
implementation 'com.guolindev.permissionx:permissionx:1.7.1'
164+
implementation 'com.guolindev.permissionx:permissionx:1.8.0'
165165
implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
166166
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
167167
implementation 'com.facebook.stetho:stetho:1.6.0'
168-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.13'
168+
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
169169
implementation 'net.sourceforge.streamsupport:streamsupport:1.7.4'
170170
//
171171
implementation 'com.github.andrefrsousa:SuperBottomSheet:1.3.0'
@@ -176,7 +176,7 @@ dependencies {
176176
implementation 'com.afollestad:assent:2.3.1'
177177

178178

179-
implementation "androidx.viewpager2:viewpager2:1.0.0"
179+
implementation 'androidx.viewpager2:viewpager2:1.1.0'
180180

181181
// https://github.com/prostory/AndroidZdog
182182
implementation 'com.github.prostory:AndroidZdog:v1.0.0'
@@ -229,24 +229,26 @@ dependencies {
229229
implementation 'com.github.skydoves:transformationlayout:1.1.3'
230230
implementation 'com.beust:klaxon:5.6'
231231
implementation 'com.alibaba:fastjson:2.0.19.graal'
232-
implementation 'com.google.code.gson:gson:2.10.1'
233-
implementation 'com.google.dagger:dagger:2.50'
234-
kapt 'com.google.dagger:dagger-compiler:2.50'
232+
implementation 'com.google.code.gson:gson:2.11.0'
233+
implementation 'com.google.dagger:dagger:2.51.1'
234+
kapt 'com.google.dagger:dagger-compiler:2.51.1'
235235

236236
// coroutines
237237
// 👇 依赖协程核心库
238238
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines"
239239
// 👇 依赖当前平台所对应的平台库
240240
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_android"
241241

242-
implementation 'io.github.scwang90:refresh-layout-kernel:2.0.6' //核心必须依赖
243-
implementation 'io.github.scwang90:refresh-header-classics:2.0.6' //经典刷新头
244-
implementation 'io.github.scwang90:refresh-header-radar:2.0.6' //雷达刷新头
245-
implementation 'io.github.scwang90:refresh-header-falsify:2.0.6' //虚拟刷新头
246-
implementation 'io.github.scwang90:refresh-header-material:2.0.6' //谷歌刷新头
247-
implementation 'io.github.scwang90:refresh-header-two-level:2.0.6' //二级刷新头
242+
implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0' //核心必须依赖
243+
implementation 'io.github.scwang90:refresh-header-classics:2.1.0' //经典刷新头
244+
implementation 'io.github.scwang90:refresh-header-radar:2.1.0' //雷达刷新头
245+
implementation 'io.github.scwang90:refresh-header-falsify:2.1.0' //虚拟刷新头
246+
implementation 'io.github.scwang90:refresh-header-material:2.1.0' //谷歌刷新头
247+
implementation 'io.github.scwang90:refresh-header-two-level:2.1.0' //二级刷新头
248248
implementation 'io.github.scwang90:refresh-footer-ball:2.1.0' //球脉冲加载
249-
implementation 'io.github.scwang90:refresh-footer-classics:2.0.6' //经典加载
249+
implementation 'io.github.scwang90:refresh-footer-classics:2.1.0' //经典加载
250250

251251
implementation 'androidx.metrics:metrics-performance:1.0.0-beta01'
252+
253+
implementation 'com.github.daquexian:FlexibleRichTextView:0.8.2'
252254
}

imitate/src/main/java/com/engineer/imitate/ui/activity/GroundDuActivity.kt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.engineer.imitate.ui.activity
22

33
import android.os.Bundle
4-
import android.view.LayoutInflater
54
import androidx.appcompat.app.AppCompatActivity
65
import com.engineer.imitate.databinding.ActivityGroundDuBinding
6+
import org.scilab.forge.jlatexmath.core.AjLatexMath
77

88
class GroundDuActivity : AppCompatActivity() {
99
private lateinit var viewBinding: ActivityGroundDuBinding
@@ -22,5 +22,15 @@ class GroundDuActivity : AppCompatActivity() {
2222
}
2323
show = !show
2424
}
25+
26+
27+
AjLatexMath.init(this)
28+
29+
val richText = "[h][center]hi![/center][/h][quote]This is quote[/quote][code]print" +
30+
"(\"Hello FlexibleRichTextView!\")[/code]Hello FlexibleRichTextView!This " +
31+
"isLaTeX:$\\e^{pi i} + 1 = 0$"
32+
viewBinding.richTv.setText(richText)
2533
}
34+
35+
2636
}

imitate/src/main/res/layout/activity_ground_du.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
android:id="@+id/test_button"
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content" />
25+
<com.daquexian.flexiblerichtextview.FlexibleRichTextView
26+
android:id="@+id/richTv"
27+
android:layout_width="match_parent"
28+
android:layout_height="wrap_content"/>
2529

2630
</LinearLayout>
2731

subs/ai/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ dependencies {
5151

5252
// AndroidDraw Library
5353
implementation 'com.github.divyanshub024:AndroidDraw:v0.1'
54-
implementation('org.tensorflow:tensorflow-lite:2.15.0') {
54+
implementation('org.tensorflow:tensorflow-lite:2.16.1') {
5555
exclude group: "com.google.inject", module: "guice"
5656
}
57-
implementation 'com.google.android.gms:play-services-tasks:18.1.0'
57+
implementation 'com.google.android.gms:play-services-tasks:18.2.0'
5858
}

subs/cpp_native/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ android {
1818
cppFlags ''
1919
}
2020
}
21+
ndk {
22+
abiFilters "arm64-v8a"
23+
}
2124
}
2225

2326
buildTypes {

subs/dataview/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
dependencies {
3333
implementation fileTree(dir: 'libs', include: ['*.jar'])
3434

35-
implementation 'androidx.appcompat:appcompat:1.6.1'
35+
implementation 'androidx.appcompat:appcompat:1.7.0'
3636
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
3737
testImplementation 'junit:junit:4.13.2'
3838
androidTestImplementation 'androidx.test:runner:1.5.2'

subs/gif-revert/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ android {
3333
dependencies {
3434
implementation fileTree(dir: 'libs', include: ['*.jar'])
3535

36-
implementation 'androidx.appcompat:appcompat:1.6.1'
36+
implementation 'androidx.appcompat:appcompat:1.7.0'
3737
testImplementation 'junit:junit:4.13.2'
3838
androidTestImplementation 'androidx.test:runner:1.5.2'
3939
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

0 commit comments

Comments
 (0)