Update dependencies

This commit is contained in:
Mygod
2020-12-10 05:59:45 +08:00
parent aa9cc98581
commit 427e565d36
3 changed files with 38 additions and 12 deletions

View File

@@ -1,5 +1,5 @@
plugins { plugins {
id("com.github.ben-manes.versions") version "0.34.0" id("com.github.ben-manes.versions") version "0.36.0"
} }
buildscript { buildscript {
@@ -9,9 +9,9 @@ buildscript {
} }
dependencies { dependencies {
classpath(kotlin("gradle-plugin", "1.4.10")) classpath(kotlin("gradle-plugin", "1.4.21"))
classpath("com.android.tools.build:gradle:4.1.0") classpath("com.android.tools.build:gradle:4.1.1")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.3.0") classpath("com.google.firebase:firebase-crashlytics-gradle:2.4.1")
classpath("com.google.android.gms:oss-licenses-plugin:0.10.2") classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")
classpath("com.google.gms:google-services:4.3.4") classpath("com.google.gms:google-services:4.3.4")
} }

View File

@@ -1,4 +1,4 @@
# https://github.com/arturbosch/detekt/blob/v1.10.0/detekt-core/src/main/resources/default-detekt-config.yml # https://github.com/detekt/detekt/blob/v1.14.2/detekt-core/src/main/resources/default-detekt-config.yml
comments: comments:
active: false active: false
@@ -39,6 +39,8 @@ complexity:
NestedBlockDepth: NestedBlockDepth:
active: true active: true
threshold: 4 threshold: 4
ReplaceSafeCallChainWithRun:
active: true
StringLiteralDuplication: StringLiteralDuplication:
active: true active: true
excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
@@ -64,6 +66,8 @@ coroutines:
active: false active: false
RedundantSuspendModifier: RedundantSuspendModifier:
active: true active: true
SuspendFunWithFlowReturnType:
active: true
empty-blocks: empty-blocks:
active: true active: true
@@ -130,6 +134,7 @@ exceptions:
active: true active: true
ThrowingExceptionsWithoutMessageOrCause: ThrowingExceptionsWithoutMessageOrCause:
active: true active: true
excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
exceptions: exceptions:
- IllegalArgumentException - IllegalArgumentException
- IllegalStateException - IllegalStateException
@@ -152,6 +157,11 @@ formatting:
autoCorrect: true autoCorrect: true
AnnotationOnSeparateLine: AnnotationOnSeparateLine:
active: false active: false
AnnotationSpacing:
active: true
autoCorrect: true
ArgumentListWrapping:
active: false
ChainWrapping: ChainWrapping:
active: true active: true
autoCorrect: true autoCorrect: true
@@ -302,6 +312,9 @@ naming:
mustBeFirst: true mustBeFirst: true
MemberNameEqualsClassName: MemberNameEqualsClassName:
active: false active: false
NonBooleanPropertyPrefixedWithIs:
active: true
excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
ObjectPropertyNaming: ObjectPropertyNaming:
active: true active: true
excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
@@ -378,6 +391,8 @@ potential-bugs:
active: true active: true
MissingWhenCase: MissingWhenCase:
active: false active: false
NullableToStringCall:
active: true
RedundantElseInWhen: RedundantElseInWhen:
active: true active: true
UnconditionalJumpStatementInLoop: UnconditionalJumpStatementInLoop:
@@ -399,6 +414,8 @@ potential-bugs:
style: style:
active: true active: true
ClassOrdering:
active: false
CollapsibleIfStatements: CollapsibleIfStatements:
active: true active: true
DataClassContainsFunctions: DataClassContainsFunctions:
@@ -441,6 +458,8 @@ style:
excludeAnnotatedFunction: ['dagger.Provides'] excludeAnnotatedFunction: ['dagger.Provides']
LibraryCodeMustSpecifyReturnType: LibraryCodeMustSpecifyReturnType:
active: true active: true
LibraryEntitiesShouldNotBePublic:
active: true
LoopWithTooManyJumpStatements: LoopWithTooManyJumpStatements:
active: true active: true
maxJumpCount: 1 maxJumpCount: 1
@@ -518,14 +537,20 @@ style:
allowedNames: '(_|ignored|expected|serialVersionUID)' allowedNames: '(_|ignored|expected|serialVersionUID)'
UseArrayLiteralsInAnnotations: UseArrayLiteralsInAnnotations:
active: true active: true
UseCheckNotNull:
active: true
UseCheckOrError: UseCheckOrError:
active: true active: true
UseDataClass: UseDataClass:
active: false active: false
UseEmptyCounterpart:
active: true
UseIfInsteadOfWhen: UseIfInsteadOfWhen:
active: false active: false
UseRequire: UseRequire:
active: true active: true
UseRequireNotNull:
active: true
UselessCallOnNotNull: UselessCallOnNotNull:
active: true active: true
UtilityClassWithPublicConstructor: UtilityClassWithPublicConstructor:

View File

@@ -11,7 +11,7 @@ plugins {
android { android {
val javaVersion = JavaVersion.VERSION_1_8 val javaVersion = JavaVersion.VERSION_1_8
val targetSdk = 29 val targetSdk = 29
buildToolsVersion("30.0.2") buildToolsVersion("30.0.3")
compileOptions { compileOptions {
isCoreLibraryDesugaringEnabled = true isCoreLibraryDesugaringEnabled = true
sourceCompatibility = javaVersion sourceCompatibility = javaVersion
@@ -70,30 +70,31 @@ dependencies {
val lifecycleVersion = "2.3.0-beta01" val lifecycleVersion = "2.3.0-beta01"
val roomVersion = "2.2.5" val roomVersion = "2.2.5"
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.0") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.1")
kapt("androidx.room:room-compiler:$roomVersion") kapt("androidx.room:room-compiler:$roomVersion")
implementation(kotlin("stdlib-jdk8"))
implementation("androidx.appcompat:appcompat:1.3.0-alpha02") // https://issuetracker.google.com/issues/151603528 implementation("androidx.appcompat:appcompat:1.3.0-alpha02") // https://issuetracker.google.com/issues/151603528
implementation("androidx.browser:browser:1.2.0") implementation("androidx.browser:browser:1.3.0")
implementation("androidx.core:core-ktx:1.3.2") implementation("androidx.core:core-ktx:1.3.2")
implementation("androidx.emoji:emoji:1.1.0") implementation("androidx.emoji:emoji:1.1.0")
implementation("androidx.fragment:fragment-ktx:1.3.0-beta01") implementation("androidx.fragment:fragment-ktx:1.3.0-beta02")
implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion")
implementation("androidx.preference:preference:1.1.1") implementation("androidx.preference:preference:1.1.1")
implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
implementation("com.android.billingclient:billing-ktx:3.0.1") implementation("com.android.billingclient:billing-ktx:3.0.2")
implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") implementation("com.google.android.gms:play-services-oss-licenses:17.0.0")
implementation("com.google.android.material:material:1.2.1") implementation("com.google.android.material:material:1.2.1")
implementation("com.google.firebase:firebase-analytics-ktx:18.0.0") implementation("com.google.firebase:firebase-analytics-ktx:18.0.0")
implementation("com.google.firebase:firebase-crashlytics:17.2.2") implementation("com.google.firebase:firebase-crashlytics:17.3.0")
implementation("com.google.zxing:core:3.4.1") implementation("com.google.zxing:core:3.4.1")
implementation("com.jakewharton.timber:timber:4.7.1") implementation("com.jakewharton.timber:timber:4.7.1")
implementation("com.linkedin.dexmaker:dexmaker:2.28.0") implementation("com.linkedin.dexmaker:dexmaker:2.28.0")
implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.3") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.0") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2")
testImplementation("junit:junit:4.13.1") testImplementation("junit:junit:4.13.1")
androidTestImplementation("androidx.room:room-testing:$roomVersion") androidTestImplementation("androidx.room:room-testing:$roomVersion")
androidTestImplementation("androidx.test:runner:1.3.0") androidTestImplementation("androidx.test:runner:1.3.0")