gitea/legado
gitea/legado
1
1
Fork 0
mirror of https://github.com/gedoor/legado.git synced 2024-09-01 09:34:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新kotlin版本

Browse Source 
更新kotlin 1.7.0
更新Compose 1.2.0
更新room 2.5.0-alpha02 旧版本不支持kotlin 1.7.0
This commit is contained in:
ag2s20150909 2022-07-03 11:40:53 +08:00
parent 70024a6003
commit a7505a6c5e
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/build.gradle
View File

@ -110,7 +110,7 @@ android {
targetCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11
} }
composeOptions { composeOptions {
kotlinCompilerExtensionVersion '1.1.1' kotlinCompilerExtensionVersion "$compose_compiler_version"
} }
sourceSets { sourceSets {
@ -180,31 +180,32 @@ dependencies {
// Integration with activities // Integration with activities
implementation 'androidx.activity:activity-compose:1.5.0' implementation 'androidx.activity:activity-compose:1.5.0'
// Compose Material Design // Compose Material Design
implementation 'androidx.compose.material:material:1.1.1' implementation "androidx.compose.material:material:$compose_version"
// Animations // Animations
implementation 'androidx.compose.animation:animation:1.1.1' implementation "androidx.compose.animation:animation:$compose_version"
// Tooling support (Previews, etc.) // Tooling support (Previews, etc.)
implementation 'androidx.compose.ui:ui-tooling:1.1.1' implementation "androidx.compose.ui:ui-tooling:$compose_version"
// UI Tests // UI Tests
androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.1.1' androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
//media //media
implementation("androidx.media:media:1.6.0") implementation("androidx.media:media:1.6.0")
def exoplayer_version = '2.18.0'
implementation("com.google.android.exoplayer:exoplayer-core:$exoplayer_version") implementation("com.google.android.exoplayer:exoplayer-core:$exoplayer_version")
implementation("com.google.android.exoplayer:extension-okhttp:$exoplayer_version") implementation("com.google.android.exoplayer:extension-okhttp:$exoplayer_version")
//Splitties //Splitties
def splitties_version = '3.0.0'
implementation("com.louiscad.splitties:splitties-appctx:$splitties_version") implementation("com.louiscad.splitties:splitties-appctx:$splitties_version")
implementation("com.louiscad.splitties:splitties-systemservices:$splitties_version") implementation("com.louiscad.splitties:splitties-systemservices:$splitties_version")
implementation("com.louiscad.splitties:splitties-views:$splitties_version") implementation("com.louiscad.splitties:splitties-views:$splitties_version")
//room //room
def room_version = '2.4.2'
implementation("androidx.room:room-runtime:$room_version") implementation("androidx.room:room-runtime:$room_version")
implementation("androidx.room:room-ktx:$room_version") implementation("androidx.room:room-ktx:$room_version")
kapt("androidx.room:room-compiler:$room_version") kapt("androidx.room:room-compiler:$room_version")
//ksp("androidx.room:room-compiler:$room_version")
testImplementation("androidx.room:room-testing:$room_version") testImplementation("androidx.room:room-testing:$room_version")
//liveEventBus //liveEventBus

1
app/src/main/java/io/legado/app/ui/rss/read/ReadRssViewModel.kt
View File

@ -240,6 +240,7 @@ class ReadRssViewModel(application: Application) : BaseViewModel(application),
callBack?.upTtsMenu(false) callBack?.upTtsMenu(false)
} }
@Deprecated("Deprecated in Java")
override fun onError(s: String) { override fun onError(s: String) {
} }

7
build.gradle
View File

@ -2,8 +2,13 @@
buildscript { buildscript {
ext{ ext{
kotlin_version = '1.6.10' kotlin_version = '1.7.0'
compose_version = '1.2.0-rc03'
compose_compiler_version = '1.2.0'
agp_version= '7.2.1' agp_version= '7.2.1'
exoplayer_version = '2.18.0'
splitties_version = '3.0.0'
room_version = '2.5.0-alpha02'
} }
} }