From 07c229e94b4b49e6d1e77da4630b2b028760b901 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Thu, 14 Apr 2016 19:57:49 +0300
Subject: [PATCH] Exclude InlineOnly from kotlin-test

It's already present in kotlin-stdlib and that causes
com.android.dex.DexException

 #KT-11505 Fixed
---
 build.xml                            | 2 +-
 libraries/kotlin.test/shared/pom.xml | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6e6af40632a..8fead73c332 100644
--- a/build.xml
+++ b/build.xml
@@ -902,7 +902,7 @@
 
         <pack-runtime-jar jar-name="kotlin-test.jar" implementation-title="${manifest.impl.title.kotlin.test}">
             <jar-content>
-                <fileset dir="${output}/classes/kotlin-test" includes="**/*" excludes="kotlin/internal/OnlyInputTypes*,kotlin/internal"/>
+                <fileset dir="${output}/classes/kotlin-test" includes="**/*" excludes="kotlin/internal/OnlyInputTypes*,kotlin/internal/InlineOnly*,kotlin/internal"/>
             </jar-content>
         </pack-runtime-jar>
     </target>
diff --git a/libraries/kotlin.test/shared/pom.xml b/libraries/kotlin.test/shared/pom.xml
index 4d86c0ef78a..a31718036c5 100644
--- a/libraries/kotlin.test/shared/pom.xml
+++ b/libraries/kotlin.test/shared/pom.xml
@@ -159,6 +159,7 @@
                         <configuration>
                             <excludes>
                                 <exclude>kotlin/internal/OnlyInputTypes*</exclude>
+                                <exclude>kotlin/internal/InlineOnly*</exclude>
                                 <exclude>kotlin/internal</exclude>
                             </excludes>
                             <archive>