Update dependencies
This commit is contained in:
@@ -4,8 +4,7 @@ apply plugin: 'com.github.ben-manes.versions'
|
|||||||
|
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
kotlinVersion = '1.2.71'
|
kotlinVersion = '1.3.11'
|
||||||
androidxVersion = '1.0.0'
|
|
||||||
roomVersion = '2.0.0'
|
roomVersion = '2.0.0'
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
@@ -18,8 +17,8 @@ buildscript {
|
|||||||
dependencies {
|
dependencies {
|
||||||
classpath "com.android.tools.build:gradle:3.2.1"
|
classpath "com.android.tools.build:gradle:3.2.1"
|
||||||
classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
|
classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
|
||||||
classpath 'com.google.gms:google-services:4.1.0'
|
classpath 'com.google.gms:google-services:4.2.0'
|
||||||
classpath 'io.fabric.tools:gradle:1.26.1'
|
classpath 'io.fabric.tools:gradle:1.27.0'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
25
detekt.yml
25
detekt.yml
@@ -1,4 +1,4 @@
|
|||||||
# https://github.com/arturbosch/detekt/blob/RC8/detekt-cli/src/main/resources/default-detekt-config.yml
|
# https://github.com/arturbosch/detekt/blob/RC9.2/detekt-cli/src/main/resources/default-detekt-config.yml
|
||||||
autoCorrect: true
|
autoCorrect: true
|
||||||
|
|
||||||
comments:
|
comments:
|
||||||
@@ -120,6 +120,7 @@ exceptions:
|
|||||||
- IndexOutOfBoundsException
|
- IndexOutOfBoundsException
|
||||||
- RuntimeException
|
- RuntimeException
|
||||||
- Throwable
|
- Throwable
|
||||||
|
allowedExceptionNameRegex: "^(_|(ignore|expected).*)"
|
||||||
TooGenericExceptionThrown:
|
TooGenericExceptionThrown:
|
||||||
active: true
|
active: true
|
||||||
exceptionNames:
|
exceptionNames:
|
||||||
@@ -143,8 +144,7 @@ formatting:
|
|||||||
active: true
|
active: true
|
||||||
autoCorrect: true
|
autoCorrect: true
|
||||||
ImportOrdering:
|
ImportOrdering:
|
||||||
active: true
|
active: false
|
||||||
autoCorrect: false
|
|
||||||
Indentation:
|
Indentation:
|
||||||
active: true
|
active: true
|
||||||
autoCorrect: true
|
autoCorrect: true
|
||||||
@@ -217,6 +217,11 @@ naming:
|
|||||||
ClassNaming:
|
ClassNaming:
|
||||||
active: true
|
active: true
|
||||||
classPattern: '[A-Z$][a-zA-Z0-9$]*'
|
classPattern: '[A-Z$][a-zA-Z0-9$]*'
|
||||||
|
ConstructorParameterNaming:
|
||||||
|
active: true
|
||||||
|
parameterPattern: '[a-z][A-Za-z0-9]*'
|
||||||
|
privateParameterPattern: '[a-z][A-Za-z0-9]*'
|
||||||
|
excludeClassPattern: '$^'
|
||||||
EnumNaming:
|
EnumNaming:
|
||||||
active: true
|
active: true
|
||||||
enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
|
enumEntryPattern: '^[A-Z][_a-zA-Z0-9]*'
|
||||||
@@ -233,14 +238,20 @@ naming:
|
|||||||
active: true
|
active: true
|
||||||
functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
|
functionPattern: '^([a-z$][a-zA-Z$0-9]*)|(`.*`)$'
|
||||||
excludeClassPattern: '$^'
|
excludeClassPattern: '$^'
|
||||||
|
ignoreOverridden: true
|
||||||
|
FunctionParameterNaming:
|
||||||
|
active: true
|
||||||
|
parameterPattern: '[a-z][A-Za-z0-9]*'
|
||||||
|
excludeClassPattern: '$^'
|
||||||
MatchingDeclarationName:
|
MatchingDeclarationName:
|
||||||
active: true
|
active: true
|
||||||
MemberNameEqualsClassName:
|
MemberNameEqualsClassName:
|
||||||
active: false
|
active: false
|
||||||
ObjectPropertyNaming:
|
ObjectPropertyNaming:
|
||||||
active: true
|
active: true
|
||||||
propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
|
|
||||||
constantPattern: '[A-Za-z][_A-Za-z0-9]*'
|
constantPattern: '[A-Za-z][_A-Za-z0-9]*'
|
||||||
|
propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
|
||||||
|
privatePropertyPattern: '(_)?[A-Za-z][A-Za-z0-9]*'
|
||||||
PackageNaming:
|
PackageNaming:
|
||||||
active: true
|
active: true
|
||||||
packagePattern: '^[a-z]+(\.[a-z][a-z0-9]*)*$'
|
packagePattern: '^[a-z]+(\.[a-z][a-z0-9]*)*$'
|
||||||
@@ -259,6 +270,7 @@ naming:
|
|||||||
variablePattern: '[a-z][A-Za-z0-9]*'
|
variablePattern: '[a-z][A-Za-z0-9]*'
|
||||||
privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
|
privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
|
||||||
excludeClassPattern: '$^'
|
excludeClassPattern: '$^'
|
||||||
|
ignoreOverridden: true
|
||||||
|
|
||||||
performance:
|
performance:
|
||||||
active: true
|
active: true
|
||||||
@@ -318,6 +330,8 @@ style:
|
|||||||
ForbiddenImport:
|
ForbiddenImport:
|
||||||
active: true
|
active: true
|
||||||
imports: ''
|
imports: ''
|
||||||
|
ForbiddenVoid:
|
||||||
|
active: true
|
||||||
FunctionOnlyReturningConstant:
|
FunctionOnlyReturningConstant:
|
||||||
active: true
|
active: true
|
||||||
ignoreOverridableFunction: true
|
ignoreOverridableFunction: true
|
||||||
@@ -372,8 +386,11 @@ style:
|
|||||||
active: true
|
active: true
|
||||||
UnnecessaryAbstractClass:
|
UnnecessaryAbstractClass:
|
||||||
active: true
|
active: true
|
||||||
|
excludeAnnotatedClasses: "dagger.Module"
|
||||||
UnnecessaryInheritance:
|
UnnecessaryInheritance:
|
||||||
active: true
|
active: true
|
||||||
|
UnnecessaryLet:
|
||||||
|
active: true
|
||||||
UnnecessaryParentheses:
|
UnnecessaryParentheses:
|
||||||
active: true
|
active: true
|
||||||
UntilInsteadOfRangeTo:
|
UntilInsteadOfRangeTo:
|
||||||
|
|||||||
@@ -8,6 +8,10 @@ if (getGradle().getStartParameter().getTaskRequests().toString().contains("Base"
|
|||||||
android {
|
android {
|
||||||
buildToolsVersion "28.0.3"
|
buildToolsVersion "28.0.3"
|
||||||
compileSdkVersion 28
|
compileSdkVersion 28
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility 1.8
|
||||||
|
targetCompatibility 1.8
|
||||||
|
}
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "be.mygod.vpnhotspot"
|
applicationId "be.mygod.vpnhotspot"
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
@@ -56,20 +60,20 @@ android {
|
|||||||
dependencies {
|
dependencies {
|
||||||
kapt "androidx.room:room-compiler:$roomVersion"
|
kapt "androidx.room:room-compiler:$roomVersion"
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation "androidx.browser:browser:$androidxVersion"
|
implementation "androidx.browser:browser:1.0.0"
|
||||||
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
|
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
|
||||||
implementation "androidx.core:core-ktx:$androidxVersion"
|
implementation "androidx.core:core-ktx:1.0.1"
|
||||||
implementation "androidx.preference:preference:$androidxVersion"
|
implementation "androidx.preference:preference:1.0.0"
|
||||||
implementation "androidx.room:room-runtime:$roomVersion"
|
implementation "androidx.room:room-runtime:$roomVersion"
|
||||||
implementation 'com.github.luongvo:BadgeView:1.1.5'
|
implementation 'com.github.luongvo:BadgeView:1.1.5'
|
||||||
implementation 'com.github.topjohnwu:libsu:2.0.2'
|
implementation 'com.github.topjohnwu:libsu:2.1.2'
|
||||||
implementation "com.google.android.material:material:$androidxVersion"
|
implementation "com.google.android.material:material:1.0.0"
|
||||||
implementation 'com.jakewharton.timber:timber:4.7.1'
|
implementation 'com.jakewharton.timber:timber:4.7.1'
|
||||||
implementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.1'
|
implementation 'com.linkedin.dexmaker:dexmaker-mockito:2.19.1'
|
||||||
implementation 'com.takisoft.preferencex:preferencex:1.0.0'
|
implementation 'com.takisoft.preferencex:preferencex:1.0.0'
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
|
||||||
baseImplementation 'com.android.billingclient:billing:1.2'
|
baseImplementation 'com.android.billingclient:billing:1.2'
|
||||||
baseImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
|
baseImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.7'
|
||||||
testImplementation "androidx.room:room-testing:$roomVersion"
|
testImplementation "androidx.room:room-testing:$roomVersion"
|
||||||
testImplementation 'junit:junit:4.12'
|
testImplementation 'junit:junit:4.12'
|
||||||
androidTestImplementation 'androidx.test:runner:1.1.0'
|
androidTestImplementation 'androidx.test:runner:1.1.0'
|
||||||
|
|||||||
Reference in New Issue
Block a user