diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 590549a4..36094719 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml new file mode 100644 index 00000000..fc61716a --- /dev/null +++ b/.idea/runConfigurations/app.xml @@ -0,0 +1,52 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e55ae9e1..0d51c9f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,6 +15,14 @@ apply plugin: 'kotlin-android-extensions' apply plugin: 'com.google.gms.google-services' android { + signingConfigs { + release { + keyAlias 'wms key' + keyPassword 'inpmiy' + storeFile file('Integry.jks') + storePassword 'inpmiy' + } + } compileSdkVersion 28 buildToolsVersion '28.0.3' defaultConfig { @@ -24,22 +32,24 @@ android { versionCode 18 versionName "1.0.15" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + signingConfig signingConfigs.release } - buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } dataBinding { enabled = true } - compileOptions { targetCompatibility 1.8 sourceCompatibility 1.8 } + productFlavors { + } } dependencies { @@ -65,15 +75,12 @@ dependencies { implementation 'org.parceler:parceler-api:1.1.10' annotationProcessor 'org.parceler:parceler:1.1.10' implementation 'com.annimon:stream:1.2.1' - - implementation "androidx.lifecycle:lifecycle-runtime:2.0.0" - implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" + implementation 'androidx.lifecycle:lifecycle-runtime:2.0.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0' kapt "androidx.lifecycle:lifecycle-compiler:2.0.0" - //implementation "com.emreeran.permissionlivedata:permissionlivedata:1.0.4" //implementation 'com.karumi:dexter:5.0.0' - //MVVM implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.0.0" @@ -99,10 +106,8 @@ dependencies { implementation project(':waterfall_toolbar') implementation 'com.mikhaellopez:lazydatepicker:1.0.0' implementation 'com.github.demoNo:AutoScrollViewPager:v1.0.2' - //AppUpdate implementation 'com.github.javiersantos:AppUpdater:2.7' - //Barcode implementation project(':pointmobilescannerlibrary') implementation project(path: ':barcode_base_library') diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 490088e7..26e5a1e4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Wed Sep 26 16:49:03 CEST 2018 +#Wed Jan 09 16:56:36 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME