Merge pull request #50 from MindscapeHQ/xray-2287-backport-fixes

XRAY-2287 Backport fixes from Kai's 4.0 branch
MindscapeHQ · Nov 6, 2018 · 1e7abf6 · 1e7abf6
2 parents cef882b + ebb4a46
commit 1e7abf6
Show file tree

Hide file tree

Showing 90 changed files with 1,430 additions and 1,160 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-# built application files
+#built application files
 *.apk
 *.ap_
 
@@ -11,14 +11,35 @@
 # generated files
 bin/
 gen/
-target/
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Eclipse project files
-.classpath
-.project
+# Windows thumbnail db
+Thumbs.db
 
+# OSX files
+.DS_Store
+
+# Android Studio
+*.iml
 .idea/workspace.xml
-.idea/tasks.xml
+.idea/libraries
+.idea/modules.xml
+.idea/caches/
+.gradle
+build/
+.navigation
+captures/
+output.json 
+
+# Eclipse (god beware)
+.settings/
+
+# NDK
+obj/
+.externalNativeBuild
+
+# Gradle
+gradle.properties
+secring.gpg
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/Maven__com_google_android_android_2_2_1.xml b/.idea/libraries/Maven__com_google_android_android_2_2_1.xml
diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml
diff --git a/.idea/libraries/Maven__com_mindscapehq_android_raygun4android_1_2_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_mindscapehq_android_raygun4android_1_2_0_SNAPSHOT.xml
diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_3.xml
diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_0_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_0_1.xml
diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_0_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_0_1.xml
diff --git a/.idea/libraries/Maven__org_json_json_20080701.xml b/.idea/libraries/Maven__org_json_json_20080701.xml
diff --git a/.idea/libraries/Maven__org_khronos_opengl_api_gl1_1_android_2_1_r1.xml b/.idea/libraries/Maven__org_khronos_opengl_api_gl1_1_android_2_1_r1.xml
diff --git a/.idea/libraries/Maven__xerces_xmlParserAPIs_2_6_2.xml b/.idea/libraries/Maven__xerces_xmlParserAPIs_2_6_2.xml
diff --git a/.idea/libraries/Maven__xpp3_xpp3_1_1_4c.xml b/.idea/libraries/Maven__xpp3_xpp3_1_1_4c.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml