Merge remote-tracking branch 'origin/master'

app/proguard-rules.pro

@@ -1,81 +1,108 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontskipnonpubliclibraryclassmembers
--dontpreverify
--dontshrink
--verbose
+apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.firebase.crashlytics'
 
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
 
--keepattributes *Annotation*
--keepattributes Signature
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.3"
 
--keepclasseswithmembernames class * {
-    native <methods>;
+    defaultConfig {
+        applicationId "no.spca.android.iisc"
+        minSdkVersion 18
+        targetSdkVersion 29
+        versionCode 78
+        versionName "2.9.0"
+        resConfigs "en"
+        multiDexEnabled true
+
+
+        vectorDrawables.useSupportLibrary = true
+    }
+    buildTypes {
+        debug {
+            minifyEnabled false
+            shrinkResources false
+
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+
+    implementation 'com.google.android.gms:play-services-wearable:10.2.0'
+
+    implementation 'androidx.appcompat:appcompat:1.3.0-alpha01'
+    implementation 'androidx.preference:preference:1.1.1'
+    implementation 'de.hdodenhof:circleimageview:3.1.0'
+
+    implementation 'no.nordicsemi.android:log:2.2.0'
+    implementation 'no.nordicsemi.android.support.v18:scanner:1.4.3'
+    implementation 'org.apache.poi:poi:4.0.0'
+    implementation 'org.apache.poi:poi-ooxml:4.0.0'
+    implementation 'com.android.support:multidex:1.0.1'
+
+    implementation 'com.jjoe64:graphview:4.2.2'
+
+    implementation 'no.nordicsemi.android:dfu:1.10.3'
+
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+
+
+    implementation 'com.hbb20:ccp:2.4.0'
+    implementation 'androidx.preference:preference:1.1.0-alpha04'
+    implementation 'com.google.android.material:material:1.1.0-alpha05'
+    implementation 'com.google.android.material:material:1.1.0'
+
+    implementation 'com.google.firebase:firebase-database:16.0.4'
+
+    implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
+
+    implementation 'com.google.firebase:firebase-auth:16.0.5'
+
+
+    implementation 'androidx.preference:preference:1.1.0-alpha04'
+
+    implementation 'no.nordicsemi.android:log:2.2.0'
+    implementation 'com.chaos.view:pinview:1.4.3'
+    implementation "androidx.browser:browser:1.3.0"
+
+
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    implementation 'com.firebaseui:firebase-ui-database:7.1.1'
+
+
+    implementation 'com.hbb20:ccp:2.4.0'
+
+    implementation 'com.google.firebase:firebase-auth:20.0.1'
+
+    implementation 'com.google.android.material:material:1.0.0'
+
+ implementation 'com.github.PhilJay:MPAndroidChart:v2.0.9'
+
+    implementation 'com.google.firebase:firebase-crashlytics:17.1.1'
+
+
+
+    implementation 'com.google.firebase:firebase-storage:16.0.4'
+
+
+    implementation 'no.nordicsemi.android:ble-common:2.1.1'
+   
+    implementation('org.simpleframework:simple-xml:2.7.1') {
+        exclude group: 'stax', module: 'stax-api'
+        exclude group: 'xpp3', module: 'xpp3'
+    }
 }
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
-# The AndroidX library contains references to newer platform versions.
-# Don't warn about those in case this app is linking against an older platform version.
--dontwarn androidx.**
-
--keep class com.google.android.gms.**
--dontwarn com.google.android.gms.**
-
-# Java
--keep class java.** { *; }
--dontnote java.**
--dontwarn java.**
-
--keep class javax.** { *; }
--dontnote javax.**
--dontwarn javax.**
-
--keep class sun.misc.Unsafe { *; }
--dontnote sun.misc.Unsafe
-
--keep class javax.xml.stream.XMLOutputFactory { *; }
-
-# (the rt.jar has them)
--dontwarn com.bea.xml.stream.XMLWriterBase
--dontwarn javax.xml.stream.events.**
--dontwarn javax.xml.stream.**
-
-# Simple XML
--keep public class org.simpleframework.** { *; }
--keep class org.simpleframework.xml.** { *; }
--keep class org.simpleframework.xml.core.** { *; }
--keep class org.simpleframework.xml.util.** { *; }
-
--keepattributes ElementList, Root, InnerClasses, LineNumberTable
-
--keepclasseswithmembers class * {
-    @org.simpleframework.xml.* <fields>;
-}
-
-# Chart Engine
--keep class org.achartengine.** { *; }
--dontnote org.achartengine.**
-
-# HTTP (might require legacyLibraries) ?
--dontnote org.apache.http.params.**
--dontnote org.apache.http.conn.scheme.**
--dontnote org.apache.http.conn.**
--dontnote android.net.http.**
-
-# DFU Library
--keep class no.nordicsemi.android.dfu.** { *; }
-