Skip to content

Commit f36eb27

Browse files
committedMay 16, 2023
Correct plugin id for com.github.jruby-gradle.war
Rename gradle project for the base plugin to jruby-gradle-base-plugin
1 parent d034c13 commit f36eb27

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed
 

‎gradle.properties

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
version=2.1.0-beta.0
22
group=com.github.jruby-gradle
3-
copyrightYear=2014-2020
3+
copyrightYear=2014-2023
44

55
org.gradle.daemon=true
66
org.gradle.caching=true
77
org.gradle.parallel=false
88
org.gradle.configureondemand=false
99

10-
bintrayUser=
11-
bintrayKey=
1210
releaseBuild=false
1311

1412
targetCompatibility=1.8

‎jar-plugin/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ configurations {
1111
}
1212

1313
generateTestConfig {
14-
testProperties mavenrepo: new File(project(':jruby-gradle-plugin').projectDir,'src/integTest/mavenrepo').absolutePath,
14+
testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir,'src/integTest/mavenrepo').absolutePath,
1515
flatrepo: testRepoDir.absolutePath
1616
}
1717

1818
dependencies {
19-
compile project(':jruby-gradle-plugin')
19+
compile project(':jruby-gradle-base-plugin')
2020
/*
2121
* NOTE: version 5.0.0 of the shadow plugin supports only Gradle 5.x and later
2222
*/

‎settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
['base','war','jar', 'core'].each { mod ->
2-
def fName = "jruby-gradle${(mod == 'base') ? '' : ('-' + mod)}-plugin"
2+
def fName = "jruby-gradle-${mod}-plugin"
33

44
include fName
55
project(":${fName}").projectDir = file("${mod}-plugin")

‎war-plugin/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ description = 'This plugin encapsulates web archive building functionality for J
22

33

44
dependencies {
5-
compile project(':jruby-gradle-plugin')
5+
compile project(':jruby-gradle-base-plugin')
66
compile group: 'com.github.jruby-gradle', name: 'warbler-bootstrap', version: '0.2.0+'
77

88
testCompile(spockVersion) {
@@ -17,7 +17,7 @@ artifacts {
1717
pluginBundle {
1818
plugins {
1919
gradlePlugin {
20-
id = 'com.github.jruby-gradle.jar'
20+
id = 'com.github.jruby-gradle.war'
2121
displayName = 'JRuby/Gradle base plugin'
2222
description = 'This plugin encapsulates building deployable WARs using JRuby'
2323
tags = (['jruby', 'war'])

0 commit comments

Comments
 (0)