Skip to content

Commit 6964aff

Browse files
authored
Gradle upgrade and Travis cleanup (#332)
* gradle v5.2 * cleanup gradle
1 parent 8bf958e commit 6964aff

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ before_install:
1111
- sudo echo "security.provider.11=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a ${JAVA_HOME}/jre/lib/security/java.security
1212

1313
script:
14-
- make testSDK
14+
- ./gradlew assembleRelease testReleaseUnitTest
1515

16-
after_success:
17-
- make releaseArtifacts
16+
before_deploy:
17+
- ./gradlew assembleRelease makeJar generatePomFileForAarPublication
1818

1919
deploy:
2020
- provider: script
2121
skip_cleanup: true
22-
script: make deployArtifacts
22+
script: ./gradlew artifactoryPublish bintrayUpload
2323
on:
2424
tags: true

Makefile

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,6 @@
44
#
55
####################################################################
66

7-
testSDK:
8-
./gradlew assembleRelease testReleaseUnitTest
9-
10-
patchReleaseBranch:
11-
./Tools/create-release.bash patch
12-
13-
releaseBinaries:
14-
./gradlew assembleRelease makeJar
15-
16-
releasePoms:
17-
./gradlew generatePomFileForAarPublication
18-
19-
releaseArtifacts: releaseBinaries releasePoms
20-
21-
deployArtifacts:
22-
./gradlew artifactoryPublish bintrayUpload
23-
247
tagCommit:
258
git tag `cat sdk-version.txt`; git push origin `cat sdk-version.txt`
269

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)