From 7c0cda26fc220450d93ebf44e5521ac2bb487cab Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 20:52:57 -0500 Subject: [PATCH 1/8] update build scan to 3.4.1 --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 1773689e..679552f8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.1.1" + id "com.gradle.enterprise" version "3.4.1" } rootProject.name = 'gradle-license-plugin' From c4ac93b7dace7a4a079bfbc4dbe21e81bfa97bad Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 20:54:09 -0500 Subject: [PATCH 2/8] update com.github.ben-manes.versions to 0.36.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e01ce12b..a0cc1330 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.jfrog.artifactory' version '4.13.0' id 'com.jfrog.bintray' version '1.8.4' - id 'com.github.ben-manes.versions' version '0.28.0' + id 'com.github.ben-manes.versions' version '0.36.0' id 'com.gradle.plugin-publish' version '0.12.0' id 'org.jetbrains.kotlin.jvm' version '1.3.61' id 'org.jetbrains.dokka' version '0.10.1' From 6d2228e188ee42bf244a084ae57f9786323b3b82 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 20:58:08 -0500 Subject: [PATCH 3/8] update com.jfrog.artifactory.gradle.plugin to 4.18.2 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a0cc1330..10cc528e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.jfrog.artifactory' version '4.13.0' + id 'com.jfrog.artifactory' version '4.18.2' id 'com.jfrog.bintray' version '1.8.4' id 'com.github.ben-manes.versions' version '0.36.0' id 'com.gradle.plugin-publish' version '0.12.0' From bd1288d0ee6d7deebe1b537374137599d0e149f1 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 20:59:17 -0500 Subject: [PATCH 4/8] update com.jfrog.bintray to 1.8.5 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 10cc528e..754b077e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'com.jfrog.artifactory' version '4.18.2' - id 'com.jfrog.bintray' version '1.8.4' + id 'com.jfrog.bintray' version '1.8.5' id 'com.github.ben-manes.versions' version '0.36.0' id 'com.gradle.plugin-publish' version '0.12.0' id 'org.jetbrains.kotlin.jvm' version '1.3.61' From 2bc95ec189354c53297dd0a47116772c02debf10 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 21:08:17 -0500 Subject: [PATCH 5/8] update kotlin to 1.4.10 and ktlint to 9.4.1 --- .github/workflows/build.yml | 2 +- build.gradle | 4 ++-- gradle/dependencies.gradle | 3 +-- .../com/jaredsburrows/license/LicensePlugin.kt | 4 ++-- .../com/jaredsburrows/license/LicenseReportTask.kt | 10 ++++++---- .../license/internal/ConsoleRenderer.kt | 2 +- .../license/internal/report/HtmlReport.kt | 12 ++++++++---- 7 files changed, 21 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f48caa0..e0cf8276 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: java-version: ${{ matrix.java-version }} - name: Run Build - run: ./gradlew clean build jar docsJar sourcesJar testsJar reportsZip generatePomFileForMavenPublication -s --scan + run: ./gradlew clean ktlintCheck build jar docsJar sourcesJar testsJar reportsZip generatePomFileForMavenPublication -s --scan - name: Upload Artifacts to Github uses: actions/upload-artifact@v2 diff --git a/build.gradle b/build.gradle index 754b077e..23348c69 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,9 @@ plugins { id 'com.jfrog.bintray' version '1.8.5' id 'com.github.ben-manes.versions' version '0.36.0' id 'com.gradle.plugin-publish' version '0.12.0' - id 'org.jetbrains.kotlin.jvm' version '1.3.61' + id 'org.jetbrains.kotlin.jvm' version '1.4.10' id 'org.jetbrains.dokka' version '0.10.1' - id 'org.jlleitschuh.gradle.ktlint' version '9.2.1' + id 'org.jlleitschuh.gradle.ktlint' version '9.4.1' id 'java-gradle-plugin' id 'groovy' id 'maven-publish' diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 73ef35e6..ab5b4a7c 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -1,6 +1,6 @@ ext.versions = [ 'java' : '1.8', - 'kotlin': '1.3.61', + 'kotlin': '1.4.10', ] ext.deps = [ @@ -15,7 +15,6 @@ ext.deps = [ 'kotlinx': [ 'html': 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1', ], - 'ktlint': 'com.github.shyiko:ktlint:0.36.0', 'gson': 'com.google.code.gson:gson:2.8.6', 'android': [ 'tools': [ diff --git a/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt b/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt index 3cf088a2..766d5562 100644 --- a/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt +++ b/src/main/kotlin/com/jaredsburrows/license/LicensePlugin.kt @@ -8,13 +8,13 @@ import com.android.build.gradle.FeaturePlugin import com.android.build.gradle.LibraryExtension import com.android.build.gradle.LibraryPlugin import com.android.build.gradle.api.BaseVariant -import java.io.File -import kotlin.reflect.KClass import org.gradle.api.DomainObjectSet import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.api.plugins.ExtensionContainer import org.gradle.api.plugins.JavaPlugin +import java.io.File +import kotlin.reflect.KClass /** A [Plugin] which grabs the POM.xml files from maven dependencies. */ class LicensePlugin : Plugin { diff --git a/src/main/kotlin/com/jaredsburrows/license/LicenseReportTask.kt b/src/main/kotlin/com/jaredsburrows/license/LicenseReportTask.kt index 0a932255..a9b84982 100644 --- a/src/main/kotlin/com/jaredsburrows/license/LicenseReportTask.kt +++ b/src/main/kotlin/com/jaredsburrows/license/LicenseReportTask.kt @@ -11,10 +11,6 @@ import groovy.util.Node import groovy.util.NodeList import groovy.util.XmlParser import groovy.xml.QName -import java.io.File -import java.net.URI -import java.net.URL -import java.util.UUID import org.gradle.api.DefaultTask import org.gradle.api.Task import org.gradle.api.artifacts.Configuration @@ -24,6 +20,10 @@ import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Optional import org.gradle.api.tasks.OutputFile import org.gradle.api.tasks.TaskAction +import java.io.File +import java.net.URI +import java.net.URL +import java.util.UUID /** * A [Task] that creates HTML and JSON reports of the current projects dependencies. @@ -36,8 +36,10 @@ open class LicenseReportTask : DefaultTask() { // tasks can't be final @Input var generateJsonReport = false @Input var copyHtmlReportToAssets = false @Input var copyJsonReportToAssets = false + @Optional @Input var buildType: String? = null + @Optional @Input var variantName: String? = null @Internal var productFlavors = listOf() diff --git a/src/main/kotlin/com/jaredsburrows/license/internal/ConsoleRenderer.kt b/src/main/kotlin/com/jaredsburrows/license/internal/ConsoleRenderer.kt index 602ff2fa..c472f755 100644 --- a/src/main/kotlin/com/jaredsburrows/license/internal/ConsoleRenderer.kt +++ b/src/main/kotlin/com/jaredsburrows/license/internal/ConsoleRenderer.kt @@ -1,10 +1,10 @@ package com.jaredsburrows.license.internal +import org.gradle.api.UncheckedIOException import java.io.File import java.io.IOException import java.net.URI import java.net.URISyntaxException -import org.gradle.api.UncheckedIOException /** * Renders information in a format suitable for logging to the console. diff --git a/src/main/kotlin/com/jaredsburrows/license/internal/report/HtmlReport.kt b/src/main/kotlin/com/jaredsburrows/license/internal/report/HtmlReport.kt index 4e7eb593..69d65fe1 100644 --- a/src/main/kotlin/com/jaredsburrows/license/internal/report/HtmlReport.kt +++ b/src/main/kotlin/com/jaredsburrows/license/internal/report/HtmlReport.kt @@ -235,10 +235,14 @@ fun FlowOrInteractiveOrPhrasingContent.a( block: A.() -> Unit = {} ): Unit = A( attributesMapOf( - "href", href, - "target", target, - "class", classes, - "name", name + "href", + href, + "target", + target, + "class", + classes, + "name", + name ), consumer ) From a667652e167ea972dee4957ce9c41c554d316619 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 21:17:21 -0500 Subject: [PATCH 6/8] update kotlinx-html-jvm to 0.7.2 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index ab5b4a7c..892070ca 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -13,7 +13,7 @@ ext.deps = [ ], ], 'kotlinx': [ - 'html': 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.1', + 'html': 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.2', ], 'gson': 'com.google.code.gson:gson:2.8.6', 'android': [ From 4e3aed92b680f3bd47a6d65f7313d1d753d3f309 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 21:19:04 -0500 Subject: [PATCH 7/8] update xmlunit-matchers to 2.8.2 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 892070ca..c507c1bd 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -25,6 +25,6 @@ ext.deps = [ ], 'spock' : 'org.spockframework:spock-core:1.1-groovy-2.4', 'xmlunit': [ - 'matchers': 'org.xmlunit:xmlunit-matchers:2.6.3', + 'matchers': 'org.xmlunit:xmlunit-matchers:2.8.2', ] ] From 0ae315b8abda4e50b2e1956ec2a888af6e67cea1 Mon Sep 17 00:00:00 2001 From: Jared Burrows Date: Sat, 26 Dec 2020 21:21:28 -0500 Subject: [PATCH 8/8] update spock to 1.3-groovy-2.5 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index c507c1bd..3430e30d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -23,7 +23,7 @@ ext.deps = [ ] ] ], - 'spock' : 'org.spockframework:spock-core:1.1-groovy-2.4', + 'spock' : 'org.spockframework:spock-core:1.3-groovy-2.5', 'xmlunit': [ 'matchers': 'org.xmlunit:xmlunit-matchers:2.8.2', ]