diff options
| author | Joey Grover <joeygrover@gmail.com> | 2019-03-18 18:37:38 -0400 |
|---|---|---|
| committer | Joey Grover <joeygrover@gmail.com> | 2019-03-18 18:37:38 -0400 |
| commit | 33d092291b1cf00745b4019b1d19e02676193fdb (patch) | |
| tree | 0c25b87b7f5ef8adaf39f8d3de428f6180c44024 /javaEE | |
| parent | 0208c48c91c138360f0ada80c9704c686319fb4a (diff) | |
| parent | 76ffcd4745b91cf632112fa24d06181828f6ac76 (diff) | |
| download | sdl_android-33d092291b1cf00745b4019b1d19e02676193fdb.tar.gz | |
Merge branch 'feature/sdl_java_base' of https://github.com/smartdevicelink/sdl_android into feature/sample_java_apps
Diffstat (limited to 'javaEE')
| -rw-r--r-- | javaEE/bintray.gradle | 6 | ||||
| -rw-r--r-- | javaEE/bintray.properties | 4 | ||||
| -rw-r--r-- | javaEE/build.gradle | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/javaEE/bintray.gradle b/javaEE/bintray.gradle index abf86b8b6..f151bb9be 100644 --- a/javaEE/bintray.gradle +++ b/javaEE/bintray.gradle @@ -30,7 +30,7 @@ bintray { // Authorization user = props.getProperty("bintray.user") key = props.getProperty("bintray.key") - version = props.getProperty("bintray.version") + version = "$project.version" publications = ['mavenPublication'] @@ -43,7 +43,7 @@ bintray { licenses = ["BSD 3-Clause"] publish = props.getProperty("bintray.publish") // Will upload to jCenter version { - name = props.getProperty("bintray.version") // Change to release version + name = "$project.version" // Change to release version desc = libDescription released = new Date() // Will be the current date & time vcsTag = props.getProperty("bintray.vcs") // Should match git tag @@ -83,7 +83,7 @@ publishing { } groupId props.getProperty("bintray.userorg") artifactId props.getProperty("bintray.artifact") - version props.getProperty("bintray.vcs") + version "$project.version" pom.withXml { def root = asNode() root.appendNode('description', libDescription) diff --git a/javaEE/bintray.properties b/javaEE/bintray.properties index b923025a5..b1d2ca117 100644 --- a/javaEE/bintray.properties +++ b/javaEE/bintray.properties @@ -3,6 +3,4 @@ bintray.key=apikey bintray.repo=sdl_java_ee bintray.artifact=sdl_java_ee bintray.userorg=smartdevicelink -bintray.publish=true -bintray.version=X.X.X -bintray.vcs=X.X.X
\ No newline at end of file +bintray.publish=true
\ No newline at end of file diff --git a/javaEE/build.gradle b/javaEE/build.gradle index 325ad2f7c..a1f825d88 100644 --- a/javaEE/build.gradle +++ b/javaEE/build.gradle @@ -26,12 +26,13 @@ configurations { } dependencies { - //extraLibs fileTree(dir: 'libs', include: ['*.jar']) + extraLibs fileTree(dir: 'libs', include: ['*.jar']) extraLibs project(path: ':javaSE') - configurations.implementation.extendsFrom(configurations.extraLibs) + configurations.api.extendsFrom(configurations.extraLibs) } jar { + dependsOn ':javaSE:jar' from { configurations.extraLibs.collect { it.isDirectory() ? it : zipTree(it) } } @@ -39,7 +40,7 @@ jar { apply from: 'bintray.gradle' -// Excluded :javaSE:bintrayUpload from running when we run bintrayUpload in javaEE +// Exclude :javaSE:bintrayUpload from running when we run bintrayUpload in javaEE def taskRequests = gradle.startParameter.taskRequests def runTaskRequest = taskRequests.find { it.args.contains('bintrayUpload') } if (runTaskRequest) { |