From 55ea5a34bbb8e29e2ed594a44224066c92f07bde Mon Sep 17 00:00:00 2001 From: Vladimir Orany Date: Wed, 25 Nov 2020 11:40:47 +0100 Subject: [PATCH] switched to newer version of Kordamp plugins and using the Coveralls plugin from Kordamp --- build.gradle | 16 --------------- .../gradle.properties | 18 +++++++++++++++++ gradle.properties | 20 ++++++++++++++++++- 3 files changed, 37 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 128b60bc..32f71ce4 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,6 @@ plugins { id 'org.kordamp.gradle.groovy-project' id 'org.kordamp.gradle.bintray' - id 'com.github.kt3k.coveralls' } if (!project.hasProperty('bintrayUsername')) ext.bintrayUsername = '**UNDEFINED**' @@ -179,18 +178,3 @@ subprojects { Project subproject -> } } } - -gradle.taskGraph.whenReady { - coveralls { - sourceDirs = subprojects.findAll { it.plugins.hasPlugin('java') } sourceSets.main.allSource.srcDirs.flatten() - jacocoReportPath = "${buildDir}/reports/jacoco/root/jacocoTestReport.xml" - } -} - -tasks.coveralls { - group = 'Coverage reports' - description = 'Uploads the aggregated coverage report to Coveralls' - - dependsOn jacocoRootReport - onlyIf { System.env.CI || System.env.GITHUB_ACTIONS } -} diff --git a/examples/micronaut-grails-example/gradle.properties b/examples/micronaut-grails-example/gradle.properties index f7ed94c0..b252ea67 100644 --- a/examples/micronaut-grails-example/gradle.properties +++ b/examples/micronaut-grails-example/gradle.properties @@ -1,3 +1,21 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright 2020 Vladimir Orany. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + grailsVersion=4.0.4 gorm.version=7.0.6.RELEASE org.gradle.daemon=true diff --git a/gradle.properties b/gradle.properties index b94d1c11..4485897b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,21 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# +# Copyright 2020 Vladimir Orany. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + slug=agorapulse/micronaut-grails group=com.agorapulse version = 2.0.0-SNAPSHOT @@ -12,7 +30,7 @@ awsSdkVersion = 1.11.656 awsSdk2Version = 2.9.24 testcontainersVersion = 1.12.1 groovyClosureSupportVersion = 0.6.0 -kordampVersion=0.30.4 +kordampVersion=0.36.0 # this should be aligned to Micronaut version # required for AWS CBOR marshalling