Skip to content

Commit cc85ff6

Browse files
committed
Updated build scripts
1 parent 259ad6f commit cc85ff6

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

flexible-adapter-livedata/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apply plugin: 'eu.davidea.grabver'
55
versioning {
66
major 1
77
minor 0
8-
preRelease "alpha1"
8+
preRelease "b1"
99
}
1010
// For maven repository
1111
version = versioning.name

flexible-adapter-ui/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apply plugin: 'eu.davidea.grabver'
44
versioning {
55
major 1
66
minor 0
7-
preRelease "alpha1"
7+
preRelease "b1"
88
}
99
// For maven repository
1010
version = versioning.name

jfrog-artifactory-publish.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ artifactory {
2525
publish {
2626
repository {
2727
// The Artifactory repository key to publish to
28-
repoKey = version.endsWith('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local'
28+
repoKey = versioning.name.endsWith('SNAPSHOT') ? 'libs-snapshot-local' : 'libs-release-local'
2929
username = getProperties().get("bintray.user")
3030
password = getProperties().get("bintray.apikey")
3131
}

jfrog-bintray-publish.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def getApiKey() {
1313
}
1414

1515
if (gradle.getStartParameter().getTaskNames().contains("bintrayUpload")) {
16-
println("> Publishing: " + libraryName + " " + version)
16+
println("> Publishing: " + libraryName + " v" + versioning.name)
1717

1818
bintray {
1919
user = getRepositoryUsername()
@@ -31,9 +31,9 @@ if (gradle.getStartParameter().getTaskNames().contains("bintrayUpload")) {
3131
publish = true
3232
publicDownloadNumbers = true
3333
version {
34-
name = version
34+
name = versioning.name
3535
desc = libraryDescription
36-
vcsTag = version
36+
vcsTag = versioning.name
3737
released = new Date()
3838
gpg {
3939
sign = true //Determines whether to GPG sign the files. The default is false

maven-install.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.github.dcendents.android-maven'
22

33
if (gradle.getStartParameter().getTaskNames().contains("install")) {
4-
println("> Installing: " + libraryName + " v" + version)
4+
println("> Installing: " + libraryName + " v" + versioning.name)
55
}
66

77
group = publishedGroupId // Maven Group ID for the artifact
@@ -35,7 +35,7 @@ install {
3535
packaging packageExt
3636
groupId publishedGroupId
3737
artifactId artifact
38-
version version
38+
version versioning.name
3939

4040
// Add your description here
4141
name libraryName

maven-publish.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ apply plugin: 'maven'
1717
apply plugin: 'signing'
1818

1919
if (gradle.getStartParameter().getTaskNames().contains("uploadArchives")) {
20-
println("> Publishing: " + libraryName + " v" + version)
20+
println("> Publishing: " + libraryName + " v" + versioning.name)
2121
}
2222

2323
def hasProxy() { return hasProperty('systemProp.http.proxyUser')}
@@ -28,7 +28,7 @@ def getProxyUser() { return getProperties().get("systemProp.http.proxyUser") }
2828
def getProxyPassword() { return getProperties().get("systemProp.http.proxyPassword") }
2929

3030
def isReleaseBuild() {
31-
return version.contains("SNAPSHOT") == false
31+
return versioning.name.contains("SNAPSHOT") == false
3232
}
3333

3434
def getReleaseRepositoryUrl() {
@@ -55,7 +55,7 @@ afterEvaluate { project ->
5555

5656
pom.groupId = publishedGroupId
5757
pom.artifactId = artifact
58-
pom.version = version
58+
pom.version = versioning.name
5959

6060
if (hasProxy()) {
6161
println("PROXY! host: " + getProxyHost() + ", port: " + getProxyPort() + ", type: " + getProxyType() + ", userName: " + getProxyUser() + ", password: " + getProxyPassword())

0 commit comments

Comments
 (0)