From 656928d7803736f402f5ad6eb083f33ceaa6a067 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 02:00:25 -0500 Subject: [PATCH 1/9] Application shows error issues with Android Studio 4, due old jacoco classpath. Also improved plugins statement according to last gradle documentation. --- build.gradle | 6 +++--- cache/build.gradle | 6 ++++-- data/build.gradle | 4 +++- dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- mobile-ui/build.gradle | 11 ++++++----- presentation/build.gradle | 4 +++- remote/build.gradle | 4 +++- 8 files changed, 25 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 7fd981b..d2ee710 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.2' 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/data/build.gradle b/data/build.gradle index da757a9..088cf35 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -1,4 +1,6 @@ -apply plugin: 'kotlin' +plugin { + id 'kotlin' +} sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/dependencies.gradle b/dependencies.gradle index 4956e37..1bccaf0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -8,7 +8,7 @@ ext { //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") diff --git a/presentation/build.gradle b/presentation/build.gradle index 2d908d0..e14b8c6 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -1,4 +1,6 @@ -apply plugin: 'kotlin' +plugins { + id 'kotlin' +} sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/remote/build.gradle b/remote/build.gradle index 9e98056..8174dba 100644 --- a/remote/build.gradle +++ b/remote/build.gradle @@ -1,4 +1,6 @@ -apply plugin: 'kotlin' +plugins { + id 'kotlin' +} sourceCompatibility = 1.7 targetCompatibility = 1.7 From c286dd056bd986ce2bccd6cb54130555b8efb67d Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 02:17:14 -0500 Subject: [PATCH 2/9] revert unnecesary plugins block --- data/build.gradle | 4 +--- dependencies.gradle | 8 ++++---- presentation/build.gradle | 4 +--- remote/build.gradle | 4 +--- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/data/build.gradle b/data/build.gradle index 088cf35..da757a9 100644 --- a/data/build.gradle +++ b/data/build.gradle @@ -1,6 +1,4 @@ -plugin { - id 'kotlin' -} +apply plugin: 'kotlin' sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/dependencies.gradle b/dependencies.gradle index 1bccaf0..51c305e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ ext { //Android - androidBuildToolsVersion = "26.0.0" - androidMinSdkVersion = 15 - androidTargetSdkVersion = 26 - androidCompileSdkVersion = 26 + androidBuildToolsVersion = "30.0.0" + androidMinSdkVersion = 21 + androidTargetSdkVersion = 30 + androidCompileSdkVersion = 30 //Libraries kotlinVersion = '1.1.3-2' diff --git a/presentation/build.gradle b/presentation/build.gradle index e14b8c6..2d908d0 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -1,6 +1,4 @@ -plugins { - id 'kotlin' -} +apply plugin: 'kotlin' sourceCompatibility = 1.7 targetCompatibility = 1.7 diff --git a/remote/build.gradle b/remote/build.gradle index 8174dba..9e98056 100644 --- a/remote/build.gradle +++ b/remote/build.gradle @@ -1,6 +1,4 @@ -plugins { - id 'kotlin' -} +apply plugin: 'kotlin' sourceCompatibility = 1.7 targetCompatibility = 1.7 From 5af4aa7dae18b5f557c470f8d357b721585f700e Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 02:20:19 -0500 Subject: [PATCH 3/9] update container env variables --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ae7e28..49d58b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ jdk: env: global: - - ANDROID_API_LEVEL=26 - - EMULATOR_API_LEVEL=22 - - ANDROID_BUILD_TOOLS_VERSION=26.0.0 + - ANDROID_API_LEVEL=30 + - EMULATOR_API_LEVEL=30 + - ANDROID_BUILD_TOOLS_VERSION=30.0.0 - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis - ANDROID_TARGET=android-$ANDROID_API_LEVEL From 642fbe90eff800d8d1e15a42d0ee1cf1b99283b2 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 03:08:58 -0500 Subject: [PATCH 4/9] upgrade ANDROID_BUILD_TOOLS_VERSION on container --- .travis.yml | 2 +- build.gradle | 2 +- dependencies.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 49d58b2..5e838fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: global: - ANDROID_API_LEVEL=30 - EMULATOR_API_LEVEL=30 - - ANDROID_BUILD_TOOLS_VERSION=30.0.0 + - ANDROID_BUILD_TOOLS_VERSION=29.0.2 - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis - ANDROID_TARGET=android-$ANDROID_API_LEVEL diff --git a/build.gradle b/build.gradle index d2ee710..0ae8eb3 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.2' + classpath 'com.android.tools.build:gradle:4.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jacoco:org.jacoco.core:0.8.4" diff --git a/dependencies.gradle b/dependencies.gradle index 51c305e..bd6e608 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ ext { //Android - androidBuildToolsVersion = "30.0.0" + androidBuildToolsVersion = "29.0.2" androidMinSdkVersion = 21 androidTargetSdkVersion = 30 androidCompileSdkVersion = 30 From 46735d1ce680980e0cd06083ecff59e252e860a4 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 03:18:25 -0500 Subject: [PATCH 5/9] improve container --- .travis.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e838fa..bed4bc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ jdk: env: global: - - ANDROID_API_LEVEL=30 - - EMULATOR_API_LEVEL=30 + - ANDROID_API_LEVEL=29 + - EMULATOR_API_LEVEL=29 - ANDROID_BUILD_TOOLS_VERSION=29.0.2 - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis @@ -33,9 +33,11 @@ android: - sys-img-armeabi-v7a-android-$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 armeabi-v7a -c 32M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator + - sleep 180 + - adb devices - adb shell input keyevent 82 & script: From 9a2fa4096f03268e2b1d9c6bce0207842479ec28 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 03:27:05 -0500 Subject: [PATCH 6/9] improve container --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bed4bc5..b57a348 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ env: - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis - ANDROID_TARGET=android-$ANDROID_API_LEVEL + - ANDROID_ABI=google_apis/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-armeabi-v7a-addon-google_apis-google-$EMULATOR_API_LEVEL before_script: - - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi armeabi-v7a -c 32M + - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi $ANDROID_ABI -c 32M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - sleep 180 From 8077b519085864a1ef541bdc3f6d0ea57275a1b8 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 03:39:53 -0500 Subject: [PATCH 7/9] improve container --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b57a348..c95b87a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,13 +5,13 @@ jdk: env: global: - - ANDROID_API_LEVEL=29 - - EMULATOR_API_LEVEL=29 - - ANDROID_BUILD_TOOLS_VERSION=29.0.2 + - ANDROID_API_LEVEL=26 + - EMULATOR_API_LEVEL=22 + - ANDROID_BUILD_TOOLS_VERSION=26.0.1 - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis - ANDROID_TARGET=android-$ANDROID_API_LEVEL - - ANDROID_ABI=google_apis/armeabi-v7a + - ANDROID_ABI=armeabi-v7a - ADB_INSTALL_TIMEOUT=20 # minutes (2 minutes by default) android: @@ -31,10 +31,10 @@ android: - extra-google-m2repository - extra-android-m2repository # Specify at least one system image - - sys-img-armeabi-v7a-addon-google_apis-google-$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 $ANDROID_ABI -c 32M + - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi google_apis/$ANDROID_ABI -c 32M - emulator -avd test -no-audio -no-window & - android-wait-for-emulator - sleep 180 From ffda3c11d7f2a972d2a13167bf91e02efe996ce0 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 03:55:30 -0500 Subject: [PATCH 8/9] improve container --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c95b87a..521f602 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ env: global: - ANDROID_API_LEVEL=26 - EMULATOR_API_LEVEL=22 - - ANDROID_BUILD_TOOLS_VERSION=26.0.1 + - ANDROID_BUILD_TOOLS_VERSION=29.0.0 - ANDROID_ABI=armeabi-v7a - ANDROID_TAG=google_apis - ANDROID_TARGET=android-$ANDROID_API_LEVEL @@ -34,7 +34,7 @@ android: - 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 google_apis/$ANDROID_ABI -c 32M + - 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 - sleep 180 From 3e866065df535d5578dd213b447bd6ad69b6b286 Mon Sep 17 00:00:00 2001 From: aldajo92 Date: Sun, 28 Mar 2021 11:15:30 -0500 Subject: [PATCH 9/9] improve container --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 521f602..48cfc50 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,6 @@ before_script: - 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 - - sleep 180 - - adb devices - adb shell input keyevent 82 & script: