Correct plugin id for com.github.jruby-gradle.war

Rename gradle project for the base plugin to jruby-gradle-base-plugin
This commit is contained in:
Uwe Kubosch 2023-05-16 10:13:03 +02:00
parent d034c13e16
commit f36eb27c1d
4 changed files with 6 additions and 8 deletions

View File

@ -1,14 +1,12 @@
version=2.1.0-beta.0 version=2.1.0-beta.0
group=com.github.jruby-gradle group=com.github.jruby-gradle
copyrightYear=2014-2020 copyrightYear=2014-2023
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.caching=true org.gradle.caching=true
org.gradle.parallel=false org.gradle.parallel=false
org.gradle.configureondemand=false org.gradle.configureondemand=false
bintrayUser=
bintrayKey=
releaseBuild=false releaseBuild=false
targetCompatibility=1.8 targetCompatibility=1.8

View File

@ -11,12 +11,12 @@ configurations {
} }
generateTestConfig { generateTestConfig {
testProperties mavenrepo: new File(project(':jruby-gradle-plugin').projectDir,'src/integTest/mavenrepo').absolutePath, testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir,'src/integTest/mavenrepo').absolutePath,
flatrepo: testRepoDir.absolutePath flatrepo: testRepoDir.absolutePath
} }
dependencies { dependencies {
compile project(':jruby-gradle-plugin') compile project(':jruby-gradle-base-plugin')
/* /*
* NOTE: version 5.0.0 of the shadow plugin supports only Gradle 5.x and later * NOTE: version 5.0.0 of the shadow plugin supports only Gradle 5.x and later
*/ */

View File

@ -1,5 +1,5 @@
['base','war','jar', 'core'].each { mod -> ['base','war','jar', 'core'].each { mod ->
def fName = "jruby-gradle${(mod == 'base') ? '' : ('-' + mod)}-plugin" def fName = "jruby-gradle-${mod}-plugin"
include fName include fName
project(":${fName}").projectDir = file("${mod}-plugin") project(":${fName}").projectDir = file("${mod}-plugin")

View File

@ -2,7 +2,7 @@ description = 'This plugin encapsulates web archive building functionality for J
dependencies { dependencies {
compile project(':jruby-gradle-plugin') compile project(':jruby-gradle-base-plugin')
compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+' compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
testCompile(spockVersion) { testCompile(spockVersion) {
@ -17,7 +17,7 @@ artifacts {
pluginBundle { pluginBundle {
plugins { plugins {
gradlePlugin { gradlePlugin {
id = 'com.github.jruby-gradle.jar' id = 'com.github.jruby-gradle.war'
displayName = 'JRuby/Gradle base plugin' displayName = 'JRuby/Gradle base plugin'
description = 'This plugin encapsulates building deployable WARs using JRuby' description = 'This plugin encapsulates building deployable WARs using JRuby'
tags = (['jruby', 'war']) tags = (['jruby', 'war'])