diff --git a/.travis.yml b/.travis.yml index c6658aab..07c1054f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ android: components: - tools - platform-tools - - build-tools-29.0.2 - - android-29 + - build-tools-30.0.2 + - android-30 - extra - "$ANDROID_TARGET" - sys-img-${ANDROID_ABI}-${ANDROID_TARGET} @@ -22,6 +22,7 @@ android: # -in secrets.tar.enc -out secrets.tar -d # - tar xvf secrets.tar script: + - yes | sdkmanager "platforms;android-30" - "./gradlew build jacocoTestReport assembleAndroidTest" - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI - emulator -avd test -no-audio -no-window & diff --git a/app/build.gradle b/app/build.gradle index 952fb2a9..cdf06556 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ plugins { id("kotlin-android") id("kotlin-android-extensions") id("kotlin-kapt") - id("jacoco-android") + id ("com.hiya.jacoco-android") id("com.mikepenz.aboutlibraries.plugin") id("com.google.firebase.crashlytics") } @@ -39,8 +39,8 @@ jacocoAndroidUnitTestReport { android { - compileSdkVersion compileSdk - buildToolsVersion buildTools + compileSdkVersion rootProject.ext.compileSdk + buildToolsVersion rootProject.ext.buildTools // signingConfigs { // release { @@ -53,7 +53,7 @@ android { defaultConfig { applicationId "com.k0d4black.theforce" - minSdkVersion minSdk + minSdkVersion rootProject.ext.minSdk targetSdkVersion targetSdk versionCode versionCodeMajor * 10000 + versionCodeMinor * 100 + versionCodePatch versionName versionName diff --git a/build.gradle b/build.gradle index 59611d5a..8343418f 100644 --- a/build.gradle +++ b/build.gradle @@ -16,13 +16,16 @@ buildscript { repositories { google() jcenter() + maven { + url "https://plugins.gradle.org/m2/" + } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'com.google.gms:google-services:4.3.3' - classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.1.1' + classpath 'com.google.gms:google-services:4.3.8' + classpath "com.hiya:jacoco-android:0.2" + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.1' classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:8.1.2" } } diff --git a/data-local/build.gradle b/data-local/build.gradle index 4f22667d..ae34ab0e 100644 --- a/data-local/build.gradle +++ b/data-local/build.gradle @@ -19,11 +19,11 @@ plugins { } android { - compileSdkVersion compileSdk - buildToolsVersion buildTools + compileSdkVersion rootProject.ext.compileSdk + buildToolsVersion rootProject.ext.buildTools defaultConfig { - minSdkVersion minSdk + minSdkVersion rootProject.ext.minSdk targetSdkVersion targetSdk testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -62,4 +62,5 @@ dependencies { testImplementation testDependencies.androidxJunit testImplementation testDependencies.coroutinesTest testImplementation testDependencies.robolectric + testImplementation appDependencies.lifecycleExtensions } \ No newline at end of file diff --git a/dependencies.gradle b/dependencies.gradle index fd63ae06..19f2f951 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,13 +1,13 @@ ext { // Kotlin - kotlinVersion = '1.3.72' + kotlinVersion = '1.5.10' // Android Core - compileSdk = 29 - targetSdk = 29 + compileSdk = 30 + targetSdk = 30 minSdk = 21 - buildTools = "29.0.2" + buildTools = "30.0.2" // App Versioning versionCodeMajor = 2 @@ -16,44 +16,44 @@ ext { versionName = "$versionCodeMajor.$versionCodeMinor.$versionCodePatch" // Dependencies Version - Presentation - appcompatVersion = '1.1.0' - androidxCoreKtxVersion = '1.1.0' - constraintLayoutVersion = '1.1.3' + appcompatVersion = '1.3.0' + androidxCoreKtxVersion = '1.5.0' + constraintLayoutVersion = '2.0.4' supportV4Version = '1.0.0' navVersion = '2.1.0' - materialVersion = '1.1.0-beta02' - analyticsVersion = '17.4.3' - fragmentKtxVersion = '1.1.0' - leakCanaryVersion = '2.0' - koinVersion = '2.1.5' - crashlyticsVersion = '17.0.1' - lifecycleExtensionsVersion = '2.1.0' - recyclerviewAnimationVersion = '3.0.0' - aboutLibsVersion = '8.0.0-rc01' - stethoVersion = '1.5.1' + materialVersion = '1.3.0' + analyticsVersion = '18.0.3' + fragmentKtxVersion = '1.3.4' + leakCanaryVersion = '2.7' + koinVersion = '2.2.2' + crashlyticsVersion = '18.0.0' + lifecycleExtensionsVersion = '2.2.0' + recyclerviewAnimationVersion = '4.0.2' + aboutLibsVersion = '8.8.6' + stethoVersion = '1.6.0' kielVersion = '1.2.1' // Data - retrofitVersion = '2.7.0' - moshiConverterVersion = '2.7.0' - loggingInterceptorVersion = '4.2.1' - roomVersion = '2.2.5' + retrofitVersion = '2.9.0' + moshiConverterVersion = '2.9.0' + loggingInterceptorVersion = '4.9.1' + roomVersion = '2.3.0' // Domain - coroutinesCoreVersion = '1.3.3' + coroutinesCoreVersion = '1.5.0' // Testing mockitoVersion = '3.2.4' - junitVersion = '4.12' - espressoVersion = '3.2.0' + junitVersion = '4.13.2' + espressoVersion = '3.3.0' androidxJunitVersion = '1.1.1' - truthVersion = '1.0' + truthVersion = '1.1.2' mockitoInlineVersion = '2.13.0' - mockWebServerVersion = '4.2.1' - robolectricVersion = '4.3' - androidxTestCoreVersion = '1.0.0' - runnerVersion = '1.2.0' - rulesVersion = '1.2.0' + mockWebServerVersion = '4.9.1' + robolectricVersion = '4.5.1' + androidxTestCoreVersion = '1.3.0' + runnerVersion = '1.3.0' + rulesVersion = '1.3.0' archComponentTestVersion = '2.1.0' @@ -73,7 +73,7 @@ ext { aboutLibraryCore : "com.mikepenz:aboutlibraries-core:$aboutLibsVersion", aboutLibraryUi : "com.mikepenz:aboutlibraries:$aboutLibsVersion", koinAndroid : "org.koin:koin-android:$koinVersion", - koinLifeCycleScope : "org.koin:koin-android-scope:$koinVersion", + koinLifeCycleScope : "org.koin:koin-androidx-scope:$koinVersion", koinAndroidViewModel : "org.koin:koin-androidx-viewmodel:$koinVersion", stetho : "com.facebook.stetho:stetho:$stethoVersion", kiel : "me.ibrahimyilmaz:kiel:$kielVersion" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f25ed4f..5ed5edb5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip \ No newline at end of file