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
This commit is contained in:
Giuseppe Scorrano 2021-05-19 11:32:14 +02:00
parent 64fdda43db
commit 48f1307095
7 changed files with 41 additions and 39 deletions

View File

@ -92,11 +92,11 @@ dependencies {
// Import the Firebase BoM // Import the Firebase BoM
implementation platform('com.google.firebase:firebase-bom:26.3.0') implementation platform('com.google.firebase:firebase-bom:26.3.0')
implementation 'com.google.firebase:firebase-analytics:19.0.0' implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-core:19.0.0' implementation 'com.google.firebase:firebase-core'
implementation 'com.google.firebase:firebase-crash:16.2.1' implementation 'com.google.firebase:firebase-crash'
implementation 'com.google.firebase:firebase-crashlytics:18.0.0' implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-perf:20.0.0' implementation 'com.google.firebase:firebase-perf'
implementation 'com.google.android.gms:play-services-basement:17.6.0' implementation 'com.google.android.gms:play-services-basement:17.6.0'
@ -117,7 +117,7 @@ dependencies {
implementation 'org.apache.commons:commons-text:1.9' implementation 'org.apache.commons:commons-text:1.9'
//MVVM //MVVM
def dagger2_version = '2.35.1' def dagger2_version = '2.29.1'
api "com.google.dagger:dagger:$dagger2_version" api "com.google.dagger:dagger:$dagger2_version"
annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
api "com.google.dagger:dagger-android:$dagger2_version" api "com.google.dagger:dagger-android:$dagger2_version"

View File

@ -13,10 +13,10 @@ buildscript {
classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.android.tools.build:gradle:4.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.5' 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. // 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

View File

@ -3,20 +3,18 @@ apply plugin: 'com.android.dynamic-feature'
android { android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
}
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility = 1.8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility = 1.8
}
lintOptions {
abortOnError false
} }
@ -25,4 +23,6 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':app') implementation project(':app')
implementation 'androidx.appcompat:appcompat:1.2.0'
} }

View File

@ -3,24 +3,25 @@ apply plugin: 'com.android.dynamic-feature'
android { android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
}
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility = '1.8'
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility = '1.8'
}
lintOptions {
abortOnError false
} }
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':app') implementation project(':app')
implementation 'androidx.appcompat:appcompat:1.2.0'
} }

View File

@ -3,24 +3,26 @@ apply plugin: 'com.android.dynamic-feature'
android { android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
}
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility = 1.8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility = 1.8
} }
lintOptions {
abortOnError false
}
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':app') implementation project(':app')
implementation 'androidx.appcompat:appcompat:1.2.0'
} }

View File

@ -3,24 +3,26 @@ apply plugin: 'com.android.dynamic-feature'
android { android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
}
}
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility = 1.8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility = 1.8
} }
lintOptions {
abortOnError false
}
} }
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation project(':app') implementation project(':app')
implementation 'androidx.appcompat:appcompat:1.2.0'
} }

View File

@ -2,7 +2,6 @@ apply plugin: 'com.android.dynamic-feature'
android { android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
@ -14,13 +13,11 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions {
abortOnError false
}
} }
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(':app') implementation project(':app')
implementation 'androidx.appcompat:appcompat:1.2.0'
} }