From 668414b76fbd8919adf9351203a002866bb5f6ad Mon Sep 17 00:00:00 2001 From: Mikael Beyene Date: Tue, 23 Sep 2014 00:48:10 +0200 Subject: [PATCH] Fix travis build. --- .travis.yml | 7 ++++++ build.gradle | 57 --------------------------------------------- build.gradle.travis | 49 -------------------------------------- 3 files changed, 7 insertions(+), 106 deletions(-) delete mode 100644 build.gradle.travis diff --git a/.travis.yml b/.travis.yml index 1b95283..0b33467 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,10 @@ branches: # send coverage data after_success: - mvn clean test jacoco:report coveralls:jacoco + +before_script: + - mv build.gradle build.gradle.deploy + - mv build.gradle.travis build.gradle +after_script: + - mv build.gradle build.gradle.travis + - mv build.gradle.deploy build.gradle \ No newline at end of file diff --git a/build.gradle b/build.gradle index 1db30ba..d38838f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,6 @@ apply plugin: 'java' apply plugin: 'jacoco' apply plugin: 'eclipse' -def dontDeploy = System.getenv("DONT_DEPLOY") ?: "" -if ( dontDeploy.length() == 0 ) { - apply plugin: 'maven' - apply plugin: 'signing' -} - sourceCompatibility = 1.7 group = 'org.beyene' @@ -52,55 +46,4 @@ tasks.withType(JavaCompile) { artifacts { archives sourcesJar, javadocJar -} - -if ( dontDeploy.length() == 0 ) { - -signing { - sign configurations.archives -} - -uploadArchives { - repositories { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.project { - name 'org.beyene:sius' - packaging 'jar' - artifactId 'sius' - description 'S.I. Unit System Conversion Library' - url 'https://github.com/mbe24/sius' - - scm { - connection 'scm:git@github.com:mbe24/sius.git' - developerConnection 'scm:git@github.com:mbe24/sius.git' - url 'https://github.com/mbe24/sius' - } - - licenses { - license { - name 'The Apache License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'mbeyene' - name 'Mikael Beyene' - email 'dev@beyene.org' - } - } - } - } - } } \ No newline at end of file diff --git a/build.gradle.travis b/build.gradle.travis deleted file mode 100644 index d38838f..0000000 --- a/build.gradle.travis +++ /dev/null @@ -1,49 +0,0 @@ -apply plugin: 'java' -apply plugin: 'jacoco' -apply plugin: 'eclipse' - -sourceCompatibility = 1.7 - -group = 'org.beyene' -archivesBaseName = 'sius' -version = '0.2.0-SNAPSHOT' - -sourceSets { - main { - java { - exclude 'org/beyene/sius/example/**' - } - } -} - -jar { - manifest { - attributes 'Implementation-Title': 'Sius', 'Implementation-Version': version - } -} - -repositories { - mavenCentral() -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.+' -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier = 'javadoc' - from javadoc.destinationDir -} - -tasks.withType(JavaCompile) { - options.compilerArgs << '-Xlint:all' -} - -artifacts { - archives sourcesJar, javadocJar -} \ No newline at end of file