Skip to content

Commit 0a0ed7d

Browse files
committed
Release 2.1.0-beta.2 and try publishing docs
1 parent 54eb73a commit 0a0ed7d

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

docs/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ buildscript {
88
classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.1.1"
99
}
1010
}
11+
apply plugin: 'groovy'
1112
apply plugin: 'org.ajoberstar.github-pages'
1213
apply plugin: 'com.github.jruby-gradle.base'
1314

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.1.0-beta.1
1+
version=2.1.0-beta.2
22
group=com.github.jruby-gradle
33
copyrightYear=2014-2023
44

jar-plugin/build.gradle

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
2-
31
ext {
4-
testRepoDir = new File(buildDir,'tmp/test/repo' )
2+
testRepoDir = new File(buildDir, 'tmp/test/repo')
53
}
64

75
configurations {
@@ -11,7 +9,7 @@ configurations {
119
}
1210

1311
generateTestConfig {
14-
testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir,'src/integTest/mavenrepo').absolutePath,
12+
testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir, 'src/integTest/mavenrepo').absolutePath,
1513
flatrepo: testRepoDir.absolutePath
1614
}
1715

@@ -26,40 +24,40 @@ dependencies {
2624
compile 'org.ow2.asm:asm-commons:[6.1,6.99)'
2725
compile 'org.apache.ant:ant:[1.10.6,2.0)'
2826

29-
testCompile (spockVersion) {
30-
exclude module : 'groovy-all'
27+
testCompile(spockVersion) {
28+
exclude module: 'groovy-all'
3129
}
3230

3331
// For the testRepo tests I am locking the versions, instead of a open version, as it makes
3432
// unit testing easier, This does not affect the final artifact.
3533
// If you change values here, you need to update JRubyJarPluginSpec as well.
36-
testRepo ("org.jruby:jruby-complete:${jrubyVersion}") {
34+
testRepo("org.jruby:jruby-complete:${jrubyVersion}") {
3735
transitive = false
3836
}
3937

40-
testRepo ('rubygems:jar-dependencies:0.1.15') {
38+
testRepo('rubygems:jar-dependencies:0.1.15') {
4139
transitive = false
4240
}
4341

44-
testRepo ('org.jruby.mains:jruby-mains:0.6.1') {
42+
testRepo('org.jruby.mains:jruby-mains:0.6.1') {
4543
transitive = false
4644
}
4745

48-
testRepoOldFiles ('de.saumya.mojo:jruby-mains:0.3.0') {
46+
testRepoOldFiles('de.saumya.mojo:jruby-mains:0.3.0') {
4947
transitive = false
5048
}
5149

52-
testRepoOldFiles ("org.jruby:jruby-complete:1.7.11") {
50+
testRepoOldFiles("org.jruby:jruby-complete:1.7.11") {
5351
transitive = false
5452
}
5553

56-
testRepo (spockVersion) {
54+
testRepo(spockVersion) {
5755
transitive = false
5856
}
5957
}
6058

6159

62-
task prepareTestRepo( type : Copy ) {
60+
task prepareTestRepo(type: Copy) {
6361
into testRepoDir
6462
from project.configurations.testRepo
6563
from project.configurations.testRepoOldFiles
@@ -70,16 +68,15 @@ test {
7068
dependsOn prepareTestRepo
7169
}
7270

73-
7471
groovydoc {
7572
docTitle = "${archivesBaseName} ${version}"
7673
}
7774

78-
task installGroovyDoc (type : Copy) {
79-
from ({new File(buildDir,'docs/groovydoc')}) {
75+
task installGroovyDoc(type: Copy) {
76+
from({ new File(buildDir, 'docs/groovydoc') }) {
8077
include '**'
8178
}
82-
into {new File(project.properties.jrubyGradleWebsiteInstallDir,"docs/api/${archivesBaseName}/${version}")}
79+
into { new File(project.properties.jrubyGradleWebsiteInstallDir, "docs/api/${archivesBaseName}/${version}") }
8380
onlyIf { project.hasProperty('jrubyGradleWebsiteInstallDir') }
8481
}
8582

@@ -93,7 +90,7 @@ pluginBundle {
9390
id = 'com.github.jruby-gradle.jar'
9491
displayName = 'JRuby/Gradle base plugin'
9592
description = 'This plugin encapsulates java archive building functionality for JRuby Gradle projects'
96-
tags = (['jruby','fatjar'])
93+
tags = (['jruby', 'fatjar'])
9794
}
9895
}
9996
}

0 commit comments

Comments
 (0)