diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..c0a5c71
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{kt,kts}]
+ij_kotlin_imports_layout = *
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.{yml,yaml}]
+indent_size = 2
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..411c077
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index fb5d0bb..d59471e 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,4 +1,5 @@
name: Validate Gradle Wrapper
+
on:
push:
branches:
@@ -12,8 +13,5 @@ jobs:
name: Validation
runs-on: ubuntu-latest
steps:
- - name: Checkout latest code
- uses: actions/checkout@v2
- - name: Validate Gradle Wrapper
- uses: gradle/wrapper-validation-action@v1
-
+ - uses: actions/checkout@v3
+ - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/pre-merge.yaml b/.github/workflows/pre-merge.yaml
index fa82683..b9ebfb1 100644
--- a/.github/workflows/pre-merge.yaml
+++ b/.github/workflows/pre-merge.yaml
@@ -12,25 +12,15 @@ jobs:
gradle:
strategy:
matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
+ os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}
env:
GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- - name: Checkout Repo
- uses: actions/checkout@v2
- - name: Cache Gradle Caches
- uses: actions/cache@v1
- with:
- path: ~/.gradle/caches/
- key: cache-gradle-cache
- - name: Cache Gradle Wrapper
- uses: actions/cache@v1
- with:
- path: ~/.gradle/wrapper/
- key: cache-gradle-wrapper
+ - uses: actions/checkout@v3
+ - uses: gradle/gradle-build-action@v2
- name: Run Gradle tasks
run: ./gradlew preMerge --continue
- name: Stop Gradle
diff --git a/.github/workflows/publish-plugin.yaml b/.github/workflows/publish-plugin.yaml
index b290068..3379482 100644
--- a/.github/workflows/publish-plugin.yaml
+++ b/.github/workflows/publish-plugin.yaml
@@ -13,18 +13,8 @@ jobs:
GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
if: ${{ !contains(github.event.head_commit.message, 'ci skip') }}
steps:
- - name: Checkout Repo
- uses: actions/checkout@v2
- - name: Cache Gradle Caches
- uses: actions/cache@v1
- with:
- path: ~/.gradle/caches/
- key: cache-gradle-cache
- - name: Cache Gradle Wrapper
- uses: actions/cache@v1
- with:
- path: ~/.gradle/wrapper/
- key: cache-gradle-wrapper
+ - uses: actions/checkout@v3
+ - uses: gradle/gradle-build-action@v2
- name: Run Gradle tasks
run: ./gradlew preMerge --continue
- name: Publish on Plugin Portal
diff --git a/.gitignore b/.gitignore
index cf801b7..cf10d2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,5 @@
*.iml
.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+.idea
.DS_Store
-/build
-**/build
\ No newline at end of file
+build
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 758f153..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index e11474c..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index d2ce72d..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index e9a6d52..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- -
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/README.md b/README.md
index 90dd9e4..274c9cd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
# Xuke
+[](https://plugins.gradle.org/plugin/io.github.chao2zhang.xuke)
[](https://github.com/cortinico/kotlin-gradle-plugin-template/actions?query=workflow%3A%22Pre+Merge+Checks%22)
[](LICENSE)
@@ -18,8 +19,7 @@ plugins {
id("io.github.chao2zhang.xuke")
}
-configure {
-
+xuke {
// The Gradle build configurations from which we collect dependencies
configurations.set(listOf("runtimeClasspath"))
diff --git a/build.gradle.kts b/build.gradle.kts
index 7a9754d..0cf4587 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,17 +1,6 @@
plugins {
- kotlin("jvm") version BuildPluginsVersion.KOTLIN apply false
- id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT
-}
-
-allprojects {
- repositories {
- google()
- mavenCentral()
- }
-}
-
-tasks.register("clean", Delete::class.java) {
- delete(rootProject.buildDir)
+ alias(libs.plugins.kotlin.jvm)
+ alias(libs.plugins.ktlint)
}
tasks.register("reformatAll") {
diff --git a/buildSrc/.gitignore b/buildSrc/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/buildSrc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
deleted file mode 100644
index cff9fbd..0000000
--- a/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,7 +0,0 @@
-plugins {
- `kotlin-dsl`
-}
-repositories {
- google()
- mavenCentral()
-}
\ No newline at end of file
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
deleted file mode 100644
index a892b48..0000000
--- a/buildSrc/src/main/java/Dependencies.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-object Versions {
- const val JUNIT = "4.13.2"
-}
-
-object BuildPluginsVersion {
- const val KOTLIN = "1.5.31"
- const val KTLINT = "10.0.0"
-}
-
-object TestingLib {
- const val JUNIT = "junit:junit:${Versions.JUNIT}"
-}
diff --git a/example-jvm/.gitignore b/example-jvm/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/example-jvm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/example-jvm/build.gradle.kts b/example-jvm/build.gradle.kts
index b172332..2de35da 100644
--- a/example-jvm/build.gradle.kts
+++ b/example-jvm/build.gradle.kts
@@ -1,37 +1,25 @@
-import io.github.chao2zhang.XukeExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
plugins {
- kotlin("jvm") version "1.5.31"
+ kotlin("jvm") version "1.8.10"
id("io.github.chao2zhang.xuke")
}
-repositories {
- mavenCentral()
-}
-
sourceSets {
main {
java.srcDir("build/generated")
}
}
-dependencies {
- implementation(kotlin("stdlib"))
-}
-
-val compileKotlin: KotlinCompile by tasks
-compileKotlin.kotlinOptions {
- jvmTarget = "1.8"
+java {
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(8))
+ }
}
-compileKotlin.dependsOn(tasks.xuke)
-val compileTestKotlin: KotlinCompile by tasks
-compileTestKotlin.kotlinOptions {
- jvmTarget = "1.8"
+tasks.compileKotlin.configure {
+ dependsOn(tasks.xuke)
}
-configure {
+xuke {
configurations.set(listOf("runtimeClasspath"))
outputPackage.set("io.github.chao2zhang.example")
}
diff --git a/gradle.properties b/gradle.properties
index 9259715..1566b3d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-org.gradle.jvmargs=-Xmx1536m
org.gradle.parallel=true
-
-# Kotlin code style for this project: "official" or "obsolete":
+org.gradle.caching=true
+org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8
+org.gradle.unsafe.configuration-cache=true
kotlin.code.style=official
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..282d926
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,11 @@
+[versions]
+kotlin = "1.8.10"
+
+[plugins]
+kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+detekt = "io.gitlab.arturbosch.detekt:1.22.0"
+ktlint = "org.jlleitschuh.gradle.ktlint:11.3.1"
+pluginPublish = "com.gradle.plugin-publish:1.1.0"
+
+[libraries]
+junit4 = "junit:junit:4.13.2"
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..ccebba7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b1159fc..bdc9a83 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..79a61d4 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/plugin-build/.gitignore b/plugin-build/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/plugin-build/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/plugin-build/build.gradle.kts b/plugin-build/build.gradle.kts
index 950a7f9..1b46a08 100644
--- a/plugin-build/build.gradle.kts
+++ b/plugin-build/build.gradle.kts
@@ -1,36 +1,9 @@
plugins {
- kotlin("jvm") version BuildPluginsVersion.KOTLIN apply false
- id("com.gradle.plugin-publish") version BuildPluginsVersion.PLUGIN_PUBLISH apply false
- id("org.jlleitschuh.gradle.ktlint") version BuildPluginsVersion.KTLINT
+ alias(libs.plugins.kotlin.jvm)
+ alias(libs.plugins.ktlint)
+ alias(libs.plugins.pluginPublish)
}
-allprojects {
- group = PluginCoordinates.GROUP
- version = PluginCoordinates.VERSION
-
- repositories {
- google()
- mavenCentral()
- }
-
- apply {
- plugin("org.jlleitschuh.gradle.ktlint")
- }
-
- ktlint {
- debug.set(false)
- verbose.set(true)
- android.set(false)
- outputToConsole.set(true)
- ignoreFailures.set(false)
- enableExperimentalRules.set(true)
- filter {
- exclude("**/generated/**")
- include("**/kotlin/**")
- }
- }
-}
-
-tasks.register("clean", Delete::class.java) {
- delete(rootProject.buildDir)
+tasks.publishPlugins {
+ notCompatibleWithConfigurationCache("https://github.com/gradle/gradle/issues/21283")
}
diff --git a/plugin-build/buildSrc/.gitignore b/plugin-build/buildSrc/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/plugin-build/buildSrc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/plugin-build/buildSrc/build.gradle.kts b/plugin-build/buildSrc/build.gradle.kts
deleted file mode 100644
index 88cd14f..0000000
--- a/plugin-build/buildSrc/build.gradle.kts
+++ /dev/null
@@ -1,6 +0,0 @@
-plugins {
- `kotlin-dsl`
-}
-repositories {
- mavenCentral()
-}
\ No newline at end of file
diff --git a/plugin-build/buildSrc/src/main/java/Coordinates.kt b/plugin-build/buildSrc/src/main/java/Coordinates.kt
deleted file mode 100644
index 9105f71..0000000
--- a/plugin-build/buildSrc/src/main/java/Coordinates.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-object PluginCoordinates {
- const val ID = "io.github.chao2zhang.xuke"
- const val GROUP = "io.github.chao2zhang"
- const val VERSION = "0.0.11"
- const val IMPLEMENTATION_CLASS = "io.github.chao2zhang.XukePlugin"
-}
-
-object PluginBundle {
- const val VCS = "https://github.com/chao2zhang/Xuke"
- const val WEBSITE = "https://github.com/chao2zhang/Xuke"
- const val DESCRIPTION = "A Gradle plugin to collect software licenses from dependencies"
- const val DISPLAY_NAME = "A Gradle plugin to collect software licenses from dependencies"
- val TAGS = listOf(
- "plugin",
- "gradle",
- "license",
- "oss",
- )
-}
diff --git a/plugin-build/buildSrc/src/main/java/Dependencies.kt b/plugin-build/buildSrc/src/main/java/Dependencies.kt
deleted file mode 100644
index dbc5670..0000000
--- a/plugin-build/buildSrc/src/main/java/Dependencies.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-object Versions {
- const val JUNIT = "4.13.2"
-}
-
-object BuildPluginsVersion {
- const val KOTLIN = "1.5.31"
- const val KTLINT = "10.0.0"
- const val PLUGIN_PUBLISH = "0.14.0"
-}
-
-object TestingLib {
- const val JUNIT = "junit:junit:${Versions.JUNIT}"
-}
\ No newline at end of file
diff --git a/plugin-build/gradle/wrapper/gradle-wrapper.jar b/plugin-build/gradle/wrapper/gradle-wrapper.jar
index 41d9927..ccebba7 100644
Binary files a/plugin-build/gradle/wrapper/gradle-wrapper.jar and b/plugin-build/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/plugin-build/gradle/wrapper/gradle-wrapper.properties b/plugin-build/gradle/wrapper/gradle-wrapper.properties
index b1159fc..bdc9a83 100644
--- a/plugin-build/gradle/wrapper/gradle-wrapper.properties
+++ b/plugin-build/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/plugin-build/gradlew b/plugin-build/gradlew
index 1b6c787..79a61d4 100755
--- a/plugin-build/gradlew
+++ b/plugin-build/gradlew
@@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
esac
done
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
+ # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
+ # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+ # shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+ die "xargs is not available"
+fi
+
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/plugin-build/gradlew.bat b/plugin-build/gradlew.bat
index ac1b06f..93e3f59 100644
--- a/plugin-build/gradlew.bat
+++ b/plugin-build/gradlew.bat
@@ -1,89 +1,92 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/plugin-build/plugin/.gitignore b/plugin-build/plugin/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/plugin-build/plugin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/plugin-build/plugin/build.gradle.kts b/plugin-build/plugin/build.gradle.kts
index b0db455..71e79c6 100644
--- a/plugin-build/plugin/build.gradle.kts
+++ b/plugin-build/plugin/build.gradle.kts
@@ -1,51 +1,49 @@
plugins {
kotlin("jvm")
- id("java-gradle-plugin")
- id("com.gradle.plugin-publish")
+ `java-gradle-plugin`
+ alias(libs.plugins.pluginPublish)
}
dependencies {
- implementation(kotlin("stdlib-jdk7"))
- implementation(gradleApi())
+ compileOnly(gradleApi())
- testImplementation(TestingLib.JUNIT)
+ testImplementation(libs.junit4)
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-gradlePlugin {
- plugins {
- create(PluginCoordinates.ID) {
- id = PluginCoordinates.ID
- implementationClass = PluginCoordinates.IMPLEMENTATION_CLASS
- version = PluginCoordinates.VERSION
- }
+ toolchain {
+ languageVersion.set(JavaLanguageVersion.of(8))
}
}
-pluginBundle {
- website = PluginBundle.WEBSITE
- vcsUrl = PluginBundle.VCS
- description = PluginBundle.DESCRIPTION
- tags = PluginBundle.TAGS
+group = "io.github.chao2zhang"
+version = "0.0.11"
+
+val pluginId = "io.github.chao2zhang.xuke"
+
+gradlePlugin {
+ website.set("https://github.com/chao2zhang/Xuke")
+ vcsUrl.set("https://github.com/chao2zhang/Xuke")
plugins {
- getByName(PluginCoordinates.ID) {
- displayName = PluginBundle.DISPLAY_NAME
+ create(pluginId) {
+ id = pluginId
+ implementationClass = "io.github.chao2zhang.XukePlugin"
+ displayName = "A Gradle plugin to collect software licenses from dependencies"
+ description = "A Gradle plugin to collect software licenses from dependencies"
+ tags.set(
+ listOf(
+ "plugin",
+ "gradle",
+ "license",
+ "oss",
+ ),
+ )
}
}
-
- mavenCoordinates {
- groupId = PluginCoordinates.GROUP
- artifactId = PluginCoordinates.ID
- version = PluginCoordinates.VERSION
- }
}
-tasks.create("setupPluginUploadFromEnvironment") {
+tasks.register("setupPluginUploadFromEnvironment") {
doLast {
val key = System.getenv("GRADLE_PUBLISH_KEY")
val secret = System.getenv("GRADLE_PUBLISH_SECRET")
diff --git a/plugin-build/plugin/src/main/java/io/github/chao2zhang/Utils.kt b/plugin-build/plugin/src/main/java/io/github/chao2zhang/Utils.kt
index ec4403d..51caf42 100644
--- a/plugin-build/plugin/src/main/java/io/github/chao2zhang/Utils.kt
+++ b/plugin-build/plugin/src/main/java/io/github/chao2zhang/Utils.kt
@@ -1,3 +1,3 @@
package io.github.chao2zhang
-inline fun Any.safeAs(): T? = this as? T
+internal inline fun Any.safeAs(): T? = this as? T
diff --git a/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeExtension.kt b/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeExtension.kt
index 43d5b97..c01265c 100644
--- a/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeExtension.kt
+++ b/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeExtension.kt
@@ -3,18 +3,26 @@ package io.github.chao2zhang
import org.gradle.api.Project
import org.gradle.api.model.ObjectFactory
import javax.inject.Inject
+import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
abstract class XukeExtension @Inject constructor(
project: Project,
- objects: ObjectFactory
+ objects: ObjectFactory,
) {
- // The Gradle build configurations from which we collect dependencies
- val configurations = objects.listProperty(String::class.java).convention(emptyList())
+ /**
+ * The Gradle build configurations from which we collect dependencies
+ */
+ val configurations: ListProperty = objects.listProperty(String::class.java).convention(emptyList())
- // The output file of the licenses collected - Only supporting .kt file as of now
- val outputFile = objects.fileProperty().convention(project.layout.buildDirectory.file("generated/license/SoftwareLicense.kt"))
+ /**
+ * The output file of the licenses collected - Only supporting .kt file as of now
+ */
+ val outputFile: RegularFileProperty = objects.fileProperty()
+ .convention(project.layout.buildDirectory.file("generated/license/SoftwareLicense.kt"))
// The output package name of the output file
- val outputPackage = objects.property(String::class.java).convention("")
+ val outputPackage: Property = objects.property(String::class.java).convention("")
}
diff --git a/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukePlugin.kt b/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukePlugin.kt
index edce65d..ee1177d 100644
--- a/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukePlugin.kt
+++ b/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukePlugin.kt
@@ -6,11 +6,13 @@ import org.gradle.api.Project
const val EXTENSION_NAME = "xuke"
const val TASK_NAME = "xuke"
+@Suppress("unused")
abstract class XukePlugin : Plugin {
override fun apply(project: Project) {
val extension = project.extensions.create(EXTENSION_NAME, XukeExtension::class.java)
project.tasks.register(TASK_NAME, XukeTask::class.java) { task ->
+ task.notCompatibleWithConfigurationCache("XukeTask doesn't support CC")
task.buildConfigurationsProp.convention(extension.configurations)
task.outputFileProp.convention(extension.outputFile)
task.outputPackage.convention(extension.outputPackage)
diff --git a/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeTask.kt b/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeTask.kt
index fbc963e..e4af7be 100644
--- a/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeTask.kt
+++ b/plugin-build/plugin/src/main/java/io/github/chao2zhang/XukeTask.kt
@@ -96,7 +96,6 @@ abstract class XukeTask : DefaultTask() {
?.safeAs()
?.file
- @OptIn(ExperimentalStdlibApi::class)
private fun extractLicenses(pomFile: File): List = buildList {
val pomDoc = documentFactory.newDocumentBuilder().parse(pomFile).documentElement
val licenseNodes = pomDoc.getElementsByTagName("licenses").singleOrNull()?.childNodes
@@ -107,7 +106,7 @@ abstract class XukeTask : DefaultTask() {
name = licenseNode.namedChildTextContentOrEmpty("name"),
url = licenseNode.namedChildTextContentOrEmpty("url"),
distribution = licenseNode.namedChildTextContentOrEmpty("distribution"),
- comments = licenseNode.namedChildTextContentOrEmpty("comments"),
+ comments = licenseNode.namedChildTextContentOrEmpty("comments")
)
)
}
diff --git a/plugin-build/plugin/src/main/java/io/github/chao2zhang/api/LicenseData.kt b/plugin-build/plugin/src/main/java/io/github/chao2zhang/api/LicenseData.kt
index c381a0e..8501c5c 100644
--- a/plugin-build/plugin/src/main/java/io/github/chao2zhang/api/LicenseData.kt
+++ b/plugin-build/plugin/src/main/java/io/github/chao2zhang/api/LicenseData.kt
@@ -4,13 +4,13 @@ data class License(
val name: String,
val url: String,
val distribution: String,
- val comments: String
+ val comments: String,
)
data class Dependency(
val group: String,
val name: String,
- val version: String
+ val version: String,
)
typealias LicenseData = Map>
diff --git a/plugin-build/plugin/src/main/java/io/github/chao2zhang/format/KotlinFactory.kt b/plugin-build/plugin/src/main/java/io/github/chao2zhang/format/KotlinFactory.kt
index a4cc936..67273b4 100644
--- a/plugin-build/plugin/src/main/java/io/github/chao2zhang/format/KotlinFactory.kt
+++ b/plugin-build/plugin/src/main/java/io/github/chao2zhang/format/KotlinFactory.kt
@@ -8,18 +8,18 @@ object KotlinFactory : FormatterFactory {
override fun format(licenseData: LicenseData, options: FormatOptions): String = """
${options.formatPackagePath()}
-
+
data class License(
val name: String,
val url: String,
val distribution: String,
- val comments: String
+ val comments: String,
)
data class Dependency(
val group: String,
val name: String,
- val version: String
+ val version: String,
)
object SoftwareLicense {
diff --git a/plugin-build/settings.gradle.kts b/plugin-build/settings.gradle.kts
index 232326d..e753cf7 100644
--- a/plugin-build/settings.gradle.kts
+++ b/plugin-build/settings.gradle.kts
@@ -5,6 +5,19 @@ pluginManagement {
}
}
+dependencyResolutionManagement {
+ repositories {
+ mavenCentral()
+ google()
+ }
+
+ versionCatalogs {
+ create("libs") {
+ from(files("../gradle/libs.versions.toml"))
+ }
+ }
+}
+
rootProject.name = ("xuke-plugin")
include(":plugin")
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..39a2b6e
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,6 @@
+{
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+ "extends": [
+ "config:base"
+ ]
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 069fbbc..23a90c9 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,6 +5,27 @@ pluginManagement {
}
}
+dependencyResolutionManagement {
+ repositories {
+ mavenCentral()
+ google()
+ }
+}
+
+plugins {
+ id("com.gradle.enterprise") version "3.12.4"
+}
+
+gradleEnterprise {
+ buildScan {
+ termsOfServiceUrl = "https://gradle.com/terms-of-service"
+ termsOfServiceAgree = "yes"
+ publishAlways()
+ }
+}
+
+enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
+
rootProject.name = ("xuke")
include(":example-jvm")