From 0ece37aa29350788f693a9dfafc289998aa63b8e Mon Sep 17 00:00:00 2001 From: Michael Hess Date: Sat, 3 Oct 2015 04:31:38 -0400 Subject: [PATCH 1/6] added gitignore --- .gitignore | 2 ++ .idea/compiler.xml | 22 ++++++++++++++++++++++ .idea/copyright/profiles_settings.xml | 3 +++ .idea/gradle.xml | 11 +++++++++++ .idea/misc.xml | 19 +++++++++++++++++++ .idea/modules.xml | 6 ++++++ .idea/vcs.xml | 6 ++++++ BernieAppAndroid.iml | 20 ++++++++++++++++++++ 8 files changed, 89 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 BernieAppAndroid.iml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..62b126c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea/* +app/src/main/res/values/key.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..0fb1693 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6eabdcd --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..6d963b6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..6564d52 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/BernieAppAndroid.iml b/BernieAppAndroid.iml new file mode 100644 index 0000000..397f459 --- /dev/null +++ b/BernieAppAndroid.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From ef8dd1bfdc228eab99cf55b135ce2b4b0515d394 Mon Sep 17 00:00:00 2001 From: Michael Hess Date: Sat, 3 Oct 2015 04:32:50 -0400 Subject: [PATCH 2/6] ignoring more things --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 62b126c..7825df3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .idea/* +build/* +.gradle/* +gradle/* app/src/main/res/values/key.xml From 8897e0619b4da2c9d731aadf8ab45151b49a23a4 Mon Sep 17 00:00:00 2001 From: Michael Hess Date: Sat, 3 Oct 2015 04:34:26 -0400 Subject: [PATCH 3/6] fixed reference to Google Maps API KEY --- app/src/main/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f1b06e2..0160754 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,7 @@ + android:value="@string/google_maps_api_key"/> Date: Sat, 3 Oct 2015 04:38:43 -0400 Subject: [PATCH 4/6] removing files that should not be tracked --- .idea/compiler.xml | 22 ------------------- .idea/copyright/profiles_settings.xml | 3 --- .idea/gradle.xml | 11 ---------- .../libraries/StickyScrollViewItems_1_1_0.xml | 10 --------- .idea/libraries/appcompat_v7_22_2_0.xml | 15 ------------- .idea/libraries/mediarouter_v7_22_0_0.xml | 14 ------------ .idea/libraries/picasso_2_5_2.xml | 11 ---------- .idea/libraries/play_services_7_5_0.xml | 10 --------- .idea/libraries/play_services_ads_7_5_0.xml | 10 --------- .../play_services_analytics_7_5_0.xml | 10 --------- .../play_services_appindexing_7_5_0.xml | 10 --------- .../play_services_appinvite_7_5_0.xml | 10 --------- .../play_services_appstate_7_5_0.xml | 10 --------- .idea/libraries/play_services_base_7_5_0.xml | 10 --------- .idea/libraries/play_services_cast_7_5_0.xml | 10 --------- .idea/libraries/play_services_drive_7_5_0.xml | 10 --------- .../libraries/play_services_fitness_7_5_0.xml | 10 --------- .idea/libraries/play_services_games_7_5_0.xml | 10 --------- .idea/libraries/play_services_gcm_7_5_0.xml | 10 --------- .../play_services_identity_7_5_0.xml | 10 --------- .../play_services_location_7_5_0.xml | 10 --------- .idea/libraries/play_services_maps_7_5_0.xml | 10 --------- .../libraries/play_services_nearby_7_5_0.xml | 10 --------- .../play_services_panorama_7_5_0.xml | 10 --------- .idea/libraries/play_services_plus_7_5_0.xml | 10 --------- .../play_services_safetynet_7_5_0.xml | 10 --------- .../libraries/play_services_wallet_7_5_0.xml | 10 --------- .../play_services_wearable_7_5_0.xml | 10 --------- .../libraries/support_annotations_22_2_0.xml | 11 ---------- .idea/libraries/support_v4_22_2_0.xml | 16 -------------- .idea/misc.xml | 19 ---------------- .idea/modules.xml | 6 ----- .idea/vcs.xml | 6 ----- 33 files changed, 354 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/libraries/StickyScrollViewItems_1_1_0.xml delete mode 100644 .idea/libraries/appcompat_v7_22_2_0.xml delete mode 100644 .idea/libraries/mediarouter_v7_22_0_0.xml delete mode 100644 .idea/libraries/picasso_2_5_2.xml delete mode 100644 .idea/libraries/play_services_7_5_0.xml delete mode 100644 .idea/libraries/play_services_ads_7_5_0.xml delete mode 100644 .idea/libraries/play_services_analytics_7_5_0.xml delete mode 100644 .idea/libraries/play_services_appindexing_7_5_0.xml delete mode 100644 .idea/libraries/play_services_appinvite_7_5_0.xml delete mode 100644 .idea/libraries/play_services_appstate_7_5_0.xml delete mode 100644 .idea/libraries/play_services_base_7_5_0.xml delete mode 100644 .idea/libraries/play_services_cast_7_5_0.xml delete mode 100644 .idea/libraries/play_services_drive_7_5_0.xml delete mode 100644 .idea/libraries/play_services_fitness_7_5_0.xml delete mode 100644 .idea/libraries/play_services_games_7_5_0.xml delete mode 100644 .idea/libraries/play_services_gcm_7_5_0.xml delete mode 100644 .idea/libraries/play_services_identity_7_5_0.xml delete mode 100644 .idea/libraries/play_services_location_7_5_0.xml delete mode 100644 .idea/libraries/play_services_maps_7_5_0.xml delete mode 100644 .idea/libraries/play_services_nearby_7_5_0.xml delete mode 100644 .idea/libraries/play_services_panorama_7_5_0.xml delete mode 100644 .idea/libraries/play_services_plus_7_5_0.xml delete mode 100644 .idea/libraries/play_services_safetynet_7_5_0.xml delete mode 100644 .idea/libraries/play_services_wallet_7_5_0.xml delete mode 100644 .idea/libraries/play_services_wearable_7_5_0.xml delete mode 100644 .idea/libraries/support_annotations_22_2_0.xml delete mode 100644 .idea/libraries/support_v4_22_2_0.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 0fb1693..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/StickyScrollViewItems_1_1_0.xml b/.idea/libraries/StickyScrollViewItems_1_1_0.xml deleted file mode 100644 index 9abba27..0000000 --- a/.idea/libraries/StickyScrollViewItems_1_1_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_22_2_0.xml b/.idea/libraries/appcompat_v7_22_2_0.xml deleted file mode 100644 index 621e4a0..0000000 --- a/.idea/libraries/appcompat_v7_22_2_0.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/mediarouter_v7_22_0_0.xml b/.idea/libraries/mediarouter_v7_22_0_0.xml deleted file mode 100644 index fcf1d37..0000000 --- a/.idea/libraries/mediarouter_v7_22_0_0.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/picasso_2_5_2.xml b/.idea/libraries/picasso_2_5_2.xml deleted file mode 100644 index b05e3b6..0000000 --- a/.idea/libraries/picasso_2_5_2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_7_5_0.xml b/.idea/libraries/play_services_7_5_0.xml deleted file mode 100644 index 811b5de..0000000 --- a/.idea/libraries/play_services_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_ads_7_5_0.xml b/.idea/libraries/play_services_ads_7_5_0.xml deleted file mode 100644 index ce8a703..0000000 --- a/.idea/libraries/play_services_ads_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_analytics_7_5_0.xml b/.idea/libraries/play_services_analytics_7_5_0.xml deleted file mode 100644 index 1d333d7..0000000 --- a/.idea/libraries/play_services_analytics_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_appindexing_7_5_0.xml b/.idea/libraries/play_services_appindexing_7_5_0.xml deleted file mode 100644 index f496e52..0000000 --- a/.idea/libraries/play_services_appindexing_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_appinvite_7_5_0.xml b/.idea/libraries/play_services_appinvite_7_5_0.xml deleted file mode 100644 index d2a8d43..0000000 --- a/.idea/libraries/play_services_appinvite_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_appstate_7_5_0.xml b/.idea/libraries/play_services_appstate_7_5_0.xml deleted file mode 100644 index a71b35f..0000000 --- a/.idea/libraries/play_services_appstate_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_base_7_5_0.xml b/.idea/libraries/play_services_base_7_5_0.xml deleted file mode 100644 index a0159a7..0000000 --- a/.idea/libraries/play_services_base_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_cast_7_5_0.xml b/.idea/libraries/play_services_cast_7_5_0.xml deleted file mode 100644 index 737ce79..0000000 --- a/.idea/libraries/play_services_cast_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_drive_7_5_0.xml b/.idea/libraries/play_services_drive_7_5_0.xml deleted file mode 100644 index 5602140..0000000 --- a/.idea/libraries/play_services_drive_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_fitness_7_5_0.xml b/.idea/libraries/play_services_fitness_7_5_0.xml deleted file mode 100644 index c523618..0000000 --- a/.idea/libraries/play_services_fitness_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_games_7_5_0.xml b/.idea/libraries/play_services_games_7_5_0.xml deleted file mode 100644 index 2672a72..0000000 --- a/.idea/libraries/play_services_games_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_gcm_7_5_0.xml b/.idea/libraries/play_services_gcm_7_5_0.xml deleted file mode 100644 index b94c1d3..0000000 --- a/.idea/libraries/play_services_gcm_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_identity_7_5_0.xml b/.idea/libraries/play_services_identity_7_5_0.xml deleted file mode 100644 index 2cd28ee..0000000 --- a/.idea/libraries/play_services_identity_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_location_7_5_0.xml b/.idea/libraries/play_services_location_7_5_0.xml deleted file mode 100644 index 16b78c6..0000000 --- a/.idea/libraries/play_services_location_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_maps_7_5_0.xml b/.idea/libraries/play_services_maps_7_5_0.xml deleted file mode 100644 index ec7654e..0000000 --- a/.idea/libraries/play_services_maps_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_nearby_7_5_0.xml b/.idea/libraries/play_services_nearby_7_5_0.xml deleted file mode 100644 index 2ab9739..0000000 --- a/.idea/libraries/play_services_nearby_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_panorama_7_5_0.xml b/.idea/libraries/play_services_panorama_7_5_0.xml deleted file mode 100644 index e2c1a20..0000000 --- a/.idea/libraries/play_services_panorama_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_plus_7_5_0.xml b/.idea/libraries/play_services_plus_7_5_0.xml deleted file mode 100644 index 8b27ad3..0000000 --- a/.idea/libraries/play_services_plus_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_safetynet_7_5_0.xml b/.idea/libraries/play_services_safetynet_7_5_0.xml deleted file mode 100644 index 2b9be0d..0000000 --- a/.idea/libraries/play_services_safetynet_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_wallet_7_5_0.xml b/.idea/libraries/play_services_wallet_7_5_0.xml deleted file mode 100644 index 95fcdc8..0000000 --- a/.idea/libraries/play_services_wallet_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/play_services_wearable_7_5_0.xml b/.idea/libraries/play_services_wearable_7_5_0.xml deleted file mode 100644 index 64930da..0000000 --- a/.idea/libraries/play_services_wearable_7_5_0.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_22_2_0.xml b/.idea/libraries/support_annotations_22_2_0.xml deleted file mode 100644 index 6e13929..0000000 --- a/.idea/libraries/support_annotations_22_2_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_22_2_0.xml b/.idea/libraries/support_v4_22_2_0.xml deleted file mode 100644 index d3b1b8d..0000000 --- a/.idea/libraries/support_v4_22_2_0.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 6eabdcd..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 6d963b6..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 6564d52..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file From 6cd1e14378a18bcf986fc525c2cb31210ba3aacd Mon Sep 17 00:00:00 2001 From: Michael Hess Date: Sat, 3 Oct 2015 04:39:57 -0400 Subject: [PATCH 5/6] ignoring more idea files and tolerating lint errors for the moment. must revisit. --- .gitignore | 1 + app/build.gradle | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 7825df3..ded4646 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ build/* .gradle/* gradle/* +*.iml app/src/main/res/values/key.xml diff --git a/app/build.gradle b/app/build.gradle index 5033f65..4b179f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,11 @@ apply plugin: 'com.android.application' android { + + lintOptions { + abortOnError false + } + compileSdkVersion 21 buildToolsVersion "21.1.2" From 42793a25ad33059c337828bcd879f0104fd40384 Mon Sep 17 00:00:00 2001 From: Michael Hess Date: Sat, 3 Oct 2015 05:04:27 -0400 Subject: [PATCH 6/6] added wrapper job, removed iml files from tracking --- BernieAppAndroid.iml | 20 ------ app/app.iml | 144 ------------------------------------------- build.gradle | 4 ++ 3 files changed, 4 insertions(+), 164 deletions(-) delete mode 100644 BernieAppAndroid.iml delete mode 100644 app/app.iml diff --git a/BernieAppAndroid.iml b/BernieAppAndroid.iml deleted file mode 100644 index 397f459..0000000 --- a/BernieAppAndroid.iml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index f7a8d1d..0000000 --- a/app/app.iml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1b7886d..6661761 100644 --- a/build.gradle +++ b/build.gradle @@ -17,3 +17,7 @@ allprojects { jcenter() } } + +task wrapper (type: Wrapper) { + gradleVersion = '2.0' +}