Skip to content

Commit fe44c08

Browse files
committed
Support an internal Ivy proxy to Rubygems.org (#364)
- Resolve dependencies with transitive dependencies. - Added a repository handler extension for defining rubygems. - Protect ivy.xml file creation against concurrent access from threads of multiple processes. - Support all known GEM version requirement formats
1 parent 92db049 commit fe44c08

30 files changed

+1482
-246
lines changed

base-plugin/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ ext {
2929

3030
dependencies {
3131

32+
compile project(":jruby-gradle-core-plugin")
3233
compile "org.eclipse.jetty:jetty-server:${jettyVersion}"
3334
compile "org.eclipse.jetty:jetty-webapp:${jettyVersion}"
3435
runtime('de.saumya.mojo:rubygems:0.2.3@war') {

base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersion.groovy

Lines changed: 0 additions & 206 deletions
This file was deleted.

base-plugin/src/main/groovy/com/github/jrubygradle/internal/GemVersionResolver.groovy

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
package com.github.jrubygradle.internal
22

3+
import com.github.jrubygradle.core.GemVersion
34
import org.gradle.api.GradleException
45
import org.gradle.api.Project
56
import org.gradle.api.artifacts.Configuration
67
import org.gradle.api.artifacts.DependencyResolveDetails
78
import org.gradle.api.logging.Logger
89
import org.gradle.api.logging.Logging
910

11+
import static com.github.jrubygradle.core.GemVersion.gemVersionFromGradleRequirement
12+
1013
/**
1114
* Resolver to compute gem versions
1215
*/
@@ -84,7 +87,7 @@ class GemVersionResolver {
8487
details.useVersion(next.toString())
8588
}
8689
else {
87-
GemVersion next = new GemVersion(details.requested.version)
90+
GemVersion next = gemVersionFromGradleRequirement(details.requested.version)
8891
versions[details.requested.name] = next
8992
logger.debug("${configuration} nothing collected")
9093
logger.debug("${configuration} resolved ${next}")

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ plugins {
44
id 'com.jfrog.bintray' version '1.8.4' apply false
55
id 'org.ajoberstar.github-pages' version '1.2.0' apply false
66
id 'org.ysb33r.cloudci.appveyor.testreporter' version '2.5' apply false
7+
id "io.ratpack.ratpack-java" version "1.6.1" apply false
78
}
89

910
buildScan {
@@ -51,8 +52,8 @@ subprojects {
5152
dependencies {
5253
compile localGroovy()
5354
compile gradleApi()
54-
compile 'org.ysb33r.gradle:grolifant:0.8'
55-
gradleTestRuntime 'org.ysb33r.gradle:grolifant:0.8'
55+
compile 'org.ysb33r.gradle:grolifant:0.12'
56+
gradleTestRuntime 'org.ysb33r.gradle:grolifant:0.12'
5657
}
5758

5859
codenarc {

core-plugin/build.gradle

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
//plugins {
2+
// id "io.ratpack.ratpack-java"
3+
//}
4+
5+
//plugins {
6+
// id 'io.spring.dependency-management' version '1.0.6.RELEASE'
7+
//}
8+
//
9+
//
10+
//
11+
//dependencyManagement {
12+
// imports {
13+
// mavenBom 'io.micronaut:micronaut-bom:1.1.2'
14+
// }
15+
//}
16+
dependencies {
17+
// implementation 'io.micronaut:micronaut-http-server-netty'
18+
implementation "io.github.http-builder-ng:http-builder-ng-okhttp:${httpbuilderNgVersion}"
19+
implementation "io.ratpack:ratpack-core:1.6.1"
20+
integrationTestCompile gradleTestKit()
21+
22+
testCompile(spockVersion) {
23+
exclude module: 'groovy-all'
24+
exclude group: 'org.codehaus.groovy'
25+
}
26+
27+
integrationTestCompile(spockVersion) {
28+
exclude module: 'groovy-all'
29+
exclude group: 'org.codehaus.groovy'
30+
}
31+
}

0 commit comments

Comments
 (0)