diff --git a/base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyGenerateGradleRbIntegrationSpec.groovy b/base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyGenerateGradleRbIntegrationSpec.groovy index 4c0e2de..154039c 100644 --- a/base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyGenerateGradleRbIntegrationSpec.groovy +++ b/base-plugin/src/integTest/groovy/com/github/jrubygradle/JRubyGenerateGradleRbIntegrationSpec.groovy @@ -24,7 +24,7 @@ package com.github.jrubygradle import com.github.jrubygradle.testhelper.IntegrationSpecification -import org.ysb33r.grolifant.api.OperatingSystem +import org.ysb33r.grolifant.api.core.OperatingSystem import spock.lang.IgnoreIf /** diff --git a/base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy b/base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy index 0ed0e62..9f4b93e 100644 --- a/base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy +++ b/base-plugin/src/main/groovy/com/github/jrubygradle/internal/JRubyExecUtils.groovy @@ -28,7 +28,7 @@ import groovy.transform.CompileDynamic import groovy.transform.CompileStatic import org.gradle.api.InvalidUserDataException import org.gradle.api.artifacts.Configuration -import org.ysb33r.grolifant.api.OperatingSystem +import org.ysb33r.grolifant.api.core.OperatingSystem import org.ysb33r.grolifant.api.core.ProjectOperations import org.ysb33r.grolifant.api.v4.StringUtils diff --git a/base-plugin/src/test/groovy/com/github/jrubygradle/internal/JRubyExecUtilsSpec.groovy b/base-plugin/src/test/groovy/com/github/jrubygradle/internal/JRubyExecUtilsSpec.groovy index 99ebc21..befcf51 100644 --- a/base-plugin/src/test/groovy/com/github/jrubygradle/internal/JRubyExecUtilsSpec.groovy +++ b/base-plugin/src/test/groovy/com/github/jrubygradle/internal/JRubyExecUtilsSpec.groovy @@ -24,7 +24,7 @@ package com.github.jrubygradle.internal import org.gradle.api.InvalidUserDataException -import org.ysb33r.grolifant.api.OperatingSystem +import org.ysb33r.grolifant.api.core.OperatingSystem import spock.lang.Issue import spock.lang.Specification diff --git a/core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/AbstractIvyXmlProxyServer.groovy b/core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/AbstractIvyXmlProxyServer.groovy index 657c626..15ce7d2 100644 --- a/core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/AbstractIvyXmlProxyServer.groovy +++ b/core-plugin/src/main/groovy/com/github/jrubygradle/internal/core/AbstractIvyXmlProxyServer.groovy @@ -34,7 +34,7 @@ import groovy.transform.CompileStatic import groovy.transform.InheritConstructors import groovy.transform.Synchronized import groovy.util.logging.Slf4j -import org.ysb33r.grolifant.api.ExclusiveFileAccess +import org.ysb33r.grolifant.api.core.ExclusiveFileAccess import java.nio.file.Files import java.nio.file.Path diff --git a/core-plugin/src/test/groovy/com/github/jrubygradle/api/core/RubyGemQueryRestApiSpec.groovy b/core-plugin/src/test/groovy/com/github/jrubygradle/api/core/RubyGemQueryRestApiSpec.groovy index cc6741a..43a4fe4 100644 --- a/core-plugin/src/test/groovy/com/github/jrubygradle/api/core/RubyGemQueryRestApiSpec.groovy +++ b/core-plugin/src/test/groovy/com/github/jrubygradle/api/core/RubyGemQueryRestApiSpec.groovy @@ -24,7 +24,7 @@ package com.github.jrubygradle.api.core import com.github.jrubygradle.internal.core.DefaultRubyGemRestApi -import org.ysb33r.grolifant.api.Version +import org.ysb33r.grolifant.api.core.Version import spock.lang.Specification class RubyGemQueryRestApiSpec extends Specification { diff --git a/examples/run-simple-ruby-script/build.gradle b/examples/run-simple-ruby-script/build.gradle index 2b9a278..4388f4c 100644 --- a/examples/run-simple-ruby-script/build.gradle +++ b/examples/run-simple-ruby-script/build.gradle @@ -25,9 +25,8 @@ task printSomePrettyOutputPlease(type: JRubyExec) { script "${projectDir}/print-script.rb" } - /* - * This task is only here for the execution fo the gradleTest + * This task is only here for the execution of the gradleTest */ task runGradleTest { dependsOn printSomePrettyOutputPlease diff --git a/gradle.properties b/gradle.properties index 0d6262f..5e60570 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.1.0-alpha.1 +version=2.1.0-alpha.2 group=com.github.jruby-gradle copyrightYear=2014-2020 @@ -14,7 +14,7 @@ releaseBuild=false targetCompatibility=1.8 sourceCompatibility=1.8 -grolifantVersion=1.0.0-alpha.1 +grolifantVersion=1.0.0-alpha.2 jrubyVersion=9.2.9.0 jettyVersion=9.2.12.v20150709 bcprovVersion=1.46