diff --git a/app/build.gradle b/app/build.gradle index e82a0e4a..8f4d22a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,3 @@ -buildscript { - repositories { - maven { url 'https://maven.fabric.io/public' } - } - - dependencies { - classpath 'io.fabric.tools:gradle:1.27.0' - } -} apply plugin: 'com.android.application' apply plugin: 'com.google.firebase.firebase-perf' apply plugin: 'io.fabric' @@ -34,13 +25,13 @@ android { } } - compileSdkVersion 28 + compileSdkVersion 29 buildToolsVersion '28.0.3' defaultConfig { applicationId "it.integry.integrywmsnative" minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 versionCode appVersionCode versionName appVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -92,7 +83,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" @@ -109,8 +100,8 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.preference:preference:1.1.0' implementation 'com.squareup.okhttp3:okhttp:4.4.0' - implementation 'com.squareup.retrofit2:retrofit:2.7.1' - implementation 'com.squareup.retrofit2:converter-gson:2.7.1' + implementation 'com.squareup.retrofit2:retrofit:2.7.2' + implementation 'com.squareup.retrofit2:converter-gson:2.7.2' implementation 'com.annimon:stream:1.2.1' implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' @@ -140,7 +131,7 @@ dependencies { implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3' //SQLite ROOM - def room_version = "2.2.3" + def room_version = "2.2.4" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" @@ -154,8 +145,8 @@ dependencies { implementation project(':barcode_base_android_library') implementation project(':honeywellscannerlibrary') implementation project(':keyobardemulatorscannerlibrary') - androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.0.1' - androidTestImplementation 'org.testng:testng:6.9.6' + androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0' + androidTestImplementation 'org.testng:testng:7.1.0' } repositories { mavenCentral() diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml index 7cc9bdcf..dd4a4a82 100644 --- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml +++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml @@ -57,7 +57,7 @@ android:textColor="@android:color/white" android:textStyle="bold" android:background="@drawable/badge1_round_corner" - android:text="@{viewmodel.mtbColt.get().numCollo.toString()}" + android:text="@{viewmodel.mtbColt.numCollo.toString()}" style="@style/AppTheme.NewMaterial.Text.Medium" tools:text="2156"/> @@ -67,8 +67,8 @@ android:layout_marginStart="12dp" android:textColor="@android:color/black" android:textStyle="bold" - android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.mtbColt.get().posizione) ? View.VISIBLE : View.GONE}" - android:text="@{viewmodel.mtbColt.get().posizione}" + android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.mtbColt.posizione) ? View.VISIBLE : View.GONE}" + android:text="@{viewmodel.mtbColt.posizione}" style="@style/AppTheme.NewMaterial.Text.Medium" tools:text="ME1FS032"/> diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index b4a39799..4202c238 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -32,6 +32,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test.ext:junit:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + exclude group: 'com.android.support', module: 'support-annotations' + }) } diff --git a/build.gradle b/build.gradle index 508b89b5..0b94cd6b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,27 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext{ + ext { kotlin_version = '1.3.61' } repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } google() + + maven { + url 'https://maven.fabric.io/public' + } } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:3.6.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.3' classpath 'com.google.firebase:perf-plugin:1.3.1' + // Add the Fabric Crashlytics plugin. + classpath 'io.fabric.tools:gradle:1.31.2' + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -27,10 +30,7 @@ buildscript { allprojects { repositories { jcenter() - maven { - url 'https://maven.google.com/' - name 'Google' - } + google() maven { url 'https://jitpack.io' } } } diff --git a/gradle.properties b/gradle.properties index 9044160d..8cdc8874 100644 --- a/gradle.properties +++ b/gradle.properties @@ -35,4 +35,6 @@ android.enableBuildCache=true # Enable simple gradle caching org.gradle.caching=true # Increase memory allotted to JVM -org.gradle.jvmargs=-Xmx4096m \ No newline at end of file +org.gradle.jvmargs=-Xmx4096m + +org.gradle.java.home=C\:\\Program Files\\Java\\jre1.8.0_202 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9d810b90..aeee2110 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 26 11:42:29 CEST 2019 +#Fri Feb 28 09:41:39 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle index d963e05b..18dc90ed 100644 --- a/honeywellscannerlibrary/build.gradle +++ b/honeywellscannerlibrary/build.gradle @@ -33,6 +33,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + exclude group: 'com.android.support', module: 'support-annotations' + }) implementation project(path: ':barcode_base_android_library') } diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle index 38e021e0..e56736d7 100644 --- a/keyobardemulatorscannerlibrary/build.gradle +++ b/keyobardemulatorscannerlibrary/build.gradle @@ -30,6 +30,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + exclude group: 'com.android.support', module: 'support-annotations' + }) implementation project(':barcode_base_android_library') } diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle index 4db6c6b9..50fdfdff 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -29,6 +29,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + exclude group: 'com.android.support', module: 'support-annotations' + }) implementation project(':barcode_base_android_library') } diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle index 99ab676c..5d23180d 100644 --- a/zebrascannerlibrary/build.gradle +++ b/zebrascannerlibrary/build.gradle @@ -30,6 +30,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' testImplementation 'junit:junit:4.13' androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + exclude group: 'com.android.support', module: 'support-annotations' + }) implementation project(path: ':barcode_base_android_library') }