diff --git a/app/build.gradle b/app/build.gradle index ce3ff7df..5cfc3f2e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -82,33 +82,41 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - androidTestImplementation('androidx.test.espresso:espresso-core:3.2.0', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.orhanobut:logger:2.2.0' - implementation 'com.google.firebase:firebase-core:17.5.0' - implementation 'com.google.firebase:firebase-crash:16.2.1' - implementation 'com.google.firebase:firebase-perf:19.0.8' - implementation 'com.google.firebase:firebase-crashlytics:17.2.1' + + //Firebase + + // Import the Firebase BoM + implementation platform('com.google.firebase:firebase-bom:25.12.0') + implementation 'com.google.firebase:firebase-core' + implementation 'com.google.firebase:firebase-crash' + implementation 'com.google.firebase:firebase-perf' + implementation 'com.google.firebase:firebase-crashlytics' + implementation 'com.google.firebase:firebase-analytics' + + implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.3.0-alpha02' - implementation 'androidx.constraintlayout:constraintlayout:2.0.1' + implementation 'com.google.android.material:material:1.3.0-alpha03' + implementation 'androidx.constraintlayout:constraintlayout:2.0.2' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.preference:preference:1.1.1' - implementation 'com.squareup.okhttp3:okhttp:4.5.0' - implementation 'com.squareup.retrofit2:retrofit:2.8.1' - implementation 'com.squareup.retrofit2:converter-gson:2.8.1' + implementation 'com.squareup.okhttp3:okhttp:4.9.0' + implementation 'com.squareup.retrofit2:retrofit:2.9.0' + implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.annimon:stream:1.2.1' implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0' - implementation 'org.apache.commons:commons-text:1.8' + implementation 'org.apache.commons:commons-text:1.9' //MVVM - def dagger2_version = '2.27' + def dagger2_version = '2.29.1' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0" api "com.google.dagger:dagger:$dagger2_version" @@ -125,7 +133,7 @@ dependencies { implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar' implementation 'com.fede987:status-bar-alert:1.0.1' implementation 'com.fxn769:stash:1.2' - testImplementation 'junit:junit:4.13' + testImplementation 'junit:junit:4.13.1' implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3' implementation 'com.github.pedromassango:doubleClick:3.0' @@ -145,8 +153,8 @@ dependencies { implementation project(':honeywellscannerlibrary') implementation project(':keyobardemulatorscannerlibrary') implementation project(':barcode_kaiteki') - androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1' - androidTestImplementation 'org.testng:testng:7.1.0' + androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' + androidTestImplementation 'org.testng:testng:7.3.0' } repositories { mavenCentral() diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java index 76241ce9..0d7c4a23 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/core/AccettazioneHelper.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.gest.accettazione.core; import android.content.Context; -import android.text.TextUtils; import com.annimon.stream.Stream; @@ -13,7 +12,6 @@ import it.integry.integrywmsnative.core.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.model.EsitoType; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import it.integry.integrywmsnative.gest.accettazione.rest.OrdiniAccettazioneRESTConsumerService; import retrofit2.Call; @@ -63,52 +61,6 @@ public class AccettazioneHelper { }); } - public void retrievePickingList(List barcodeOrdini, RunnableArgs> onComplete, RunnableArgs onFailed){ - - String joinedBarcodes = TextUtils.join(",", barcodeOrdini); - - OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class); - - service.pickingListAccettazione(joinedBarcodes).enqueue(new Callback>>() { - @Override - public void onResponse(Call>> call, Response>> response) { - if(response.isSuccessful()) { - - if(response.body() != null) { - if(response.body().getEsito() == EsitoType.OK) { - List dto = response.body().getDto(); - - for (OrdineAccettazioneDTO ordine : dto) { - for(OrdineAccettazioneDTO.Riga riga : ordine.getOrdini()){ - riga.numOrd = ordine.getNumero(); - riga.dataOrd = ordine.getData(); - riga.gestioneOrd = ordine.getGestione(); - riga.codAlis = ordine.getCodAlis(); - } - } - - onComplete.run(dto); - } else { - onFailed.run(new Exception(response.body().getErrorMessage())); - } - } else { - onFailed.run(new Exception(response.message())); - } - } else { - onFailed.run(new Exception("Status " + response.code() + ": " + response.message())); - } - } - - @Override - public void onFailure(Call>> call, Throwable t) { - onFailed.run(new Exception(t)); - } - }); - - } - - - diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneInevasoDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneInevasoDTO.java index ed68459a..9598a5d6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneInevasoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/dto/OrdineAccettazioneInevasoDTO.java @@ -3,6 +3,7 @@ package it.integry.integrywmsnative.gest.accettazione.dto; import java.util.Date; import it.integry.integrywmsnative.core.di.BindableBoolean; +import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.utility.UtilityDate; /** @@ -223,6 +224,10 @@ public class OrdineAccettazioneInevasoDTO { return gestione; } + public GestioneEnum getGestioneEnum() { + return GestioneEnum.fromString(gestione); + } + public OrdineAccettazioneInevasoDTO setGestione(String gestione) { this.gestione = gestione; return this; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java index 90c40a99..4905b46e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/rest/OrdiniAccettazioneRESTConsumerService.java @@ -4,7 +4,6 @@ import java.util.List; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; import it.integry.integrywmsnative.gest.accettazione.dto.GetPickingListAccettazioneDTO; -import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO; import retrofit2.Call; @@ -22,9 +21,6 @@ public interface OrdiniAccettazioneRESTConsumerService { @GET("SM2GetOrdiniAccettazioneInevasi") Call>> listOrdiniInevasi(@Query("codMdep") String codMdep, @Query("gestione") String gestione); - @GET("WMSGetPickingListAccettazione") - Call>> pickingListAccettazione(@Query("codBarreBancale") String codBarreBacale); - @POST("wms/getArticoliFromOrdiniAccettazione") Call>> getArticoliFromOrdiniAccettazione(@Body List pickingListAccettazioneDTOS); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java index 08ba3df9..85f0f2a4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java @@ -107,8 +107,8 @@ public class AccettazionePickingViewModel { .get(); //Definizione della gestione collo di default - List foundGestioni = Stream.of(mSitArts) - .map(SitArtOrdDTO::getGestioneEnum) + List foundGestioni = Stream.of(mOrders) + .map(OrdineAccettazioneInevasoDTO::getGestioneEnum) .withoutNulls() .distinctBy(x -> x) .toList(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java index ce9368ea..4bc6af4e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -19,9 +19,9 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.annimon.stream.Stream; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_cache.DataCache; @@ -30,11 +30,13 @@ import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.rest.CommonRESTException; +import it.integry.integrywmsnative.core.utility.UtilityBigDecimal; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.databinding.FragmentProdOrdineProduzioneElencoBinding; -import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; -import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso_OLD.AccettazioneOrdineInevasoActivity; +import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO; +import it.integry.integrywmsnative.gest.accettazione.rest.OrdiniAccettazioneRESTConsumer; +import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingActivity; import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core.OrdineProduzioneHelper; import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core.OrdineProduzioneListAdapter; import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog.DialogOrdineProduzioneFiltroAvanzato; @@ -107,28 +109,27 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit } - private void init() { final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper = new OrdineProduzioneHelper(getActivity()); mHelper.loadOrdini(ordini -> { - if(ordini != null) { - Toast.makeText(getActivity(), "Caricati " + ordini.size() + " ordini", Toast.LENGTH_LONG).show(); - mOriginalOrderList = ordini; + if (ordini != null) { + Toast.makeText(getActivity(), "Caricati " + ordini.size() + " ordini", Toast.LENGTH_LONG).show(); + mOriginalOrderList = ordini; + } + + mBinding.ordiniProduzioneEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE); + refreshRenderedOrdini(ordini); + initRecyclerView(); + progress.dismiss(); + }, ex -> { + progress.dismiss(); + + String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); + if (errorMessage == null) errorMessage = ex.getMessage(); + DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); } - - mBinding.ordiniProduzioneEmptyView.setVisibility(ordini != null && ordini.size() > 0 ? View.GONE : View.VISIBLE); - refreshRenderedOrdini(ordini); - initRecyclerView(); - progress.dismiss(); - }, ex -> { - progress.dismiss(); - - String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); - if(errorMessage == null) errorMessage = ex.getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); - } ); } @@ -143,7 +144,6 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit } - private void initRecyclerView() { mAdapter = new OrdineProduzioneListAdapter(getActivity(), mRenderedOrderList, onSingleSelectionChanged); mBinding.ordineProduzioneMainList.setAdapter(mAdapter); @@ -152,7 +152,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit private void refreshRenderedOrdini(List ordini) { mRenderedOrderList.clear(); - if(ordini != null) mRenderedOrderList.addAll(ordini); + if (ordini != null) mRenderedOrderList.addAll(ordini); } private void refreshRecyclerView() { @@ -162,76 +162,67 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit private RunnableArgs onSingleSelectionChanged = dto -> { List selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList); - if(dto.isSelected()) { + if (dto.isSelected()) { Stream.of(selectedOrders) .filter(x -> !x.getCodAnagOrd().equalsIgnoreCase(dto.getCodAnagOrd())) .forEach(x -> x.setSelected(false)); } - if(selectedOrders != null && selectedOrders.size() > 0) { + if (selectedOrders != null && selectedOrders.size() > 0) { mBinding.ordineProduzioneMainFab.show(); - } - else { + } else { mBinding.ordineProduzioneMainFab.hide(); } }; - private void onAccettazioneMainFabClick() { - List selectedOrders = mHelper.getSelectedOrders(mOriginalOrderList); - List barcodes = new ArrayList<>(); - - for(OrdineAccettazioneInevasoDTO ordine : selectedOrders){ - if(!barcodes.contains(ordine.getBarcode())) barcodes.add(ordine.getBarcode()); - } final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); - mHelper.retrievePickingList(barcodes, ordini -> { - progress.dismiss(); + OrdiniAccettazioneRESTConsumer.retrievePickingListNewStatic(selectedOrders, sitArtOrds -> { + progress.dismiss(); - AtomicInteger artsCounter = new AtomicInteger(); + long artsCounter = Stream.of(sitArtOrds) + .filter(x -> UtilityBigDecimal.greaterThan(x.getQtaDaEvadere(), BigDecimal.ZERO)) + .map(SitArtOrdDTO::getCodMart) + .distinct() + .count(); - Stream.of(ordini).forEach(x -> { - artsCounter.addAndGet((int) Stream.of(x.getOrdini()).filter(y -> y.getQtaDaEvadere().floatValue() > 0).count()); - }); + long ordsCounter = Stream.of(sitArtOrds) + .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione()) + .count(); - List ordersKeys = new ArrayList<>(); + DialogSimpleMessageHelper.makeInfoDialog(getActivity(), + getText(R.string.orders).toString(), + Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) + + "

" + + "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, (int) artsCounter)), + null, + () -> { - for(OrdineAccettazioneDTO ordine : ordini){ - if(!ordersKeys.contains(ordine.getData() + " " + ordine.getNumero() + " " + ordine.getGestione())){ - ordersKeys.add(ordine.getData() + " " + ordine.getNumero() + " " + ordine.getGestione()); - } - } + String cacheSitArtItemID = DataCache.addItem(sitArtOrds); + String cacheOrdersItemID = DataCache.addItem(selectedOrders); - DialogSimpleMessageHelper.makeInfoDialog(getActivity(), - getText(R.string.orders).toString(), - Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, ordersKeys.size()), ordersKeys.size()) - + "

