From f7da7c961add9eeaafa71685e496943e847d4de1 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sat, 30 Jan 2016 00:49:21 +0400
Subject: [PATCH 1/3] Add u2020.

---
 home/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/index.html b/home/index.html
index eef955f..f7f7a94 100644
--- a/home/index.html
+++ b/home/index.html
@@ -172,6 +172,7 @@ Kobalt is currently in Beta but already used in several projects. Here are links
   <li><a href="https://github.com/cbeust/jcommander/blob/master/kobalt/src/Build.kt">JCommander</a>.</li>
   <li><a href="https://github.com/cbeust/testng/blob/master/kobalt/src/Build.kt">TestNG</a> (this build file shows an example of adding a custom task in the build itself).</li>
   <li><a href="https://github.com/cbeust/klaxon/blob/master/kobalt/src/Build.kt">Klaxon</a></li>
+  <li><a href="https://github.com/cbeust/kobalt-android">u2020 (Android show case application)</a></li>
   <li>... and of course, <a href="https://github.com/cbeust/kobalt/blob/master/kobalt/src/Build.kt">Kobalt itself</a> (this build file demonstrates multi projects and project dependencies).</li>
 </ul>
 

From 7d170bfb53e681d2374ce0b99c0a72458dd47947 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 23:40:30 +0400
Subject: [PATCH 2/3] Document mixed projects.

---
 plug-ins/index.html | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/plug-ins/index.html b/plug-ins/index.html
index 466b2f2..e8755bf 100644
--- a/plug-ins/index.html
+++ b/plug-ins/index.html
@@ -58,8 +58,7 @@ val p = javaProject(wrapper) {
   group = "com.beust"
   artifactId = name
   version = "0.1"
-}
-</pre>
+}</pre>
 
 <p>
 Both these directives create an object of type <code><a href="https://github.com/cbeust/kobalt/blob/master/src/main/kotlin/com/beust/kobalt/api/Project.kt">Project</code></a>.
@@ -85,6 +84,25 @@ A <code>Project</code> has two mandatory attributes: <code>name</code> and <code
     <dd>The dependencies for your tests</dd>
   </dl>
 
+<h4 class="section" id="mixed-projects" indent="2">Mixed language projects</h4>
+<p>
+  A Kobalt project can have multiple languages in it (Kotlin and Java): just specify all the source
+  directories you need. For example, for a <code>javaProject</code>, add <code>src/main/kotlin</code> as a
+  source directory:
+</p>
+<pre class="brush:java">
+val p = javaProject(wrapper) {
+    name = "kobalt"
+    // ...
+    sourceDirectories {
+        path("src/main/java", "src/main/kotlin")
+    }
+}</pre>
+<p>Note that source files must be in their respective directory (<code>.java</code> in
+  <code>src/main/java</code> and <code>.kt</code> in <code>src/main/kotlin</code>). This restrictions
+  might be relaxed in the future.
+</p>
+
 <h3 class="section" id="tasks" indent="1">Tasks</h3>
 <p>
 Once you have at least one project configured, the plug-in lets you invoke the following tasks:

From afa2b44dcf5a0540271b43b712768746f5520b4a Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 2 Feb 2016 23:41:51 +0400
Subject: [PATCH 3/3] Remove.

---
 plug-ins/index.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/plug-ins/index.html b/plug-ins/index.html
index e8755bf..ba717e3 100644
--- a/plug-ins/index.html
+++ b/plug-ins/index.html
@@ -99,8 +99,7 @@ val p = javaProject(wrapper) {
     }
 }</pre>
 <p>Note that source files must be in their respective directory (<code>.java</code> in
-  <code>src/main/java</code> and <code>.kt</code> in <code>src/main/kotlin</code>). This restrictions
-  might be relaxed in the future.
+  <code>src/main/java</code> and <code>.kt</code> in <code>src/main/kotlin</code>).
 </p>
 
 <h3 class="section" id="tasks" indent="1">Tasks</h3>