Skip to content

Commit

Permalink
feture: Base for plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
LichtHund committed Aug 31, 2023
1 parent cc10fd0 commit 6a85ee5
Show file tree
Hide file tree
Showing 23 changed files with 261 additions and 152 deletions.
3 changes: 0 additions & 3 deletions application/build.gradle.kts

This file was deleted.

Empty file removed application/libs.versions.toml
Empty file.
4 changes: 0 additions & 4 deletions build-logic/build.gradle.kts

This file was deleted.

9 changes: 0 additions & 9 deletions build-logic/settings.gradle.kts

This file was deleted.

27 changes: 0 additions & 27 deletions build-logic/src/main/kotlin/catalog.plugin.gradle.kts

This file was deleted.

33 changes: 0 additions & 33 deletions build-logic/src/main/kotlin/plugin/CatalogJoinerPlugin.kt

This file was deleted.

12 changes: 11 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
plugins {
id("catalog.plugin")
kotlin("jvm") version "1.9.10"
`java-gradle-plugin`
`kotlin-dsl`
}

dependencies {
implementation(gradleTestKit())
}

kotlin {
explicitApi()
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=com.triumphcraft
group=dev.triumphteam
version=1.0-SNAPSHOT
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
31 changes: 23 additions & 8 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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/.
Expand All @@ -80,13 +80,11 @@ 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##*/}

# 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"'
# 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
Expand Down Expand Up @@ -133,22 +131,29 @@ 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.
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
Expand Down Expand Up @@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
done
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
Expand All @@ -205,6 +214,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.
Expand Down
15 changes: 9 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
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
Expand Down
25 changes: 0 additions & 25 deletions libs.versions.toml

This file was deleted.

3 changes: 0 additions & 3 deletions lily/build.gradle.kts

This file was deleted.

Empty file removed lily/libs.versions.toml
Empty file.
3 changes: 0 additions & 3 deletions root/build.gradle.kts

This file was deleted.

Empty file removed root/libs.versions.toml
Empty file.
3 changes: 0 additions & 3 deletions service/build.gradle.kts

This file was deleted.

Empty file removed service/libs.versions.toml
Empty file.
26 changes: 1 addition & 25 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,25 +1 @@
dependencyResolutionManagement {
includeBuild("build-logic")
repositories.gradlePluginPortal()
}

val projectName = "catalog"
rootProject.name = "catalog-common"

listOf(
"root",
"lily",
"service",
"application"
).forEach(::includeProject)

fun includeProject(name: String) {
include(name) {
this.name = "$projectName-$name"
}
}

fun include(name: String, block: ProjectDescriptor.() -> Unit) {
include(name)
project(":$name").apply(block)
}
rootProject.name = "cataloger"
48 changes: 48 additions & 0 deletions src/main/kotlin/CatalogerPlugin.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package dev.triumphteam.cataloguer

import dev.triumphteam.cataloguer.task.ValidateCatalogTask
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.internal.catalog.parser.TomlCatalogFileParser
import org.gradle.api.plugins.catalog.CatalogPluginExtension
import org.gradle.api.plugins.catalog.internal.DefaultVersionCatalogPluginExtension
import org.gradle.kotlin.dsl.register
import java.nio.file.Path

public abstract class CatalogerPlugin : Plugin<Project> {

private companion object {
private const val GRADLE_CATALOG_PLUGIN = "org.gradle.version-catalog"
private const val VALIDATE_CATALOG_TASK = "validateCatalog"
private const val CATALOG_PATH = "libs.versions.toml"
}

override fun apply(project: Project): Unit = with(project) {
// Apply the catalog plugin
plugins.apply(GRADLE_CATALOG_PLUGIN)

val catalogExtension = extensions.getByType(CatalogPluginExtension::class.java)

afterEvaluate {
catalogExtension.versionCatalog {
// Importing root toml first
TomlCatalogFileParser.parse(rootProject.tomlCatalog, this)
// We don't want to import root twice
if (project == rootProject) return@versionCatalog
// Then combining it with the actual project's toml
TomlCatalogFileParser.parse(project.tomlCatalog, this)
}
}

if (catalogExtension is DefaultVersionCatalogPluginExtension) {
// Register validator
tasks.register<ValidateCatalogTask>(VALIDATE_CATALOG_TASK) {
this.catalogExtension.set(catalogExtension)
}
}
}

/** Quick util for getting the catalog file. */
private val Project.tomlCatalog: Path
get() = file(CATALOG_PATH).toPath()
}
2 changes: 2 additions & 0 deletions src/main/kotlin/package-info.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

package dev.triumphteam.cataloguer
Loading

0 comments on commit 6a85ee5

Please sign in to comment.