aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-09-29 16:25:21 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-09-29 16:25:21 +0000
commitde8076539dd79c665f123a6c856f2de3cdda9ac9 (patch)
tree6e6d912fbd96959536b578a678f1618d73a4ca3a
parent76204ac044ac4f78122d230aceec83e843d40048 (diff)
downloadinfinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.tar
infinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.tar.gz
infinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.tar.bz2
infinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.tar.lz
infinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.tar.xz
infinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.tar.zst
infinity-for-reddit-de8076539dd79c665f123a6c856f2de3cdda9ac9.zip
Change gitignore file.
-rw-r--r--.gitignore140
-rw-r--r--.idea/caches/build_file_checksums.serbin533 -> 533 bytes
-rw-r--r--.idea/caches/gradle_models.serbin307419 -> 307123 bytes
-rw-r--r--app/build.gradle1
-rw-r--r--build.gradle2
5 files changed, 134 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index a29a161d..0620fa94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,136 @@
-*.iml
+# Created by https://www.gitignore.io/api/androidstudio
+# Edit at https://www.gitignore.io/?templates=androidstudio
+
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+
+# Built application files
+*.apk
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+/app/release
+
+# Gradle files
.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
+.gradle/
/build
-/captures
+
+# Signing files
+.signing/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+captures/
+.navigation/
+*.ipr
+*~
+*.swp
+
+# Android Patch
+gen-external-apklibs
+
+# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
-/app/release
+
+# NDK
+obj/
+
+# IntelliJ IDEA
+*.iml
+*.iws
+/out/
+
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/modules.xml
+.idea/scopes/scope_settings.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/assetWizardSettings.xml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### AndroidStudio Patch ###
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+# End of https://www.gitignore.io/api/androidstudio
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b5ca41eb..22483936 100644
--- a/.idea/caches/build_file_checksums.ser
+++ b/.idea/caches/build_file_checksums.ser
Binary files differ
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index 6b94740a..1d02d78b 100644
--- a/.idea/caches/gradle_models.ser
+++ b/.idea/caches/gradle_models.ser
Binary files differ
diff --git a/app/build.gradle b/app/build.gradle
index 92e9dd36..9147f5e2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,6 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'com.google.android.exoplayer:exoplayer:2.10.4'
- implementation 'com.google.android.exoplayer:exoplayer-dash:2.10.4'
implementation 'androidx.browser:browser:1.0.0'
implementation 'com.alexvasilkov:gesture-views:2.5.2'
implementation 'androidx.cardview:cardview:1.0.0'
diff --git a/build.gradle b/build.gradle
index 7fe2f215..0dee177b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,5 +32,5 @@ task clean(type: Delete) {
ext {
roomVersion = '2.2.0-rc01'
- archLifecycleVersion = '2.2.0-alpha04'
+ archLifecycleVersion = '2.2.0-alpha05'
} \ No newline at end of file