jruby-gradle
/
jruby-gradle-plugin
mirror of https://github.com/jruby-gradle/jruby-gradle-plugin
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade to gradle 7.6.1

This commit is contained in:
Uwe Kubosch 2023-05-17 09:09:32 +02:00
parent 2e22ec2126
commit 2cd1026259
26 changed files with 100 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -114,7 +114,7 @@ jobs:
- name: Build
uses: eskatos/gradle-command-action@v1
with:
arguments: -i -S --console=plain --no-build-cache assemble validateTaskProperties
arguments: -i -S --console=plain --no-build-cache assemble ValidatePlugins
# Unit tests
- name: Unit tests
uses: eskatos/gradle-command-action@v1

16
base-plugin/build.gradle
View File

@ -28,8 +28,8 @@ ext {
dependencies {
compile project(':jruby-gradle-core-plugin')
runtime('de.saumya.mojo:rubygems:0.2.3@war') {
implementation project(':jruby-gradle-core-plugin')
runtimeOnly('de.saumya.mojo:rubygems:0.2.3@war') {
// we just want the war file on the classloader for the application
// to find it and use the war-file from filesystem
exclude group: 'org.sonatype.nexus.plugins', module: 'nexus-ruby-tools'
@ -37,7 +37,7 @@ dependencies {
testJRubyPrepare "org.jruby:jruby-complete:${jrubyVersion}"
testCompile(spockVersion) {
testImplementation(spockVersion) {
exclude module: 'groovy-all'
exclude group: 'org.codehaus.groovy'
}
@ -92,6 +92,9 @@ integrationTest {
systemProperties 'TESTS_ARE_OFFLINE': '1'
}
dependsOn copyIntegrationTestJRuby
dependencies {
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
}
}
task installGroovyDoc(type: Copy) {
@ -102,13 +105,14 @@ task installGroovyDoc(type: Copy) {
onlyIf { project.hasProperty('jrubyGradleWebsiteInstallDir') }
}
pluginBundle {
gradlePlugin {
plugins {
gradlePlugin {
basePlugin {
id = 'com.github.jruby-gradle.base'
implementationClass = 'com.github.jrubygradle.JRubyPlugin'
displayName = 'JRuby/Gradle base plugin'
description = 'The purpose of plugin is to encapsulate useful Gradle functionality for JRuby projects'
tags = (['jruby'])
// tags.set(['jruby'])
}
}
}

2
base-plugin/src/main/groovy/com/github/jrubygradle/JRubyExec.groovy
View File

@ -69,7 +69,7 @@ class JRubyExec extends JavaExec implements JRubyAwareTask, JRubyExecSpec {
JRubyExec() {
super()
super.setMain(MAIN_CLASS)
super.mainClass.set(MAIN_CLASS)
this.jruby = extensions.create(JRubyPluginExtension.NAME, JRubyPluginExtension, this)
this.projectOperations = ProjectOperations.create(project)
this.tasks = project.tasks

2
base-plugin/src/main/groovy/com/github/jrubygradle/JRubyPluginExtension.groovy
View File

@ -296,7 +296,7 @@ class JRubyPluginExtension extends AbstractCombinedProjectTaskExtension {
} else if (this.gemConfiguration) {
this.gemConfiguration.get()
} else {
extFromProject.gemConfiguration
extFromProject.gemConfiguration.get()
}
}

4
base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy
View File

@ -175,7 +175,7 @@ class JRubyExecUtils {
cmdArgs.addAll(jrubyArgs)
if (useBinPath && script != null) {
if (script.isAbsolute() && (!script.exists())) {
if (script.absolute && (!script.exists())) {
throw new InvalidUserDataException("${script} does not exist")
}
cmdArgs.add(script.toString())
@ -184,7 +184,7 @@ class JRubyExecUtils {
throw new InvalidUserDataException('No `script` property defined and no inline script provided')
}
if (jrubyArgs.isEmpty()) {
if (jrubyArgs.empty) {
throw new InvalidUserDataException('Cannot build JRuby execution arguments with either `script` or `jrubyArgs` set')
}
}

25
base-plugin/src/main/resources/META-INF/gradle-plugins/com.github.jruby-gradle.base.properties
View File

@ -1,25 +0,0 @@
#
# Copyright (c) 2014-2023, R. Tyler Croy <rtyler@brokenco.de>,
# Schalk Cronje <ysb33r@gmail.com>, Christian Meier, Lookout, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
implementation-class=com.github.jrubygradle.JRubyPlugin

31
build.gradle
View File

@ -1,15 +1,10 @@
plugins {
id 'com.gradle.build-scan' version '2.0.2'
id 'org.ysb33r.gradletest' version '2.0-rc.4' apply false
id 'org.ysb33r.gradletest' version '3.0.0-alpha.1' apply false
id 'org.ajoberstar.github-pages' version '1.2.0' apply false
id 'com.github.hierynomus.license' version '0.14.0' apply false
id 'io.ratpack.ratpack-java' version "1.6.1" apply false
id 'com.gradle.plugin-publish' version '0.14.0' apply false
}
buildScan {
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
id 'com.gradle.plugin-publish' version '1.2.0' apply false
// id 'java-gradle-plugin'
}
allprojects {
@ -25,7 +20,7 @@ allprojects {
ext {
olderJRubyVersion = '9.4.1.0'
spockVersion = "org.spockframework:spock-core:1.2-groovy-2.4"
spockVersion = "org.spockframework:spock-core:2.3-groovy-3.0"
pluginExtraText = (version.contains('-alpha') || version.contains('-beta')) ?
'(If you need a production-ready version of the JRuby/Gradle plugin use a 1.7.x release instead)': ''
}
@ -48,10 +43,10 @@ subprojects {
apply from: "${rootProject.projectDir}/gradle/license.gradle"
dependencies {
compile localGroovy()
compile gradleApi()
compile "org.ysb33r.gradle:grolifant60:${grolifantVersion}"
gradleTestRuntime "org.ysb33r.gradle:grolifant60:${grolifantVersion}"
implementation localGroovy()
implementation gradleApi()
implementation "org.ysb33r.gradle:grolifant70:${grolifantVersion}"
gradleTestRuntimeOnly "org.ysb33r.gradle:grolifant70:${grolifantVersion}"
}
codenarc {
@ -74,7 +69,7 @@ subprojects {
gradleTest {
// https://github.com/jruby-gradle/jruby-gradle-plugin/issues/346
if (JavaVersion.current().java11) {
versions '5.0', '5.4.1', '6.0.1', '6.7'
versions '7.6.1', '8.1.1'
} else {
versions '4.10.2', '5.3.1', '6.0.1', '6.7'
@ -106,10 +101,10 @@ subprojects {
ideReport.destination = file( "${project.codenarc.reportsDir}/${reportName}.ide.txt")
}
tasks.withType(ValidateTaskProperties) { validateTaskProperties ->
validateTaskProperties.failOnWarning = true
validateTaskProperties.enableStricterValidation = true
}
// tasks.withType(ValidatePlugins).configureEach { ValidatePlugins ->
// ValidatePlugins.failOnWarning = true
// ValidatePlugins.enableStricterValidation = true
// }
}

4
buildSrc/build.gradle
View File

@ -3,6 +3,6 @@ plugins {
}
dependencies {
compile localGroovy()
compile gradleApi()
implementation localGroovy()
implementation gradleApi()
}

10
core-plugin/build.gradle
View File

@ -3,7 +3,8 @@ dependencies {
implementation "io.ratpack:ratpack-core:${ratpackVersion}"
integrationTestCompile gradleTestKit()
testCompile(spockVersion) {
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation(spockVersion) {
exclude module: 'groovy-all'
exclude group: 'org.codehaus.groovy'
}
@ -18,13 +19,14 @@ artifacts {
archives sourcesJar
}
pluginBundle {
gradlePlugin {
plugins {
gradlePlugin {
corePlugin {
id = 'com.github.jruby-gradle.core'
implementationClass = 'com.github.jrubygradle.api.core.JRubyCorePlugin'
displayName = 'JRuby/Gradle core plugin'
description = 'This plugin provides some core dependency resolution for JRuby/Gradle'
tags = (['jruby'])
// tags.set(['jruby'])
}
}
}

7
core-plugin/src/main/groovy/com/github/jrubygradle/api/gems/GemResolverStrategy.groovy
View File

@ -127,6 +127,13 @@ class GemResolverStrategy {
Pattern module
Pattern version
def Matcher(values) {
module = values['module'] as Pattern
version = values['version'] as Pattern
println "module: " + module
println "version: " + version
}
boolean match(String name, String ver) {
name =~ module && (this.version == null || ver ==~ this.version)
}

4
core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/DefaultRubyGemRestApi.groovy
View File

@ -168,8 +168,8 @@ class DefaultRubyGemRestApi implements com.github.jrubygradle.api.core.RubyGemQu
configure {
request.uri = uri
client.clientCustomizer { OkHttpClient.Builder builder ->
builder.followRedirects(true)
builder.followSslRedirects(true)
// builder.followRedirects(true)
// builder.followSslRedirects(true)
}
}
}

25
core-plugin/src/main/resources/META-INF/gradle-plugins/com.github.jruby-gradle.core.properties
View File

@ -1,25 +0,0 @@
#
# Copyright (c) 2014-2023, R. Tyler Croy <rtyler@brokenco.de>,
# Schalk Cronje <ysb33r@gmail.com>, Christian Meier, Lookout, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
implementation-class=com.github.jrubygradle.api.core.JRubyCorePlugin

2
docs/build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
}
dependencies {
/* wow. so recursion */
classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.0.3"
classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.1.1"
}
}
apply plugin: 'org.ajoberstar.github-pages'

2
docs/examples/executable-jar.gradle
View File

@ -6,7 +6,7 @@ buildscript {
}
plugins {
id "com.github.jruby-gradle.jar" version "0.1.2"
id "com.github.johnrengelman.shadow" version "1.1.2"
id 'com.github.johnrengelman.shadow' version '8.1.1'
}
apply plugin: 'java'

2
examples/self-executing-jar/build.gradle
View File

@ -10,7 +10,7 @@ buildscript {
/* here to make sure that our dependencies get loaded in properly under
* GradleTest, this is NOT needed by end-users
*/
classpath 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'
classpath 'com.github.jengelman.gradle.plugins:shadow:[7.0,8.0)'
}
}

4
gradle.properties
View File

@ -1,4 +1,4 @@
version=2.1.0-beta.0
version=2.1.0-beta.1
group=com.github.jruby-gradle
copyrightYear=2014-2023
@ -12,7 +12,7 @@ releaseBuild=false
targetCompatibility=1.8
sourceCompatibility=1.8
grolifantVersion=1.3.3
grolifantVersion=2.0.0
jrubyVersion=9.4.2.0
jettyVersion=9.2.12.v20150709
bcprovVersion=1.46

4
gradle/integration-tests.gradle
View File

@ -3,10 +3,10 @@
configurations {
integrationTestCompile {
extendsFrom testCompile
extendsFrom testImplementation
}
integrationTestRuntime {
extendsFrom integrationTestCompile, testRuntime
extendsFrom integrationTestCompile, testRuntimeOnly
}
integrationTestGems
}

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

29
jar-plugin/build.gradle
View File

@ -1,5 +1,3 @@
ext {
testRepoDir = new File(buildDir,'tmp/test/repo' )
}
@ -15,18 +13,24 @@ generateTestConfig {
flatrepo: testRepoDir.absolutePath
}
repositories {
mavenCentral()
gradlePluginPortal()
}
dependencies {
compile project(':jruby-gradle-base-plugin')
implementation project(':jruby-gradle-base-plugin')
implementation project(':jruby-gradle-core-plugin')
/*
* NOTE: version 5.0.0 of the shadow plugin supports only Gradle 5.x and later
*/
compile 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
compile 'org.codehaus.plexus:plexus-utils:[3.2.0,3.3)'
compile 'org.apache.commons:commons-io:1.3.2'
compile 'org.ow2.asm:asm-commons:[6.1,6.99)'
compile 'org.apache.ant:ant:[1.10.6,2.0)'
implementation 'com.github.johnrengelman:shadow:8.1.1'
implementation 'org.codehaus.plexus:plexus-utils:[3.2.0,3.3)'
implementation 'org.apache.commons:commons-io:1.3.2'
implementation 'org.ow2.asm:asm-commons:[6.1,6.99)'
implementation 'org.apache.ant:ant:[1.10.6,2.0)'
testCompile (spockVersion) {
testImplementation (spockVersion) {
exclude module : 'groovy-all'
}
@ -87,13 +91,14 @@ artifacts {
archives sourcesJar
}
pluginBundle {
gradlePlugin {
plugins {
gradlePlugin {
jarPlugin {
id = 'com.github.jruby-gradle.jar'
implementationClass = 'com.github.jrubygradle.api.jar.JRubyCorePlugin'
displayName = 'JRuby/Gradle base plugin'
description = 'This plugin encapsulates java archive building functionality for JRuby Gradle projects'
tags = (['jruby','fatjar'])
// tags.set(['jruby','fatjar'])
}
}
}

6
jar-plugin/gradle/integration-test.gradle
View File

@ -2,8 +2,8 @@ import groovy.json.JsonOutput
configurations {
testJRubyPrepare
integrationTestCompile.extendsFrom testCompile
integrationTestRuntime.extendsFrom testRuntime, integrationTestCompile
integrationTestCompile.extendsFrom testImplementation
integrationTestRuntime.extendsFrom testRuntimeOnly, integrationTestCompile
}
sourceSets {
@ -67,7 +67,7 @@ dependencies {
integrationTestRuntime files(prepareGradleTestKitClasspath)
gradleTest project(':jruby-gradle-plugin')
gradleTest 'com.github.jengelman.gradle.plugins:shadow:[1.2.2,2.0)'
gradleTest 'com.github.jengelman.gradle.plugins:shadow:[7.0,8.0)'
testJRubyPrepare "org.jruby:jruby-complete:1.7.19"
}

4
jar-plugin/src/main/groovy/com/github/jrubygradle/jar/internal/JRubyDirInfoTransformer.groovy
View File

@ -27,11 +27,11 @@ import java.nio.file.Files
import java.nio.file.Path
import java.nio.file.Paths
import shadow.org.apache.tools.zip.ZipEntry
import org.apache.tools.zip.ZipEntry
import org.codehaus.plexus.util.IOUtil
import org.gradle.api.file.FileTreeElement
import shadow.org.apache.tools.zip.ZipOutputStream
import org.apache.tools.zip.ZipOutputStream
import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext

10
jar-plugin/src/main/groovy/com/github/jrubygradle/jar/internal/JRubyJarCopyAction.groovy
View File

@ -60,11 +60,11 @@ import org.objectweb.asm.ClassReader
import org.objectweb.asm.ClassVisitor
import org.objectweb.asm.ClassWriter
import org.objectweb.asm.commons.ClassRemapper
import shadow.org.apache.tools.zip.UnixStat
import shadow.org.apache.tools.zip.Zip64RequiredException
import shadow.org.apache.tools.zip.ZipEntry
import shadow.org.apache.tools.zip.ZipFile
import shadow.org.apache.tools.zip.ZipOutputStream
import org.apache.tools.zip.UnixStat
import org.apache.tools.zip.Zip64RequiredException
import org.apache.tools.zip.ZipEntry
import org.apache.tools.zip.ZipFile
import org.apache.tools.zip.ZipOutputStream
import java.util.zip.ZipException

25
jar-plugin/src/main/resources/META-INF/gradle-plugins/com.github.jruby-gradle.jar.properties
View File

@ -1,25 +0,0 @@
#
# Copyright (c) 2014-2023, R. Tyler Croy <rtyler@brokenco.de>,
# Schalk Cronje <ysb33r@gmail.com>, Christian Meier, Lookout, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
implementation-class=com.github.jrubygradle.jar.JRubyJarPlugin

14
settings.gradle
View File

@ -1,4 +1,15 @@
['base','war','jar', 'core'].each { mod ->
plugins {
id "com.gradle.enterprise" version "3.13.2"
}
gradleEnterprise {
buildScan {
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
}
}
['base', 'war', 'jar', 'core'].each { mod ->
def fName = "jruby-gradle-${mod}-plugin"
include fName
@ -6,4 +17,3 @@
}
include 'docs'

14
war-plugin/build.gradle
View File

@ -2,10 +2,11 @@ description = 'This plugin encapsulates web archive building functionality for J
dependencies {
compile project(':jruby-gradle-base-plugin')
compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
implementation project(':jruby-gradle-base-plugin')
implementation project(':jruby-gradle-core-plugin')
implementation group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
testCompile(spockVersion) {
testImplementation(spockVersion) {
exclude module: 'groovy-all'
}
}
@ -14,13 +15,14 @@ artifacts {
archives sourcesJar
}
pluginBundle {
gradlePlugin {
plugins {
gradlePlugin {
warPlugin {
id = 'com.github.jruby-gradle.war'
implementationClass = 'com.github.jrubygradle.api.war.JRubyCorePlugin'
displayName = 'JRuby/Gradle base plugin'
description = 'This plugin encapsulates building deployable WARs using JRuby'
tags = (['jruby', 'war'])
// tags.set(['jruby', 'war'])
}
}
}

25
war-plugin/src/main/resources/META-INF/gradle-plugins/com.github.jruby-gradle.war.properties
View File

@ -1,25 +0,0 @@
#
# Copyright (c) 2014-2023, R. Tyler Croy <rtyler@brokenco.de>,
# Schalk Cronje <ysb33r@gmail.com>, Christian Meier, Lookout, Inc.
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
implementation-class=com.github.jrubygradle.war.JRubyWarPlugin