From: kenstir <kenstir@gmail.com>
Date: Wed, 4 Nov 2015 17:21:48 +0000 (-0500)
Subject: Successfully built using IntelliJ IDEA Community Edition 15.0
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4c6f0e06b7935efaeb5e0708dffa2d97f55cdd42;p=working%2FEvergreen.git

Successfully built using IntelliJ IDEA Community Edition 15.0
Do not attempt to build this using Android Studio; the projects
build but most of the assets are missing from the UI.
---

diff --git a/Open-ILS/src/Android/cwmars_app/.idea/encodings.xml b/Open-ILS/src/Android/cwmars_app/.idea/encodings.xml
index e206d70d85..f758959656 100644
--- a/Open-ILS/src/Android/cwmars_app/.idea/encodings.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/encodings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/cwmars_app/.idea/misc.xml b/Open-ILS/src/Android/cwmars_app/.idea/misc.xml
index bcea67aeb9..99f8d99674 100644
--- a/Open-ILS/src/Android/cwmars_app/.idea/misc.xml
+++ b/Open-ILS/src/Android/cwmars_app/.idea/misc.xml
@@ -3,6 +3,30 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
diff --git a/Open-ILS/src/Android/demo_app/.idea/encodings.xml b/Open-ILS/src/Android/demo_app/.idea/encodings.xml
index e206d70d85..f758959656 100644
--- a/Open-ILS/src/Android/demo_app/.idea/encodings.xml
+++ b/Open-ILS/src/Android/demo_app/.idea/encodings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/.idea/misc.xml b/Open-ILS/src/Android/demo_app/.idea/misc.xml
index 4742f8a179..4fa8d4563b 100644
--- a/Open-ILS/src/Android/demo_app/.idea/misc.xml
+++ b/Open-ILS/src/Android/demo_app/.idea/misc.xml
@@ -3,8 +3,31 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android 4.4 Platform" project-jdk-type="Android SDK">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="Android API 19 Platform" project-jdk-type="Android SDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/Open-ILS/src/Android/demo_app/demo_app.iml b/Open-ILS/src/Android/demo_app/demo_app.iml
index b366ef5d18..baccb65b0a 100644
--- a/Open-ILS/src/Android/demo_app/demo_app.iml
+++ b/Open-ILS/src/Android/demo_app/demo_app.iml
@@ -13,9 +13,8 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
   </component>
-</module>
-
+</module>
\ No newline at end of file