Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
language: java
matrix:
include:
- os: osx
install:
- curl -s "https://get.sdkman.io" | bash
- source ~/.bash_profile
- sdk install gradle
script:
- ./test.sh
- os: linux
sudo: required
dist: trusty
install:
- curl -s "https://get.sdkman.io" | bash
- source ~/.bash_profile
- sdk install gradle
script:
- ./test.sh
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id "com.gradle.plugin-publish" version "0.9.2"
id "com.gradle.plugin-publish" version "0.10.0"
}

apply plugin: 'groovy'
Expand All @@ -22,6 +22,7 @@ repositories {
dependencies {
compile gradleApi()
compile localGroovy()
testCompile 'org.testng:testng:6.14.3'
}

task sourcesJar(type: Jar) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
3 changes: 1 addition & 2 deletions src/main/groovy/us/kirchmeier/capsule/task/Capsule.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package us.kirchmeier.capsule.task

import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.FileCollectionDependency
import org.gradle.api.artifacts.ModuleDependency
import org.gradle.api.tasks.bundling.Jar
import org.gradle.util.ConfigureUtil
import us.kirchmeier.capsule.manifest.CapsuleManifest
Expand All @@ -24,7 +23,7 @@ class Capsule extends Jar {
* A filter, used to limit the capsule classes if the entire jar is not needed.
* <p>The closure delegates to a {@link org.gradle.api.file.CopySpec}.</p>
*/
Closure capsuleFilter
Closure capsuleFilter = {}

/**
* The caplet configuration describing any caplet classes.
Expand Down
2 changes: 1 addition & 1 deletion src/test/gradle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ project('subproject') {
}
}

task runScript() << {
task runScript() doLast {
if(!project.hasProperty('testScript')) throw new Exception("Missing -PtestScript=...")
evaluate(new File(project.property('testScript')))
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/gradle/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
2 changes: 1 addition & 1 deletion src/test/gradle/subproject/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
task hello << {
task hello doLast {
println "Hello, I am a subproject"
}
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public class CapsuleManifestTest {
'com.foo:Calculator-Adware:1.3:annoying(com.foo.optional:*) ' +
'com.foo:Calculator-Ajax:1.1:standalone ' +
'com.foo:Calculator-Core:1.0 ' +
'com.foo:Calculator-Mongo:1.2(com.bar:common,*:shared)'
'com.foo:Calculator-Mongo:1.2(*:shared,com.bar:common)'

assert expectedDeps == result[null]['Dependencies']
}
Expand Down
20 changes: 9 additions & 11 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,15 @@
set -eu

VERSIONS=(
2.14.1
2.13
2.12
2.11
2.10
2.9
2.8
2.7
2.6
2.5
2.4
5.0
4.10
4.9
4.8
4.7
4.6
4.5
4.4
4.3
)

main(){
Expand Down