" + - "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, artsCounter.get())), - null, - () -> { + Intent myIntent = new Intent(getActivity(), AccettazionePickingActivity.class); + myIntent.putExtra("keyOrders", cacheOrdersItemID); + myIntent.putExtra("keySitArts", cacheSitArtItemID); + getActivity().startActivity(myIntent); - String cacheItemID = DataCache.addItem(ordini); + }).show(); - Intent myIntent = new Intent(getActivity(), AccettazioneOrdineInevasoActivity.class); - myIntent.putExtra("key", cacheItemID); - getActivity().startActivity(myIntent); + }, - }).show(); - - }, - - ex -> { + ex -> { // Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_LONG).show(); - progress.dismiss(); + progress.dismiss(); - String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); - if(errorMessage == null) errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); - }); + String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); + if (errorMessage == null) + errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage(); + DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); + }); } @@ -241,7 +232,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit DialogOrdineProduzioneFiltroAvanzato.make(getActivity(), mOriginalOrderList, mAppliedFilterViewModel, (filteredOrderList, filter) -> { mAppliedFilterViewModel = filter; - if(filteredOrderList != null){ + if (filteredOrderList != null) { refreshOrdini(filteredOrderList); refreshRecyclerView(); @@ -251,9 +242,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit } - - - public void refreshOrdini(List ordini){ + public void refreshOrdini(List ordini) { mRenderedOrderList.clear(); mRenderedOrderList.addAll(ordini); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java index c83a21cc..8957c8b7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/core/OrdineProduzioneHelper.java @@ -1,20 +1,17 @@ package it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core; import android.content.Context; -import android.text.TextUtils; import android.util.Log; import com.annimon.stream.Stream; import java.util.List; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.rest.RESTBuilder; import it.integry.integrywmsnative.core.rest.model.EsitoType; import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.settings.SettingsManager; -import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO; import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import it.integry.integrywmsnative.gest.accettazione.rest.OrdiniAccettazioneRESTConsumerService; import retrofit2.Call; @@ -64,58 +61,6 @@ public class OrdineProduzioneHelper { } - public void retrievePickingList(List barcodeOrdini, RunnableArgs> onComplete, RunnableArgs onFailed){ - - String joinedBarcodes = TextUtils.join(",", barcodeOrdini); - - OrdiniAccettazioneRESTConsumerService service = RESTBuilder.getService(OrdiniAccettazioneRESTConsumerService.class); - - service.pickingListAccettazione(joinedBarcodes).enqueue(new Callback>>() { - @Override - public void onResponse(Call>> call, Response>> response) { - if(response.isSuccessful()) { - - if(response.body() != null) { - if(response.body().getEsito() == EsitoType.OK) { - List dto = response.body().getDto(); - - for (OrdineAccettazioneDTO ordine : dto) { - for(OrdineAccettazioneDTO.Riga riga : ordine.getOrdini()){ - riga.numOrd = ordine.getNumero(); - riga.dataOrd = ordine.getData(); - riga.gestioneOrd = ordine.getGestione(); - riga.codAlis = ordine.getCodAlis(); - } - } - - onComplete.run(dto); - } else { - Log.e("Produzione", response.body().getErrorMessage()); - onFailed.run(new Exception(response.body().getErrorMessage())); - } - } else { - Log.e("Produzione", response.message()); - onFailed.run(new Exception(response.message())); - } - } else { - Log.e("Produzione", "Status " + response.code() + ": " + response.message()); - onFailed.run(new Exception("Status " + response.code() + ": " + response.message())); - } - } - - @Override - public void onFailure(Call>> call, Throwable t) { - Log.e("Produzione", t.toString()); - UtilityLogger.errorMe(new Exception(t)); - onFailed.run(new Exception(t)); - } - }); - - } - - - - public List getSelectedOrders(List ordiniList){ return Stream.of(ordiniList) .filter(OrdineAccettazioneInevasoDTO::isSelected) diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index 4202c238..36e6a5ac 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -30,10 +30,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - 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', { + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) } diff --git a/build.gradle b/build.gradle index 75bc5228..76374ddf 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.android.tools.build:gradle:4.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.4' - classpath 'com.google.firebase:perf-plugin:1.3.1' + classpath 'com.google.firebase:perf-plugin:1.3.2' // Add the Firebase Crashlytics Gradle plugin. classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0' diff --git a/dynamic_frudis/build.gradle b/dynamic_frudis/build.gradle index 06cb2f7c..a6b906ba 100644 --- a/dynamic_frudis/build.gradle +++ b/dynamic_frudis/build.gradle @@ -24,5 +24,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_gramm/build.gradle b/dynamic_gramm/build.gradle index bb91f76c..72347fc0 100644 --- a/dynamic_gramm/build.gradle +++ b/dynamic_gramm/build.gradle @@ -21,8 +21,8 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation project(":app") - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' androidTestImplementation 'androidx.annotation:annotation:1.1.0' } \ No newline at end of file diff --git a/dynamic_ime/build.gradle b/dynamic_ime/build.gradle index 3567aca1..5f4a0803 100644 --- a/dynamic_ime/build.gradle +++ b/dynamic_ime/build.gradle @@ -23,5 +23,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_saporiveri/build.gradle b/dynamic_saporiveri/build.gradle index 06cb2f7c..a6b906ba 100644 --- a/dynamic_saporiveri/build.gradle +++ b/dynamic_saporiveri/build.gradle @@ -24,5 +24,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_saporiveri_pv/build.gradle b/dynamic_saporiveri_pv/build.gradle index 06cb2f7c..a6b906ba 100644 --- a/dynamic_saporiveri_pv/build.gradle +++ b/dynamic_saporiveri_pv/build.gradle @@ -24,5 +24,5 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation project(':app') - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/dynamic_vgalimenti/build.gradle b/dynamic_vgalimenti/build.gradle index e87cb72b..fddcb763 100644 --- a/dynamic_vgalimenti/build.gradle +++ b/dynamic_vgalimenti/build.gradle @@ -19,5 +19,5 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':app') - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' } diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle index 18dc90ed..dd795994 100644 --- a/honeywellscannerlibrary/build.gradle +++ b/honeywellscannerlibrary/build.gradle @@ -30,10 +30,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) - 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', { + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.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 e56736d7..e2047aa3 100644 --- a/keyobardemulatorscannerlibrary/build.gradle +++ b/keyobardemulatorscannerlibrary/build.gradle @@ -27,10 +27,10 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - 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', { + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.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 50fdfdff..14e488ca 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -26,10 +26,10 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - 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', { + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.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 5d23180d..fa093e47 100644 --- a/zebrascannerlibrary/build.gradle +++ b/zebrascannerlibrary/build.gradle @@ -27,10 +27,10 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - 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', { + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.13.1' + androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) implementation project(path: ':barcode_base_android_library')