From 90a7fa0e2893257ffa430da5e5b52083e0c01ecf Mon Sep 17 00:00:00 2001 From: Govind Dixit Date: Thu, 31 Oct 2019 16:20:33 -0700 Subject: [PATCH] update gradle version and gitignore --- .gitignore | 152 +++++++++++++++++++++-- .idea/caches/build_file_checksums.ser | Bin 537 -> 538 bytes .idea/codeStyles/Project.xml | 116 +++++++++++++++++ .idea/gradle.xml | 7 +- .idea/misc.xml | 25 ---- .idea/vcs.xml | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 8 files changed, 265 insertions(+), 43 deletions(-) create mode 100644 .idea/codeStyles/Project.xml diff --git a/.gitignore b/.gitignore index 5edb4ee..871c65f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,146 @@ +app/rocket-chat.json +app/src/release/google-services.json +app/src/release/res/values/api_key_strings.xml +app/libs/ + +# Auth files +*.jks + +################################# Created by https://www.gitignore.io/api/androidstudio (modified) ################################# + +# Signing files +.signing/ + +# Android Studio +/*/build/ +/*/local.properties +/*/out +/*/*/build +/*/*/production +*.ipr +*~ +*.swp + +# NDK +obj/ + +# IntelliJ IDEA +*.iws +/out/ + +# User-specific configurations +.idea/ + +# OS-specific files +.DS_Store? +.Trashes +ehthumbs.db +Thumbs.db + +# Package Files # +*.war +*.ear + +# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml) +hs_err_pid* + +### AndroidStudio Patch ### +!/gradle/wrapper/gradle-wrapper.jar + +# End of https://www.gitignore.io/api/androidstudio + +################################# Created by https://www.gitignore.io/api/android (modified) ################################# + +### Android ### +# Built application files +*.apk +*.ap_ +app/libs + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# Intellij *.iml -.gradle -/local.properties -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -.DS_Store -/build -/captures + +# External native build folder generated in Android Studio 2.2 and later .externalNativeBuild + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +### Android Patch ### +gen-external-apklibs + +# End of https://www.gitignore.io/api/android + +################################# Created by https://www.gitignore.io/api/crashlytics ################################# + +### Crashlytics ### +#Crashlytics +crashlytics-build.properties +com_crashlytics_export_strings.xml +crashlytics.properties +fabric.properties + +# End of https://www.gitignore.io/api/crashlytics + +################################# Created by https://www.gitignore.io/api/osx ################################# + +### OSX ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# End of https://www.gitignore.io/api/osx \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 131d9b343f735169e7d2d4a6bd04c1620f04dc15..67bb7b3fbe851bef3f1f4dba64acd4741c8c8a34 100644 GIT binary patch delta 117 zcmV-*0E+*a1eyepmj!Ml85~2AoXjHY(E@4J{3}{0%WODvIOaX37G8oLVlBY0UZ-_(3GQT4}eeLFsGTt;6Mj-01=bz X0UHqn&RDMGTV1KY-DC$0Rq%Rv4fZi^ delta 97 zcmV-n0G|Jv1epYomj!EP7B8!joXik}E)lHHO*?vLq<}VXNnQMtz5yK&&ze91E!0&b zovTOqQ4ZUDlj{L45p)13Lpoelb7gXKTxV}~X>OB>0VENZa%Z_q00A^w0?k_*;gdIb DVRa>? diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f43d428..d291b3d 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,13 +8,8 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index c0f68ed..7bfef59 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,30 +1,5 @@ - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 2b307a0..26a641c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:3.5.1' classpath 'com.google.gms:google-services:4.2.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f68aef..cf8a63a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 17 21:07:32 IST 2019 +#Thu Oct 31 16:02:46 PDT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip