From a39450ed561d084fc2c9d68fe2b1e27f15b345d0 Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Fri, 31 Aug 2018 14:55:25 +0300 Subject: [PATCH] Update gradle build config --- README.md | 2 +- build.gradle | 42 ++++++++++++++++----------- docs/README.md | 2 +- markwon-html-parser-api/build.gradle | 9 +----- markwon-html-parser-impl/build.gradle | 9 +----- markwon-image-loader/build.gradle | 8 +---- markwon-syntax-highlight/build.gradle | 8 +---- markwon-view/build.gradle | 8 +---- markwon/build.gradle | 8 +---- 9 files changed, 33 insertions(+), 63 deletions(-) diff --git a/README.md b/README.md index b0b626c1..45228c28 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ Please visit [documentation] web-site for further reference * Images (`img` will require configured image loader) * Blockquote (`blockquote`) * Heading (`h1`, `h2`, `h3`, `h4`, `h5`, `h6`) - * there is support to render any HTML tags + * there is support to render any HTML tag * Task lists: - [ ] Not _done_ - [X] **Done** with `X` diff --git a/build.gradle b/build.gradle index 01d388f6..a99710f4 100644 --- a/build.gradle +++ b/build.gradle @@ -19,18 +19,6 @@ allprojects { } version = VERSION_NAME group = GROUP - - project.afterEvaluate { - if (project.hasProperty('android')) { - project.android.testOptions.unitTests.all { - testLogging { - events "passed", "skipped", "failed" - exceptionFormat "short" - showStandardStreams = true - } - } - } - } } task clean(type: Delete) { @@ -52,11 +40,6 @@ if (hasProperty('local')) { ext { - // Config - BUILD_TOOLS = '27.0.3' - TARGET_SDK = 27 - MIN_SDK = 16 - config = [ 'build-tools' : '27.0.3', 'compile-sdk' : 27, @@ -99,9 +82,34 @@ ext { 'commons-io' : 'commons-io:commons-io:2.6', 'mockito' : 'org.mockito:mockito-core:2.21.0' ] + + registerArtifact = this.®isterArtifact } task checkUpdates { apply plugin: 'com.github.ben-manes.versions' dependsOn 'dependencyUpdates' } + +def registerArtifact(project) { + + if (hasProperty('release')) { + project.apply from: config['push-aar-gradle'] + } + + project.afterEvaluate { + + // disable generation of BuildConfig files + project.generateDebugBuildConfig.enabled = false + project.generateReleaseBuildConfig.enabled = false + + // print test status (for CI) + project.android.testOptions.unitTests.all { + testLogging { + events "passed", "skipped", "failed" + exceptionFormat "short" + showStandardStreams = true + } + } + } +} diff --git a/docs/README.md b/docs/README.md index 2fdd75ac..0a8e8ba5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -47,7 +47,7 @@ listed in are supported (including support for * * Images (`img` will require configured image loader) * Blockquote (`blockquote`) * Heading (`h1`, `h2`, `h3`, `h4`, `h5`, `h6`) - * there is support to render any HTML tags, but it will require to create a special `TagHandler`, + * there is support to render any HTML tag, but it will require to create a special `TagHandler`, more information can be found in [HTML section](/docs/html.md#custom-tag-handler) * Task lists: - [ ] Not _done_ diff --git a/markwon-html-parser-api/build.gradle b/markwon-html-parser-api/build.gradle index d1ad8fc3..8e38acbb 100644 --- a/markwon-html-parser-api/build.gradle +++ b/markwon-html-parser-api/build.gradle @@ -20,11 +20,4 @@ dependencies { } } -afterEvaluate { - generateDebugBuildConfig.enabled = false - generateReleaseBuildConfig.enabled = false -} - -if (hasProperty('release')) { - apply from: config['push-aar-gradle'] -} +registerArtifact(this) diff --git a/markwon-html-parser-impl/build.gradle b/markwon-html-parser-impl/build.gradle index b1171ca6..2af46373 100644 --- a/markwon-html-parser-impl/build.gradle +++ b/markwon-html-parser-impl/build.gradle @@ -28,11 +28,4 @@ dependencies { } } -afterEvaluate { - generateDebugBuildConfig.enabled = false - generateReleaseBuildConfig.enabled = false -} - -if (hasProperty('release')) { - apply from: config['push-aar-gradle'] -} +registerArtifact(this) diff --git a/markwon-image-loader/build.gradle b/markwon-image-loader/build.gradle index ba05770b..fd4293c8 100644 --- a/markwon-image-loader/build.gradle +++ b/markwon-image-loader/build.gradle @@ -34,10 +34,4 @@ dependencies { } } -afterEvaluate { - generateReleaseBuildConfig.enabled = false -} - -if (hasProperty('release')) { - apply from: config['push-aar-gradle'] -} +registerArtifact(this) diff --git a/markwon-syntax-highlight/build.gradle b/markwon-syntax-highlight/build.gradle index be3f0680..daa29c7c 100644 --- a/markwon-syntax-highlight/build.gradle +++ b/markwon-syntax-highlight/build.gradle @@ -23,10 +23,4 @@ dependencies { } } -afterEvaluate { - generateReleaseBuildConfig.enabled = false -} - -if (hasProperty('release')) { - apply from: config['push-aar-gradle'] -} +registerArtifact(this) diff --git a/markwon-view/build.gradle b/markwon-view/build.gradle index d79c2b01..5e4e72ab 100644 --- a/markwon-view/build.gradle +++ b/markwon-view/build.gradle @@ -22,10 +22,4 @@ dependencies { } } -afterEvaluate { - generateReleaseBuildConfig.enabled = false -} - -if (hasProperty('release')) { - apply from: config['push-aar-gradle'] -} +registerArtifact(this) diff --git a/markwon/build.gradle b/markwon/build.gradle index d753a53e..fc3dc8ff 100644 --- a/markwon/build.gradle +++ b/markwon/build.gradle @@ -37,10 +37,4 @@ dependencies { } } -afterEvaluate { - generateReleaseBuildConfig.enabled = false -} - -if (hasProperty('release')) { - apply from: config['push-aar-gradle'] -} +registerArtifact(this) \ No newline at end of file