diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 7ac24c7..674414f 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,8 +1,11 @@ + - + diff --git a/.idea/modules.xml b/.idea/modules.xml index d5cbd39..f88c884 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - - + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 225d0ff..9e0a956 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,21 +5,20 @@ plugins { id 'kotlin-android' id 'kotlin-android-extensions' id 'kotlin-kapt' - id 'org.jmailen.kotlinter' - id 'com.github.ben-manes.versions' version '0.25.0' - id 'io.gitlab.arturbosch.detekt' version '1.0.1' + id 'com.github.ben-manes.versions' version '0.29.0' + id 'io.gitlab.arturbosch.detekt' version '1.10.0' } android { - compileSdkVersion 28 - buildToolsVersion '28.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.3' defaultConfig { applicationId "net.thauvin.erik.android.tesremoteprogrammer" minSdkVersion 26 - targetSdkVersion 28 + targetSdkVersion 29 versionCode 1 - versionName "1.0-alpha" + versionName "1.0-beta" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" } buildTypes { @@ -41,13 +40,13 @@ android { ext { anko_version = '0.10.8' support_version = "28.0.0" - perms_dispatch_version = "4.5.0" + perms_dispatch_version = "4.7.0" } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.google.firebase:firebase-analytics:17.2.0' + implementation 'com.google.firebase:firebase-analytics:17.4.4' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' implementation 'androidx.legacy:legacy-support-v13:1.0.0' @@ -60,9 +59,9 @@ dependencies { implementation "org.jetbrains.anko:anko-support-v4:$anko_version" implementation "org.jetbrains.anko:anko-design:$anko_version" - implementation 'com.google.android.material:material:1.0.0' + implementation 'com.google.android.material:material:1.1.0' - implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6' // https://github.com/JakeWharton/ViewPagerIndicator implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' @@ -72,9 +71,9 @@ dependencies { kapt "org.permissionsdispatcher:permissionsdispatcher-processor:$perms_dispatch_version" // https://github.com/medyo/android-about-page - implementation 'com.github.medyo:android-about-page:1.2.5' + implementation 'com.github.medyo:android-about-page:1.3' - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13' } repositories { @@ -86,15 +85,8 @@ kapt { //generateStubs = true } -kotlinter { - ignoreFailures = false - reporters = ['html', 'plain'] - experimentalRules = false - disabledRules = ['import-ordering'] -} - detekt { input = files("src/main/java") - filters = ".*/resources/.*,.*/build/.*" + //filters = ".*/resources/.*,.*/build/.*" baseline = file("detekt-baseline.xml") } diff --git a/build.gradle b/build.gradle index f0dec81..5e1fb72 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.3.72' repositories { jcenter() google() @@ -9,10 +9,9 @@ buildscript { maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'org.jmailen.gradle:kotlinter-gradle:2.1.1' - classpath 'com.google.gms:google-services:4.3.2' + classpath 'com.google.gms:google-services:4.3.3' classpath 'io.fabric.tools:gradle:1.31.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c364f35..f6df64d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Sep 25 10:52:41 PDT 2019 +#Fri Jul 10 20:28:44 PDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip