Skip to content

Commit

Permalink
Support an internal Ivy proxy to Rubygems.org (jruby-gradle#364)
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
ysb33r committed Jun 1, 2019
1 parent 92db049 commit fe44c08
Show file tree
Hide file tree
Showing 30 changed files with 1,482 additions and 246 deletions.
1 change: 1 addition & 0 deletions base-plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ ext {

dependencies {

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

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
package com.github.jrubygradle.internal

import com.github.jrubygradle.core.GemVersion
import org.gradle.api.GradleException
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.DependencyResolveDetails
import org.gradle.api.logging.Logger
import org.gradle.api.logging.Logging

import static com.github.jrubygradle.core.GemVersion.gemVersionFromGradleRequirement

/**
* Resolver to compute gem versions
*/
Expand Down Expand Up @@ -84,7 +87,7 @@ class GemVersionResolver {
details.useVersion(next.toString())
}
else {
GemVersion next = new GemVersion(details.requested.version)
GemVersion next = gemVersionFromGradleRequirement(details.requested.version)
versions[details.requested.name] = next
logger.debug("${configuration} nothing collected")
logger.debug("${configuration} resolved ${next}")
Expand Down
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ plugins {
id 'com.jfrog.bintray' version '1.8.4' apply false
id 'org.ajoberstar.github-pages' version '1.2.0' apply false
id 'org.ysb33r.cloudci.appveyor.testreporter' version '2.5' apply false
id "io.ratpack.ratpack-java" version "1.6.1" apply false
}

buildScan {
Expand Down Expand Up @@ -51,8 +52,8 @@ subprojects {
dependencies {
compile localGroovy()
compile gradleApi()
compile 'org.ysb33r.gradle:grolifant:0.8'
gradleTestRuntime 'org.ysb33r.gradle:grolifant:0.8'
compile 'org.ysb33r.gradle:grolifant:0.12'
gradleTestRuntime 'org.ysb33r.gradle:grolifant:0.12'
}

codenarc {
Expand Down
31 changes: 31 additions & 0 deletions core-plugin/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//plugins {
// id "io.ratpack.ratpack-java"
//}

//plugins {
// id 'io.spring.dependency-management' version '1.0.6.RELEASE'
//}
//
//
//
//dependencyManagement {
// imports {
// mavenBom 'io.micronaut:micronaut-bom:1.1.2'
// }
//}
dependencies {
// implementation 'io.micronaut:micronaut-http-server-netty'
implementation "io.github.http-builder-ng:http-builder-ng-okhttp:${httpbuilderNgVersion}"
implementation "io.ratpack:ratpack-core:1.6.1"
integrationTestCompile gradleTestKit()

testCompile(spockVersion) {
exclude module: 'groovy-all'
exclude group: 'org.codehaus.groovy'
}

integrationTestCompile(spockVersion) {
exclude module: 'groovy-all'
exclude group: 'org.codehaus.groovy'
}
}
Loading

0 comments on commit fe44c08

Please sign in to comment.