From 0a0ed7d42811e73aea28dda62e6e03ba03bfeb0c Mon Sep 17 00:00:00 2001 From: Uwe Kubosch Date: Wed, 17 May 2023 20:06:34 +0200 Subject: [PATCH] Release 2.1.0-beta.2 and try publishing docs --- docs/build.gradle | 1 + gradle.properties | 2 +- jar-plugin/build.gradle | 33 +++++++++++++++------------------ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index 59fb6f3..69bb5ab 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -8,6 +8,7 @@ buildscript { classpath "com.github.jruby-gradle:jruby-gradle-plugin:1.1.1" } } +apply plugin: 'groovy' apply plugin: 'org.ajoberstar.github-pages' apply plugin: 'com.github.jruby-gradle.base' diff --git a/gradle.properties b/gradle.properties index 736688e..021c374 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.1.0-beta.1 +version=2.1.0-beta.2 group=com.github.jruby-gradle copyrightYear=2014-2023 diff --git a/jar-plugin/build.gradle b/jar-plugin/build.gradle index 17add64..2f0dd35 100644 --- a/jar-plugin/build.gradle +++ b/jar-plugin/build.gradle @@ -1,7 +1,5 @@ - - ext { - testRepoDir = new File(buildDir,'tmp/test/repo' ) + testRepoDir = new File(buildDir, 'tmp/test/repo') } configurations { @@ -11,7 +9,7 @@ configurations { } generateTestConfig { - testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir,'src/integTest/mavenrepo').absolutePath, + testProperties mavenrepo: new File(project(':jruby-gradle-base-plugin').projectDir, 'src/integTest/mavenrepo').absolutePath, flatrepo: testRepoDir.absolutePath } @@ -26,40 +24,40 @@ dependencies { compile 'org.ow2.asm:asm-commons:[6.1,6.99)' compile 'org.apache.ant:ant:[1.10.6,2.0)' - testCompile (spockVersion) { - exclude module : 'groovy-all' + testCompile(spockVersion) { + exclude module: 'groovy-all' } // For the testRepo tests I am locking the versions, instead of a open version, as it makes // unit testing easier, This does not affect the final artifact. // If you change values here, you need to update JRubyJarPluginSpec as well. - testRepo ("org.jruby:jruby-complete:${jrubyVersion}") { + testRepo("org.jruby:jruby-complete:${jrubyVersion}") { transitive = false } - testRepo ('rubygems:jar-dependencies:0.1.15') { + testRepo('rubygems:jar-dependencies:0.1.15') { transitive = false } - testRepo ('org.jruby.mains:jruby-mains:0.6.1') { + testRepo('org.jruby.mains:jruby-mains:0.6.1') { transitive = false } - testRepoOldFiles ('de.saumya.mojo:jruby-mains:0.3.0') { + testRepoOldFiles('de.saumya.mojo:jruby-mains:0.3.0') { transitive = false } - testRepoOldFiles ("org.jruby:jruby-complete:1.7.11") { + testRepoOldFiles("org.jruby:jruby-complete:1.7.11") { transitive = false } - testRepo (spockVersion) { + testRepo(spockVersion) { transitive = false } } -task prepareTestRepo( type : Copy ) { +task prepareTestRepo(type: Copy) { into testRepoDir from project.configurations.testRepo from project.configurations.testRepoOldFiles @@ -70,16 +68,15 @@ test { dependsOn prepareTestRepo } - groovydoc { docTitle = "${archivesBaseName} ${version}" } -task installGroovyDoc (type : Copy) { - from ({new File(buildDir,'docs/groovydoc')}) { +task installGroovyDoc(type: Copy) { + from({ new File(buildDir, 'docs/groovydoc') }) { include '**' } - into {new File(project.properties.jrubyGradleWebsiteInstallDir,"docs/api/${archivesBaseName}/${version}")} + into { new File(project.properties.jrubyGradleWebsiteInstallDir, "docs/api/${archivesBaseName}/${version}") } onlyIf { project.hasProperty('jrubyGradleWebsiteInstallDir') } } @@ -93,7 +90,7 @@ pluginBundle { id = 'com.github.jruby-gradle.jar' displayName = 'JRuby/Gradle base plugin' description = 'This plugin encapsulates java archive building functionality for JRuby Gradle projects' - tags = (['jruby','fatjar']) + tags = (['jruby', 'fatjar']) } } }