From 48f1307095e51b3fb3227232bea40a0b60be24a2 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 19 May 2021 11:32:14 +0200 Subject: [PATCH] Revert "Aggiornati build.gradle" This reverts commit 97bf8c291ac02724ce682216d8a334167da7a96e. # Conflicts: # dynamic_frudis/build.gradle # dynamic_ime/build.gradle # dynamic_saporiveri/build.gradle # dynamic_saporiveri_pv/build.gradle # dynamic_vgalimenti/build.gradle --- app/build.gradle | 12 ++++++------ build.gradle | 4 ++-- dynamic_frudis/build.gradle | 14 +++++++------- dynamic_ime/build.gradle | 15 ++++++++------- dynamic_saporiveri/build.gradle | 14 ++++++++------ dynamic_saporiveri_pv/build.gradle | 14 ++++++++------ dynamic_vgalimenti/build.gradle | 7 ++----- 7 files changed, 41 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2ce11e49..29f82aa6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -92,11 +92,11 @@ dependencies { // Import the Firebase BoM implementation platform('com.google.firebase:firebase-bom:26.3.0') - implementation 'com.google.firebase:firebase-analytics:19.0.0' - implementation 'com.google.firebase:firebase-core:19.0.0' - implementation 'com.google.firebase:firebase-crash:16.2.1' - implementation 'com.google.firebase:firebase-crashlytics:18.0.0' - implementation 'com.google.firebase:firebase-perf:20.0.0' + implementation 'com.google.firebase:firebase-analytics' + implementation 'com.google.firebase:firebase-core' + implementation 'com.google.firebase:firebase-crash' + implementation 'com.google.firebase:firebase-crashlytics' + implementation 'com.google.firebase:firebase-perf' implementation 'com.google.android.gms:play-services-basement:17.6.0' @@ -117,7 +117,7 @@ dependencies { implementation 'org.apache.commons:commons-text:1.9' //MVVM - def dagger2_version = '2.35.1' + def dagger2_version = '2.29.1' api "com.google.dagger:dagger:$dagger2_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version" api "com.google.dagger:dagger-android:$dagger2_version" diff --git a/build.gradle b/build.gradle index ce2b843f..02f7745c 100644 --- a/build.gradle +++ b/build.gradle @@ -13,10 +13,10 @@ buildscript { classpath 'com.android.tools.build:gradle:4.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.5' - classpath 'com.google.firebase:perf-plugin:1.4.0' + classpath 'com.google.firebase:perf-plugin:1.3.5' // Add the Firebase Crashlytics Gradle plugin. - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.6.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/dynamic_frudis/build.gradle b/dynamic_frudis/build.gradle index a6cb0a34..de8c2567 100644 --- a/dynamic_frudis/build.gradle +++ b/dynamic_frudis/build.gradle @@ -2,21 +2,19 @@ apply plugin: 'com.android.dynamic-feature' android { compileSdkVersion 30 + + defaultConfig { minSdkVersion 21 targetSdkVersion 30 versionCode 1 versionName "1.0" - } + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - abortOnError false + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } @@ -25,4 +23,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') + + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_ime/build.gradle b/dynamic_ime/build.gradle index 77d4b975..2d8772cc 100644 --- a/dynamic_ime/build.gradle +++ b/dynamic_ime/build.gradle @@ -2,25 +2,26 @@ apply plugin: 'com.android.dynamic-feature' android { compileSdkVersion 30 + + defaultConfig { minSdkVersion 21 targetSdkVersion 30 versionCode 1 versionName "1.0" - } + + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - lintOptions { - abortOnError false + sourceCompatibility = '1.8' + targetCompatibility = '1.8' } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') + + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_saporiveri/build.gradle b/dynamic_saporiveri/build.gradle index 77d4b975..de8c2567 100644 --- a/dynamic_saporiveri/build.gradle +++ b/dynamic_saporiveri/build.gradle @@ -2,25 +2,27 @@ apply plugin: 'com.android.dynamic-feature' android { compileSdkVersion 30 + + defaultConfig { minSdkVersion 21 targetSdkVersion 30 versionCode 1 versionName "1.0" - } + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } - lintOptions { - abortOnError false - } + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') + + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_saporiveri_pv/build.gradle b/dynamic_saporiveri_pv/build.gradle index 77d4b975..de8c2567 100644 --- a/dynamic_saporiveri_pv/build.gradle +++ b/dynamic_saporiveri_pv/build.gradle @@ -2,25 +2,27 @@ apply plugin: 'com.android.dynamic-feature' android { compileSdkVersion 30 + + defaultConfig { minSdkVersion 21 targetSdkVersion 30 versionCode 1 versionName "1.0" - } + } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = 1.8 + targetCompatibility = 1.8 } - lintOptions { - abortOnError false - } + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') + + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_vgalimenti/build.gradle b/dynamic_vgalimenti/build.gradle index 7e0bfde6..f488f7dd 100644 --- a/dynamic_vgalimenti/build.gradle +++ b/dynamic_vgalimenti/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.dynamic-feature' android { compileSdkVersion 30 - defaultConfig { minSdkVersion 21 targetSdkVersion 30 @@ -14,13 +13,11 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - - lintOptions { - abortOnError false - } } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':app') + + implementation 'androidx.appcompat:appcompat:1.2.0' }