diff --git a/build.gradle b/build.gradle deleted file mode 100644 index f9d8a33..0000000 --- a/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -buildscript { - ext.kotlin_version = '1.9.23' - repositories { - mavenCentral() - gradlePluginPortal() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..a59f8ff --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,38 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("jvm") version libs.versions.kotlin.get() + alias(libs.plugins.detekt) + alias(libs.plugins.ktlint) +} + +kotlin { + jvmToolchain(libs.versions.java.get().toInt()) +} + +subprojects { + apply(plugin = rootProject.libs.plugins.ktlint.get().pluginId) + apply(plugin = rootProject.libs.plugins.detekt.get().pluginId) + + tasks.withType { + kotlinOptions.jvmTarget = libs.versions.java.get() + } + + configure { + version.set(rootProject.libs.versions.ktlint.get()) + verbose.set(true) + filter { + exclude("**/generated/**", "**/build/**") + include("src//kotlin") + } + } + + detekt { + buildUponDefaultConfig = true + parallel = true + } +} + +// tasks.register("clean", Delete::class) { +// delete(rootProject.layout.buildDirectory) +// } diff --git a/gradle.properties b/gradle.properties index a96aa49..7077d0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,5 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.parallel=true org.gradle.daemon=true -VERSION_NAME=0.1.0 +kotlin.code.style=official diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..9efd681 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,20 @@ +[versions] +detekt = "1.23.5" +java = "17" +kotlin = "1.9.23" +ktlint = "1.1.1" +ktlintGradle = "12.1.0" +pluginPublish = "1.2.1" + +[libraries] +kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } + + +[plugins] +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt"} +kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"} +ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlintGradle"} +pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish"} + + +[bundles] diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a7..d64cd49 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 c30b486..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cb..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else 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. + if ! command -v java >/dev/null 2>&1 + then + 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 location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -141,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -198,11 +202,11 @@ fi # 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"' -# 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. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ 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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/plugin/build.gradle b/plugin/build.gradle deleted file mode 100644 index 67d56eb..0000000 --- a/plugin/build.gradle +++ /dev/null @@ -1,46 +0,0 @@ -plugins { - id "com.gradle.plugin-publish" version "1.2.1" - id "java-gradle-plugin" -} - -apply plugin: 'kotlin' - -repositories { - mavenCentral() -} - -dependencies { - implementation gradleApi() - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - - testImplementation 'junit:junit:4.13.2' -} - -compileKotlin { - kotlinOptions { - jvmTarget = "11" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "11" - } -} - -group = 'com.jraska.module.graph.assertion' - -gradlePlugin { - website = 'https://github.com/jraska/modules-graph-assert' - vcsUrl = 'https://github.com/jraska/modules-graph-assert' - - plugins { - modulesGraphAssert { - id = 'com.jraska.module.graph.assertion' - version = '2.5.0' - displayName = 'Modules Graph Assert' - description = 'Gradle plugin to keep your modules graph healthy and lean.' - implementationClass = 'com.jraska.module.graph.assertion.ModuleGraphAssertionsPlugin' - tags.addAll('graph', 'assert', 'build speed', 'android', 'java', 'kotlin', 'quality', 'multiprojects', 'module') - } - } -} diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts new file mode 100644 index 0000000..7b22790 --- /dev/null +++ b/plugin/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + alias(libs.plugins.pluginPublish) + `java-gradle-plugin` +} + +apply(plugin = "kotlin") + +dependencies { + implementation(gradleApi()) + implementation(libs.kotlin.stdlib) + + testImplementation("org.jetbrains.kotlin:kotlin-test") +} + +tasks.test { + useJUnitPlatform() +} + +group = "com.jraska.module.graph.assertion" + +gradlePlugin { + website = "https://github.com/jraska/modules-graph-assert" + vcsUrl = "https://github.com/jraska/modules-graph-assert" + + plugins { + create("modulesGraphAssert") { + id = "com.jraska.module.graph.assertion" + version = "2.5.0" + displayName = "Modules Graph Assert" + description = "Gradle plugin to keep your modules graph healthy and lean." + implementationClass = "com.jraska.module.graph.assertion.ModuleGraphAssertionsPlugin" + tags.addAll("graph", "assert", "build speed", "android(", ")java", "kotlin", "quality", "multiprojects", "module") + } + } +} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 3e27ec9..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':plugin' \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..6f3d174 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,19 @@ +// https://docs.gradle.org/current/userguide/declaring_repositories.html +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "Modules Graph Assert" + +include(":plugin")