From a76c20e86825289058e6a62038a34e7100379a8d Mon Sep 17 00:00:00 2001 From: TopchetoEU <36534413+TopchetoEU@users.noreply.github.com> Date: Wed, 4 Sep 2024 14:30:46 +0300 Subject: [PATCH] fix: revert removal of Jabel (for support of Java 11) --- build.gradle | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index ab65b6f..88bad52 100644 --- a/build.gradle +++ b/build.gradle @@ -19,6 +19,8 @@ repositories { } dependencies { + annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:0.4.2' + compileOnly 'com.github.bsideup.jabel:jabel-javac-plugin:0.4.2' testImplementation 'org.junit.jupiter:junit-jupiter:5.9.2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } @@ -32,15 +34,19 @@ java { } } +configure([tasks.compileJava]) { + options.release = 11 +} + jar { manifest { attributes( - 'Main-Class': project.main_class, - 'Build-Timestamp': new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()), - 'Build-Branch': versioning.info.branch, - 'Build-Revision': versioning.info.commit, - 'Build-Jdk': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})", - 'Build-Author': 'TopchetoEU' + 'Main-Class': project.main_class, + 'Build-Timestamp': new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()), + 'Build-Branch': versioning.info.branch, + 'Build-Revision': versioning.info.commit, + 'Build-Jdk': "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})", + 'Build-Author': 'TopchetoEU' ) } } @@ -69,8 +75,8 @@ distTar { processResources { filesMatching "metadata.json", { expand( - version: project.project_version, - name: project.project_name + version: project.project_version, + name: project.project_name ) } }