Skip to content

Commit

Permalink
Gradle 7.6.3
Browse files Browse the repository at this point in the history
* chore(deps): update dependency gradle to v7.6.3

* Migrate Copy task

* Remove outdated Gradle version checkers

* Try to fix `Can generate a asciidoctorconfigfile`

* Remove sourceCompatibility & targetCompatibility after using toolchain

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Goooler <[email protected]>
  • Loading branch information
renovate[bot] and Goooler committed Jan 9, 2024
1 parent f1ca768 commit d60b011
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@ class AsciidoctorEditorConfigIntegrationSpec extends FunctionalSpecification {
File attrFile = new File(projectDir, 'inputs.adoc')
attrFile.text = ":${key3}: ${value3}\n"

new File(projectDir, 'gradle.properties').text = """
group=${groupName}
version=${projVer}
""".stripIndent()

getGroovyBuildFile("""
group = '${groupName}'
version = '${projVer}'
apply plugin : 'org.asciidoctor.jvm.base'
asciidoctorj {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider
import org.gradle.api.specs.Spec
import org.gradle.api.tasks.util.PatternSet
import org.gradle.util.GradleVersion
import org.ysb33r.grolifant.api.core.OperatingSystem
import org.ysb33r.grolifant.api.core.ProjectOperations

Expand All @@ -48,8 +47,6 @@ class AsciidoctorUtils {
public static final OperatingSystem OS = OperatingSystem.current()
public static final String UNDERSCORE_LED_FILES = '**/_*'
public static final PatternSet UNDERSCORE_LED_PATTERN = new PatternSet().include(UNDERSCORE_LED_FILES)
public static final boolean GRADLE_LT_5_0 = GradleVersion.current() < GradleVersion.version('5.0')
public static final boolean GRADLE_LT_5_1 = GradleVersion.current() < GradleVersion.version('5.1')

static final Spec<? super File> ACCEPT_ONLY_FILES = new Spec<File>() {
@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.plugins.ExtraPropertiesExtension
import org.gradle.util.GradleVersion

/**
* A simplified way of grouping deprecation messages.
Expand All @@ -36,8 +35,7 @@ class DeprecatedFeatures implements Plugin<Project> {

private static final String EXTENSION_NAME = '$$asciidoctor-deprecated-features$$'
private static final String BASE_MESSAGE = 'You are using one or more deprecated Asciidoctor Gradle plugin features.'
private static final boolean GRADLE_4_5_OR_LATER = GradleVersion.current() >= GradleVersion.version('4.5')
private static final String COMMAND_LINE = GRADLE_4_5_OR_LATER ? '--warning-mode=all' : '-i or --info'
private static final String COMMAND_LINE = '--warning-mode=all'

static void addDeprecationMessage(Project project, String identifier, String message) {
try {
Expand Down
5 changes: 0 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,6 @@ subprojects {
}
}

compileGroovy {
sourceCompatibility = project.sourceCompatibility
targetCompatibility = project.targetCompatibility
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ class AsciidoctorGradleGroovyProject implements Plugin<Project> {
SourceSetContainer sourceSets = project.extensions.getByType(SourceSetContainer)
SourceSet main = sourceSets.getByName('main')

project.tasks.named(main.processResourcesTaskName).configure { Copy copy ->
copy.from generateModuleVersions, { CopySpec cs ->
project.tasks.named(main.processResourcesTaskName, Copy).configure { copy ->
copy.from(generateModuleVersions.get().outputs.files) { CopySpec cs ->
cs.into "${ModuleVersions.INTERMEDIATE_FOLDER_PATH}"
}
}
Expand Down
2 changes: 0 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
version = 4.0.1
group = org.asciidoctor
sourceCompatibility = 1.8
targetCompatibility = 1.8

copyrightYear = 2013-2024
project_description = A Gradle plugin suite that uses Asciidoctor via JRuby/Node.js to process AsciiDoc source files within the project.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ import org.gradle.api.provider.Provider
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.Optional
import org.gradle.api.tasks.OutputDirectory
import org.gradle.api.tasks.PathSensitive
import org.gradle.api.tasks.SkipWhenEmpty
import org.gradle.api.tasks.options.Option
import org.gradle.util.GradleVersion
import org.ysb33r.grolifant.api.core.ProjectOperations

import java.util.concurrent.Callable
Expand All @@ -46,7 +44,6 @@ import static org.gradle.api.tasks.PathSensitivity.RELATIVE
*/
@CompileStatic
abstract class AbstractExportBaseTask extends DefaultTask {
private final static boolean GRADLE_GE_4_8 = GradleVersion.current() >= GradleVersion.version('4.8')
private final static String HTML_EXT = '.html'
private final List<Object> slideInputFiles = []
private final ProjectOperations projectOperations
Expand Down Expand Up @@ -280,10 +277,8 @@ abstract class AbstractExportBaseTask extends DefaultTask {
dependsOn tasks.findAll {
if (it instanceof Task) {
true
} else if (GRADLE_GE_4_8) {
it instanceof org.gradle.api.tasks.TaskProvider
} else {
false
it instanceof org.gradle.api.tasks.TaskProvider
}
}.toSet()
}
Expand Down

0 comments on commit d60b011

Please sign in to comment.