gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #963 from nextcloud/deleteIdeaFolderFromMaster

Browse Source 
ignore .idea in .gitignore / remove .idea from index
This commit is contained in:
Marcel Hibbe 2021-01-30 23:58:34 +01:00 committed by GitHub
commit 2ebf0b2ef9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.gitignore vendored
View File

@ -2,7 +2,7 @@
*.apk *.apk
*.ap_ *.ap_
# Files for the ART/Dalvik VM # Files for the ART/ Dalvik VM
*.dex *.dex
# Java class files # Java class files
@ -15,6 +15,7 @@ out/
# Local configuration file (sdk path, etc) # Local configuration file (sdk path, etc)
local.properties local.properties
tests/local.properties
# Proguard folder generated by Eclipse # Proguard folder generated by Eclipse
proguard/ proguard/
@ -22,19 +23,14 @@ proguard/
# Log Files # Log Files
*.log *.log
# Android Studio Navigation editor temp files # Android Studio and Gradle specific entries
.navigation/
# Android Studio captures folder
captures/
# Intellij
*.iml *.iml
.idea/workspace.xml .gradle
.idea/tasks.xml .idea
.idea/gradle.xml build
.idea/dictionaries /gradle.properties
.idea/libraries captures/
.navigation/
# Keystore files # Keystore files
*.jks *.jks
@ -52,9 +48,4 @@ freeline/
freeline_project_description.json freeline_project_description.json
.DS_Store .DS_Store
# Android Studio and Gradle specific entries
.gradle/
build/
.idea/
/gradle.properties
/app/gplay/release/output.json

9
.idea/misc.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>

12
.idea/runConfigurations.xml
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RunConfigurationProducerService">
<option name="ignoredProducers">
<set>
<option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
<option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
</set>
</option>
</component>
</project>

6
.idea/vcs.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>