diff --git a/.travis.yml b/.travis.yml index 1ae7e28..48cfc50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,11 @@ env: global: - ANDROID_API_LEVEL=26 - EMULATOR_API_LEVEL=22 - - ANDROID_BUILD_TOOLS_VERSION=26.0.0 + - ANDROID_BUILD_TOOLS_VERSION=29.0.0 - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis - ANDROID_TARGET=android-$ANDROID_API_LEVEL + - ANDROID_ABI=armeabi-v7a - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default) android: @@ -30,10 +31,10 @@ android: - extra-google-m2repository - extra-android-m2repository # Specify at least one system image - - sys-img-armeabi-v7a-android-$EMULATOR_API_LEVEL + - sys-img-$ANDROID_ABI-google_apis-$EMULATOR_API_LEVEL before_script: - - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi armeabi-v7a + - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi google_apis/$ANDROID_ABI - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & diff --git a/build.gradle b/build.gradle index 7fd981b..0ae8eb3 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.1.3-2' + ext.kotlin_version = '1.4.30' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-beta2' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.dicedmelon.gradle:jacoco-android:0.1.1" + classpath "org.jacoco:org.jacoco.core:0.8.4" // NOTE: Do not place your application dependencies here; they belong diff --git a/cache/build.gradle b/cache/build.gradle index 2bf9c33..3bda2a2 100644 --- a/cache/build.gradle +++ b/cache/build.gradle @@ -1,5 +1,7 @@ -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +plugins { + id 'com.android.library' + id 'kotlin-android' +} android { def globalConfiguration = rootProject.extensions.getByName("ext") diff --git a/dependencies.gradle b/dependencies.gradle index 4956e37..bd6e608 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,14 +1,14 @@ ext { //Android - androidBuildToolsVersion = "26.0.0" - androidMinSdkVersion = 15 - androidTargetSdkVersion = 26 - androidCompileSdkVersion = 26 + androidBuildToolsVersion = "29.0.2" + androidMinSdkVersion = 21 + androidTargetSdkVersion = 30 + androidCompileSdkVersion = 30 //Libraries kotlinVersion = '1.1.3-2' - rxKotlinVersion = '2.1.0' + rxKotlinVersion = '2.4.0' rxAndroidVersion = '2.0.1' javaxAnnotationVersion = '1.0' javaxInjectVersion = '1' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b242b1f..fb10c52 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Aug 11 10:04:50 IST 2017 +#Sun Mar 28 01:14:03 COT 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/mobile-ui/build.gradle b/mobile-ui/build.gradle index 582ac36..00ea0b5 100644 --- a/mobile-ui/build.gradle +++ b/mobile-ui/build.gradle @@ -1,8 +1,9 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' -apply plugin: 'jacoco-android' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'kotlin-android-extensions' + id 'kotlin-kapt' +} android { def globalConfiguration = rootProject.extensions.getByName("ext")