Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Application shows error issues with Android Studio 4, due old jacoco …
…classpath. Also improved plugins statement according to last gradle documentation.
  • Loading branch information
aldajo92 committed Mar 28, 2021
commit 656928d7803736f402f5ad6eb083f33ceaa6a067
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions cache/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 3 additions & 1 deletion data/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
apply plugin: 'kotlin'
plugin {
id 'kotlin'
}

sourceCompatibility = 1.7
targetCompatibility = 1.7
Expand Down
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions mobile-ui/build.gradle
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
4 changes: 3 additions & 1 deletion presentation/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
apply plugin: 'kotlin'
plugins {
id 'kotlin'
}

sourceCompatibility = 1.7
targetCompatibility = 1.7
Expand Down
4 changes: 3 additions & 1 deletion remote/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
apply plugin: 'kotlin'
plugins {
id 'kotlin'
}

sourceCompatibility = 1.7
targetCompatibility = 1.7
Expand Down