From f850dbb51c8982a9d91abb57d762e56e1b546dd8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 13 Nov 2023 12:42:58 -0800 Subject: [PATCH] Minor cleanup --- .idea/misc.xml | 11 +++++++++++ README.md | 2 +- src/bld/java/net/thauvin/erik/AkismetBuild.java | 8 ++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 6933af7..7a6aa48 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,6 +6,17 @@ + diff --git a/README.md b/README.md index d0d25b3..dcf5937 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Maven Central](https://img.shields.io/maven-central/v/net.thauvin.erik/akismet-kotlin.svg?color=blue)](https://central.sonatype.com/artifact/net.thauvin.erik/akismet-kotlin) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_akismet-kotlin&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_akismet-kotlin) -[![GitHub CI](https://github.com/ethauvin/akismet-kotlin/actions/workflows/bld.yml/badge.svg)](https://github.com/ethauvin/akismet-kotlin/actions/workflows/gradle.yml) +[![GitHub CI](https://github.com/ethauvin/akismet-kotlin/actions/workflows/bld.yml/badge.svg)](https://github.com/ethauvin/akismet-kotlin/actions/workflows/bld.yml) [![CircleCI](https://circleci.com/gh/ethauvin/akismet-kotlin/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/akismet-kotlin/tree/master) # [Akismet](https://www.akismet.com) for Kotlin, Java and Android diff --git a/src/bld/java/net/thauvin/erik/AkismetBuild.java b/src/bld/java/net/thauvin/erik/AkismetBuild.java index 9a593c4..c8fa65f 100644 --- a/src/bld/java/net/thauvin/erik/AkismetBuild.java +++ b/src/bld/java/net/thauvin/erik/AkismetBuild.java @@ -33,10 +33,7 @@ package net.thauvin.erik; import rife.bld.BuildCommand; import rife.bld.Project; -import rife.bld.extension.CompileKotlinOperation; -import rife.bld.extension.CompileKotlinOptions; -import rife.bld.extension.GeneratedVersionOperation; -import rife.bld.extension.JacocoReportOperation; +import rife.bld.extension.*; import rife.bld.extension.dokka.DokkaOperation; import rife.bld.extension.dokka.LoggingLevel; import rife.bld.extension.dokka.OutputFormat; @@ -120,8 +117,7 @@ public class AkismetBuild extends Project { genver(); new CompileKotlinOperation() .fromProject(this) - .plugins(CompileKotlinOperation.getJarList(libCompileDirectory(), - "^.*kotlin-serialization-compiler-plugin-.*$")) + .plugins(libCompileDirectory(), CompileKotlinPlugin.KOTLIN_SERIALIZATION) .compileOptions( new CompileKotlinOptions() .jdkRelease(javaRelease)