From 9732d61d38599824dd278a0f4a86dd278d380c8b Mon Sep 17 00:00:00 2001 From: Jorge Antonio Diaz-Benito Soriano Date: Tue, 25 Nov 2014 21:32:32 +0100 Subject: [PATCH] Restore .gitignore, remove files that were added --- .gitignore | 16 ++--- .idea/.name | 1 - .idea/compiler.xml | 23 ------- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 5 -- .idea/misc.xml | 10 --- .idea/modules.xml | 11 ---- .idea/scopes/scope_settings.xml | 5 -- .idea/vcs.xml | 7 --- android-library.iml | 89 -------------------------- sample_client/sample_client.iml | 88 -------------------------- test_client/test_client.iml | 90 --------------------------- 12 files changed, 6 insertions(+), 342 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 android-library.iml delete mode 100644 sample_client/sample_client.iml delete mode 100644 test_client/test_client.iml diff --git a/.gitignore b/.gitignore index aec42f2f..dd7c979e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,20 +8,16 @@ # Java class files *.class -# IntelliJ and Gradle specific entries -.gradle -.idea/workspace.xml -.idea/tasks.xml -.idea/libraries/*.xml -dataSources.ids -datasources.xml -gradle.xml -build +# generated files bin/ +build/ gen/ target/ +*.iml # Local configuration files (sdk path, etc) +.idea/ +.gradle/ local.properties sample_client/local.properties tests/local.properties @@ -34,4 +30,4 @@ tests/test_cases/local.properties proguard-project.txt sample_client/proguard-project.txt tests/proguard-project.txt -tests/test_cases/proguard-project.txt +tests/test_cases/proguard-project.txt \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 72c6cb10..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -android-library \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af471..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70d..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index b153e48a..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index e28b2784..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 275077f8..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/android-library.iml b/android-library.iml deleted file mode 100644 index 0b4d8d7e..00000000 --- a/android-library.iml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sample_client/sample_client.iml b/sample_client/sample_client.iml deleted file mode 100644 index 9a41c0df..00000000 --- a/sample_client/sample_client.iml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test_client/test_client.iml b/test_client/test_client.iml deleted file mode 100644 index 7ab0892d..00000000 --- a/test_client/test_client.iml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -