Skip to content

Commit 678d705

Browse files
committed
Fix singing
Update README.md Update .travis.yml
1 parent fc26497 commit 678d705

File tree

5 files changed

+16
-12
lines changed

5 files changed

+16
-12
lines changed

.travis.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
language: java
2+
sudo: false
3+
dist: trusty
4+
25
env:
36
global:
47
- secure: "WO+wGc4aIQPYZyqZ9GPEl6WQRIl5nkASZ9R0px8m5VRw5Ca4hlB3GqdQccnFnHtxXlTbY56CZGrTNqpDt9ThGeaoCNWer+KXm0ur38F/IIYSpv8AjkN22/vcS/pEX6imIrflv34IO8PWF7hsw8UNgwteYJOTBu6MyF/cM1XLOh7YKj+dXwurVNBRB9mbcaSq/cVV6UySLm4t4i9+2rOb4qGxqjoyqATdOQ2y3sPPkJH5G/p28nwvAn8K4a5IytM4AslGPADSO3Y4oWW4RMmaj8zNjoTOPrIl+7UFuwSFEfel7nny7QPyGoIsLGgG3O5G7m87YnNBs1rqCw9ANKEsW0RZQ0dMBtKa6d/Ju/EFxNYcgipLD+3Pfg7jDHMUJJ4gaxSeRp89w+wJ1yjUohMbUvBgKP7gAGfEorjHxX3kx3cf5jAl7vh3F3CztCrwXYA4uvHeu3X4p8wONrHStKl9U8Xv33uyaIr3Mb10WrWs5nIFrh9Vr1LOz/DunRy6XrJls/p9ARLCJL8DZydt+UO0nprKHeoVqH0/7Mre5d0hjUdz+fjWhtMU0cnh0Xud+KeWY2Zrvr3ElQZVsmo55Qrjr0/AJFw996bGJFMWE4i5NLrrsknbNpHyWoViVv2NJSqxkzSduUvu4vNo9htXIrQ0/S3SSdi9VAdbLSNbYSOzwwA="
@@ -9,6 +12,9 @@ env:
912

1013
script: ./gradlew compileGroovy
1114

15+
install:
16+
- true
17+
1218
after_success:
1319
- ./cd/before-deploy.sh
1420
- ./cd/deploy.sh

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Main features are:
1515

1616
Full plugin configuration below, optional properties can be omitted
1717

18-
```
18+
```groovy
1919
buildscript {
2020
dependencies{
2121
classpath group: 'com.assertthat.plugins', name: 'assertthat-bdd-gradle-tasks', version: '1.1'

build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,7 @@ task sourcesJar(type: Jar) {
3131
}
3232

3333
artifacts {
34-
archives javadocJar, sourcesJar
35-
}
36-
37-
signing {
38-
ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
39-
40-
signing {
41-
required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives") }
42-
sign configurations.archives
43-
}
34+
archives jar, javadocJar, sourcesJar
4435
}
4536

4637
uploadArchives {
@@ -88,3 +79,9 @@ uploadArchives {
8879
}
8980
}
9081
}
82+
83+
signing {
84+
required { !version.endsWith("SNAPSHOT") && gradle.taskGraph.hasTask("uploadArchives") }
85+
useGpgCmd()
86+
sign configurations.archives
87+
}

cd/before-deploy.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env bash
22
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
33
openssl aes-256-cbc -K $encrypted_ff4bd488efde_key -iv $encrypted_ff4bd488efde_iv -in cd/codesigning.asc.enc -out cd/codesigning.asc -d
4+
gpg --fast-import cd/codesigning.asc
45
fi

cd/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
3-
./gradlew uploadArchives -Psigning.keyId=$GPG_KEY_NAME -Psigning.password=$GPG_PASSPHRASE
3+
./gradlew uploadArchives -Psigning.gnupg.executable=gpg -Psigning.gnupg.useLegacyGpg=true -Psigning.gnupg.keyName=$GPG_KEY_NAME -Psigning.gnupg.passphrase=$GPG_PASSPHRASE
44
fi

0 commit comments

Comments
 (0)