Skip to content

Commit

Permalink
Merge pull request #20 from AlanKrueger/master
Browse files Browse the repository at this point in the history
update to gradle 1.2 and add nexus plugin
  • Loading branch information
AlanKrueger committed Oct 17, 2012
2 parents a819ce4 + 23d759c commit a97a303
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
.settings
bin
build
local.properties
gradle.properties
107 changes: 45 additions & 62 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
apply plugin: 'groovy'
apply plugin: 'maven'
apply plugin: 'signing'
apply plugin: 'eclipse'
apply plugin: 'nexus'

group = 'com.trigonic'
version = '1.1'
version = '1.2-SNAPSHOT'

def props = new Properties();
def localProperties = new File("local.properties")
if (localProperties.exists()) localProperties.withInputStream { props.load(it) }
props.each { project.ext.set it.key, it.value }
buildscript {
repositories {
mavenCentral()
}

configurations {
deployerJars
dependencies {
classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.2'
}
}

repositories {
Expand All @@ -21,13 +21,11 @@ repositories {

dependencies {
compile gradleApi()
compile 'org.redline-rpm:redline:1.1.9'
compile 'org.redline-rpm:redline:1.1.+'

groovy 'org.codehaus.groovy:groovy:1.8.5'
groovy 'org.codehaus.groovy:groovy:1.8.+'

testCompile 'junit:junit:4.+'

deployerJars 'org.apache.maven.wagon:wagon-http:1.0-beta-7'
}

task packageJavadoc(type: Jar, dependsOn: 'javadoc') {
Expand All @@ -46,63 +44,48 @@ artifacts {
archives packageSources
}

signing {
required { gradle.taskGraph.hasTask("uploadArchives") }
sign configurations.archives
}

uploadArchives {
repositories.mavenDeployer {
configuration = configurations.deployerJars

beforeDeployment { MavenDeployment deployment -> signPom(deployment) }

repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2') {
authentication(userName: props.get('maven.repository.user'), password: props.get('maven.repository.password'))
modifyPom {
project {
name 'gradle-rpm-plugin - Gradle plugin for constructing RPM packages'
packaging 'jar'
description 'Provides a task similar to Tar and Zip for constructing RPM package files.'
url 'https://github.com/TrigonicSolutions/gradle-rpm-plugin'
inceptionYear '2011'

parent {
groupId 'org.sonatype.oss'
artifactId 'oss-parent'
version '7'
}

pom.project {
name 'gradle-rpm-plugin - Gradle plugin for constructing RPM packages'
packaging 'jar'
description 'Provides a task similar to Tar and Zip for constructing RPM package files.'
url 'https://github.com/TrigonicSolutions/gradle-rpm-plugin'
inceptionYear '2011'

parent {
groupId 'org.sonatype.oss'
artifactId 'oss-parent'
version '7'
}

scm {
url 'scm:git://github.com/TrigonicSolutions/gradle-rpm-plugin.git'
connection 'scm:git://github.com/TrigonicSolutions/gradle-rpm-plugin.git'
}

licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}

scm {
url 'scm:git://github.com/TrigonicSolutions/gradle-rpm-plugin.git'
connection 'scm:git://github.com/TrigonicSolutions/gradle-rpm-plugin.git'
}

licenses {
license {
name 'The Apache Software License, Version 2.0'
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
distribution 'repo'
}

developers {
developer {
id 'akrueger'
name 'Alan Krueger'
email '[email protected]'
roles{
role 'Developer'
}
timezone '-6'
}

developers {
developer {
id 'akrueger'
name 'Alan Krueger'
email '[email protected]'
roles{
role 'Developer'
}
timezone '-6'
}
}
}
}

task createWrapper(type: Wrapper) {
gradleVersion = '1.0-milestone-9'
gradleVersion = '1.2'
}

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Apr 03 15:05:27 CDT 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip
#Wed Oct 17 11:36:47 CDT 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.2-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

##############################################################################
##
Expand Down Expand Up @@ -101,13 +101,13 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
Expand Down

0 comments on commit a97a303

Please sign in to comment.