Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix #153 (JDK 21+ compatibility) #154

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@

## Badass Runtime Plugin ##

##### NOTE: This is a fork of the original [Badass-Runtime-Plugin](https://github.com/beryx/badass-runtime-plugin) that is patched to support newer Java releases and other fixes not yet available with the original plugin.

###### Changes in this fork

**1.13.1-patch-1**

- updated some dependencies, this includes the assembler so that the plugin works on newer JDK versions.

###### How to build

Make sure your environment is set to use JDK 11 and run `./gradlew build`.

###### How to use

Change the plugin ID from `org.beryx.runtime` to `com.dua3.gradle.runtime` in your Gradle build files.

##### The following is the content of the original README.

---

##### NOTE: Looking for co-maintainers - see [this issue](https://github.com/beryx/badass-runtime-plugin/issues/135). #####

Using this Gradle plugin you can create custom runtime images for non-modularized applications.
Expand Down
36 changes: 18 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@ buildscript {
}
}
dependencies {
classpath 'org.kohsuke:github-api:1.94'
classpath 'org.kohsuke:github-api:1.323'
}
}

plugins {
id 'java-gradle-plugin'
id 'groovy'
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id "com.gradle.plugin-publish" version "1.1.0"
id 'com.github.johnrengelman.shadow' version '8.1.1'
id "com.gradle.plugin-publish" version "1.2.1"
id "com.github.ethankhall.semantic-versioning" version "1.1.0"
id "com.github.ben-manes.versions" version "0.44.0"
id 'com.github.jk1.dependency-license-report' version '2.1'
id "com.github.ben-manes.versions" version "0.51.0"
id 'com.github.jk1.dependency-license-report' version '2.8'
id "com.github.hierynomus.license" version "0.16.1"
id 'org.asciidoctor.jvm.convert' version '3.3.2'
id "org.ajoberstar.git-publish" version "4.1.1"
id 'org.asciidoctor.jvm.convert' version '4.0.2'
id "org.ajoberstar.git-publish" version "4.2.2"
}

if(JavaVersion.current() != JavaVersion.VERSION_11) {
Expand All @@ -43,10 +43,10 @@ project.version.with {
ext.badassRuntimePluginVersion = project.version as String
ext.badassRuntimePluginTag = Boolean.valueOf(badassRuntimePluginReleaseBuild) ? "v$ext.badassRuntimePluginVersion" : 'master'

group = 'org.beryx'
group = 'com.dua3.gradle'
version = badassRuntimePluginVersion

ext.asmVersion = '9.4'
ext.asmVersion = '9.7'

repositories {
mavenCentral()
Expand Down Expand Up @@ -87,7 +87,7 @@ dependencies {
shadow gradleTestKit()
shadow localGroovy()

shadow group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
shadow group: 'org.slf4j', name: 'slf4j-api', version: '2.0.13'

implementation "org.ow2.asm:asm:$asmVersion"
implementation "org.ow2.asm:asm-commons:$asmVersion"
Expand All @@ -99,21 +99,21 @@ dependencies {
exclude module: 'groovy-all'
}
testImplementation 'cglib:cglib-nodep:3.3.0'
testImplementation 'org.objenesis:objenesis:3.2'
testImplementation ('com.athaydes:spock-reports:2.3.1-groovy-3.0') { transitive = false}
testImplementation 'org.objenesis:objenesis:3.4'
testImplementation ('com.athaydes:spock-reports:2.5.1-groovy-3.0') { transitive = false}

asciidoctorExt 'com.bmuschko:asciidoctorj-tabbed-code-extension:0.3'
}

gradlePlugin {
website = 'https://github.com/beryx/badass-runtime-plugin/'
vcsUrl = 'https://github.com/beryx/badass-runtime-plugin'
website = 'https://github.com/xzel23/badass-runtime-plugin'
vcsUrl = 'https://github.com/xzel23/badass-runtime-plugin'

plugins {
jlink {
id = 'org.beryx.runtime'
id = 'com.dua3.gradle.runtime'
implementationClass = 'org.beryx.runtime.RuntimePlugin'
displayName = 'Badass Runtime Plugin'
displayName = 'Badass Runtime Plugin (patched)'
description = 'A Gradle plugin that assembles your modules into a custom runtime image'
tags.set(['runtime', 'jlink', 'jpms', 'image'])
}
Expand Down Expand Up @@ -157,11 +157,11 @@ asciidoctor {
linkattrs: true,
linkcss: true,
'git-tag': badassRuntimePluginTag,
'blob-root': "https://github.com/beryx/badass-runtime-plugin/blob/$badassRuntimePluginTag"
'blob-root': "https://github.com/xzel23/badass-runtime-plugin/blob/$badassRuntimePluginTag"
}

gitPublish {
repoUri = 'https://github.com/beryx/badass-runtime-plugin.git'
repoUri = 'https://github.com/xzel23/badass-runtime-plugin'
branch = 'gh-pages'

def pgType = project.hasProperty('ghPageType') ? ghPageType : 'latest'
Expand Down
2 changes: 1 addition & 1 deletion doc/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ To use the plugin, include the following in your build script:
[subs="attributes",options="nowrap"]
----
plugins {
id 'org.beryx.runtime' version '{project-version}'
id 'com.dua3.gradle.runtime' version '{project-version}'
}
----

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
badassRuntimePluginVersionMajor = 1
badassRuntimePluginVersionMinor = 13
badassRuntimePluginVersionPatch = 2
# badassRuntimePluginVersionLabel = rc-1
badassRuntimePluginReleaseBuild = false
badassRuntimePluginVersionPatch = 1
badassRuntimePluginVersionLabel = patch-1
badassRuntimePluginReleaseBuild = true
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-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading