diff --git a/android/app/build.gradle b/android/app/build.gradle index 5d5d793..969d3c0 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -67,16 +67,13 @@ android { buildConfigField ("String[]", "SUPPORTED_DEVICES", collectSupportedDevicesToArray()) } release { - //useProguard true - //minifyEnabled false - //shrinkResources false - // proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" + minifyEnabled false signingConfig signingConfigs.release } } compileOptions { - coreLibraryDesugaringEnabled true + //coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -92,7 +89,7 @@ flutter { } dependencies { - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' + //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' @@ -101,29 +98,15 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + + implementation 'com.android.support:multidex:1.0.3' //m4bank dependencies implementation fileTree(include: ['*.jar'], dir: 'libs') implementation deps.zlibrary - -// implementation deps.hardware.aisino.aisino_common -// implementation deps.hardware.aisino.vm20.values() -// implementation deps.hardware.wangpos.values() -// implementation deps.hardware.roam.values() -// implementation deps.hardware.spirelib -// implementation deps.hardware.icmp.values() - implementation deps.hardware.atol.values() + implementation deps.hardware.atol.values() //todo need delete this package implementation deps.hardware.terminalCommon.values() - //if (buildType.buildType == 'NFC') { - implementation deps.hardware.softpos.softpaylibrary - implementation deps.hardware.softpos.softpay_dependencies - //} else { - // implementation deps.hardware.aisino.a90.values() - //} - -// implementation deps.hardware.shtrih.values() -// implementation deps.hardware.redlib -// implementation deps.hardware.sunmi -// implementation deps.hardware.d200lib + implementation deps.hardware.softpos.softpaylibrary + implementation deps.hardware.softpos.softpay_dependencies //Implementation okhhtp library implementation deps.okhttp.values() @@ -140,8 +123,8 @@ dependencies { implementation deps.timber implementation deps.paperdb implementation deps.greendao - implementation deps.retro_stream + implementation deps.retro_stream implementation deps.websockets // Only for useWebsockets parameter } diff --git a/android/app/src/main/java/kz/com/aman/kassa/plugins/BankNfcPlugins.java b/android/app/src/main/java/kz/com/aman/kassa/plugins/BankNfcPlugins.java index 3672eb4..685fb82 100644 --- a/android/app/src/main/java/kz/com/aman/kassa/plugins/BankNfcPlugins.java +++ b/android/app/src/main/java/kz/com/aman/kassa/plugins/BankNfcPlugins.java @@ -1,5 +1,6 @@ package kz.com.aman.kassa.plugins; +import android.os.Build; import android.widget.Toast; import java.math.BigDecimal; @@ -75,7 +76,7 @@ public class BankNfcPlugins implements MethodCallHandler { break; case "version": - result.success("version: "+Runtime.class.getPackage().getSpecificationVersion()); + result.success("version: "+ Build.VERSION.SDK_INT); break;