Skip to content
This repository has been archived by the owner on Mar 2, 2023. It is now read-only.

Commit

Permalink
✨ spotless apply (again)
Browse files Browse the repository at this point in the history
  • Loading branch information
auguwu committed Feb 17, 2023
1 parent 01fbca4 commit 5fc5bc8
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@
package org.noelware.infra.gradle.plugins.module;

import com.diffplug.gradle.spotless.SpotlessExtension;

import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Calendar;
import org.gradle.api.GradleException;
import org.gradle.api.Plugin;
Expand Down Expand Up @@ -62,20 +58,22 @@ public void apply(@NotNull Project project) {
spotless.java((java) -> {
try {
java.licenseHeader(ext.getLicense()
.getOrElse(Licenses.MIT)
.getTemplate(
ext.getProjectName()
.getOrElse(project.getRootProject().getName()),
ext.getProjectDescription()
.getOrElse(
project.getDescription() != null
? project.getDescription()
: "fill this out"),
ext.getCurrentYear()
.getOrElse(String.valueOf(
Calendar.getInstance().get(Calendar.YEAR))),
ext.getProjectEmoji().getOrElse(""))
.trim() + (OperatingSystem.current().isUnix() ? "\n" : "\r\n"));
.getOrElse(Licenses.MIT)
.getTemplate(
ext.getProjectName()
.getOrElse(project.getRootProject()
.getName()),
ext.getProjectDescription()
.getOrElse(
project.getDescription() != null
? project.getDescription()
: "fill this out"),
ext.getCurrentYear()
.getOrElse(String.valueOf(Calendar.getInstance()
.get(Calendar.YEAR))),
ext.getProjectEmoji().getOrElse(""))
.trim()
+ (OperatingSystem.current().isUnix() ? "\n" : "\r\n"));

java.trimTrailingWhitespace();
java.removeUnusedImports();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,23 @@ public void apply(@NotNull Project project) {
spotless.kotlin((kotlin) -> {
try {
kotlin.licenseHeader(ext.getLicense()
.convention(Licenses.MIT)
.get()
.getTemplate(
ext.getProjectName()
.getOrElse(project.getRootProject().getName()),
ext.getProjectDescription()
.getOrElse(
project.getDescription() != null
? project.getDescription()
: "fill this out"),
ext.getCurrentYear()
.getOrElse(String.valueOf(
Calendar.getInstance().get(Calendar.YEAR))),
ext.getProjectEmoji().getOrElse(""))
.trim() + (OperatingSystem.current().isUnix() ? "\n" : "\r\n"));
.convention(Licenses.MIT)
.get()
.getTemplate(
ext.getProjectName()
.getOrElse(project.getRootProject()
.getName()),
ext.getProjectDescription()
.getOrElse(
project.getDescription() != null
? project.getDescription()
: "fill this out"),
ext.getCurrentYear()
.getOrElse(String.valueOf(Calendar.getInstance()
.get(Calendar.YEAR))),
ext.getProjectEmoji().getOrElse(""))
.trim()
+ (OperatingSystem.current().isUnix() ? "\n" : "\r\n"));

kotlin.trimTrailingWhitespace();
kotlin.endWithNewline();
Expand Down

0 comments on commit 5fc5bc8

Please sign in to comment.