From 0db075c17417884b6414b84e618a29f234286c4d Mon Sep 17 00:00:00 2001
From: Paweł Marks <pmarks@virtuslab.com>
Date: Wed, 15 Jan 2020 18:33:53 +0100
Subject: Temporary reincluding and silencing integration tests

---
 .idea/compiler.xml                                      | 8 --------
 integration-tests/gradle-integration-tests/build.gradle | 1 +
 settings.gradle                                         | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e78fe4d3..f165d41a 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,14 +11,6 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="dokka-maven-plugin" />
-      </profile>
-    </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="android-gradle-plugin_main" target="1.8" />
       <module name="android-gradle-plugin_test" target="1.8" />
diff --git a/integration-tests/gradle-integration-tests/build.gradle b/integration-tests/gradle-integration-tests/build.gradle
index bbbf2e33..70213d8b 100644
--- a/integration-tests/gradle-integration-tests/build.gradle
+++ b/integration-tests/gradle-integration-tests/build.gradle
@@ -56,4 +56,5 @@ testClasses.dependsOn createClasspathManifest
 test {
     systemProperty "android.licenses.overwrite", project.findProperty("android.licenses.overwrite") ?: ""
     inputs.dir(file('testData'))
+    exclude '*' // TODO: Remove this exclude when tests are migrated
 }
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index d5b62a70..aa001f1c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,7 @@ include 'core',
 //        'core:testApi',
         'coreDependencies',
         'integration',
-//        'integration-tests:gradle-integration-tests',
+        'integration-tests:gradle-integration-tests',
         'runners:fatjar',
         'runners:ant',
         'runners:cli',
-- 
cgit