diff options
| author | Paweł Marks <pmarks@virtuslab.com> | 2020-01-15 18:33:53 +0100 |
|---|---|---|
| committer | Paweł Marks <pmarks@virtuslab.com> | 2020-01-15 18:33:53 +0100 |
| commit | 0db075c17417884b6414b84e618a29f234286c4d (patch) | |
| tree | c63600d8700d0643ca7f72acedc35ac7f038ac55 | |
| parent | aca9ac636f97a1eab75eae648a7e5b5c6305b5c7 (diff) | |
| download | dokka-0db075c17417884b6414b84e618a29f234286c4d.tar.gz dokka-0db075c17417884b6414b84e618a29f234286c4d.tar.bz2 dokka-0db075c17417884b6414b84e618a29f234286c4d.zip | |
Temporary reincluding and silencing integration tests
| -rw-r--r-- | .idea/compiler.xml | 8 | ||||
| -rw-r--r-- | integration-tests/gradle-integration-tests/build.gradle | 1 | ||||
| -rw-r--r-- | 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', |