Merge pull request getodk#2398 from lognaturel/update-licenses

Update licenses
yaroing · Jul 20, 2018 · 421ef8f · 421ef8f
2 parents 76ca110 + ec92168
commit 421ef8f
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 1 deletion.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -19,4 +19,5 @@ https://github.com/opendatakit/collect/blob/master/CONTRIBUTING.md
 
 #### Before submitting this PR, please make sure you have:
 - [ ] run `./gradlew pmd checkstyle lintDebug spotbugsDebug` and confirmed all checks still pass.
+- [ ] verified that any code or assets from external sources are properly credited in comments and/or in the [about file](https://github.com/opendatakit/collect/blob/master/collect_app/src/main/assets/open_source_licenses.html).
 - [ ] verified that any new UI elements use theme colors. [UI Components Style guidelines](https://github.com/opendatakit/collect/blob/master/CONTRIBUTING.md#ui-components-style-guidelines)
diff --git a/collect_app/src/main/assets/open_source_licenses.html b/collect_app/src/main/assets/open_source_licenses.html
@@ -32,9 +32,18 @@ <h3>
     Apache License Version 2.0, January 2004
 </h3>
 <ul>
+    <li>
+        <b>Butterknife</b>
+    </li>
     <li>
         <b>Commons IO</b>
     </li>
+    <li>
+        <b>Dagger 2</b>
+    </li>
+    <li>
+        <b>Evernote Android-Job</b>
+    </li>
     <li>
         <b>Firebase Core</b>
     </li>
@@ -98,10 +107,12 @@ <h3>
     <li>
         <b>Google Support Runner</b>
     </li>
-
     <li>
         <b>Gson</b>
     </li>
+    <li>
+        <b>HSV-Alpha Color Picker for Android</b>
+    </li>
     <li>
         <b>HTTPClientAndroidLib</b>
     </li>
@@ -111,6 +122,12 @@ <h3>
     <li>
         <b>Joda-Time</b>
     </li>
+    <li>
+        <b>Karumi Dexter</b>
+    </li>
+    <li>
+        <b>LeakCanary</b>
+    </li>
     <li>
         <b>Material Design Icons by Google</b>
     </li>
@@ -120,6 +137,33 @@ <h3>
     <li>
         <b>OsmDroid</b>
     </li>
+    <li>
+        Powermock
+    </li>
+    <li>
+        <b>RxAndroid</b>
+    </li>
+    <li>
+        <b>RxBinding</b>
+    </li>
+    <li>
+        <b>RxJava 2</b>
+    </li>
+    <li>
+        <b>RxLifecycle</b>
+    </li>
+    <li>
+        <b>RxRelay</b>
+    </li>
+    <li>
+        <b>Timber</b>
+    </li>
+    <li>
+        <b>ZXing</b>
+    </li>
+    <li>
+        <b>ZXing Android Embedded</b>
+    </li>
 </ul>
 <pre>
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -179,6 +223,9 @@ <h3>
     The MIT License (MIT)
 </h3>
 <ul>
+    <li>
+        <b>Fastlane Screengrab</b>
+    </li>
     <li>
         <b>Mockito</b>
     </li>