summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--VERSION1
-rw-r--r--android/sdl_android/bintray.gradle8
-rw-r--r--android/sdl_android/bintray.properties4
-rw-r--r--android/sdl_android/build.gradle2
-rw-r--r--javaEE/bintray.gradle11
-rw-r--r--javaEE/build.gradle2
-rw-r--r--javaSE/bintray.gradle9
-rw-r--r--javaSE/build.gradle2
-rw-r--r--javaSE/src/main/java/com/smartdevicelink/BuildConfig.java2
9 files changed, 22 insertions, 19 deletions
diff --git a/VERSION b/VERSION
new file mode 100644
index 000000000..383c10a54
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+RC1-4.8.0 \ No newline at end of file
diff --git a/android/sdl_android/bintray.gradle b/android/sdl_android/bintray.gradle
index f4969df2c..e8dce117d 100644
--- a/android/sdl_android/bintray.gradle
+++ b/android/sdl_android/bintray.gradle
@@ -6,6 +6,8 @@ def siteUrl = 'https://github.com/smartdevicelink/sdl_android' // Homepage
def gitUrl = 'https://github.com/smartdevicelink/sdl_android.git' // Git repository URL
group = "com.smartdevicelink" // Maven Group ID for the artifact
def libDescription = 'SmartDeviceLink mobile library for Android'
+def libVersion = new File(projectDir.path, ('/../../VERSION')).text.trim()
+
install {
repositories.mavenInstaller {
@@ -51,7 +53,7 @@ bintray {
// Authorization
user = props.getProperty("bintray.user")
key = props.getProperty("bintray.key")
- version = props.getProperty("bintray.version")
+ version = libVersion
configurations = ['archives']
pkg {
repo = props.getProperty("bintray.repo")
@@ -62,10 +64,10 @@ 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 = libVersion // Change to release version
desc = libDescription
released = new Date() // Will be the current date & time
- vcsTag = props.getProperty("bintray.vcs") // Should match git tag
+ vcsTag = libVersion // Should match git tag
}
}
} \ No newline at end of file
diff --git a/android/sdl_android/bintray.properties b/android/sdl_android/bintray.properties
index 760f99904..05fe732b1 100644
--- a/android/sdl_android/bintray.properties
+++ b/android/sdl_android/bintray.properties
@@ -3,6 +3,4 @@ bintray.key=apikey
bintray.repo=sdl_android
bintray.artifact=sdl_android
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/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 807104d56..cce904a1c 100644
--- a/android/sdl_android/build.gradle
+++ b/android/sdl_android/build.gradle
@@ -6,7 +6,7 @@ android {
minSdkVersion 8
targetSdkVersion 26
versionCode 11
- versionName "RC1-4.8.0"
+ versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
}
diff --git a/javaEE/bintray.gradle b/javaEE/bintray.gradle
index f151bb9be..90ad4967e 100644
--- a/javaEE/bintray.gradle
+++ b/javaEE/bintray.gradle
@@ -6,6 +6,7 @@ def siteUrl = 'https://github.com/smartdevicelink/sdl_android' // Homepage
def gitUrl = 'https://github.com/smartdevicelink/sdl_android.git' // Git repository URL
group = "com.smartdevicelink" // Maven Group ID for the artifact
def libDescription = 'SmartDeviceLink mobile library'
+def libVersion = new File(projectDir.path, ('/../VERSION')).text.trim()
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
@@ -30,7 +31,7 @@ bintray {
// Authorization
user = props.getProperty("bintray.user")
key = props.getProperty("bintray.key")
- version = "$project.version"
+ version = libVersion
publications = ['mavenPublication']
@@ -43,10 +44,10 @@ bintray {
licenses = ["BSD 3-Clause"]
publish = props.getProperty("bintray.publish") // Will upload to jCenter
version {
- name = "$project.version" // Change to release version
+ name = libVersion // Change to release version
desc = libDescription
released = new Date() // Will be the current date & time
- vcsTag = props.getProperty("bintray.vcs") // Should match git tag
+ vcsTag = libVersion // Should match git tag
}
}
}
@@ -54,7 +55,7 @@ bintray {
def pomConfig = {
Properties props = new Properties()
props.load(new FileInputStream("$projectDir/bintray.properties"))
-
+
licenses {
license {
name 'BSD 3-Clause'
@@ -83,7 +84,7 @@ publishing {
}
groupId props.getProperty("bintray.userorg")
artifactId props.getProperty("bintray.artifact")
- version "$project.version"
+ version libVersion
pom.withXml {
def root = asNode()
root.appendNode('description', libDescription)
diff --git a/javaEE/build.gradle b/javaEE/build.gradle
index 518531a5a..da4f0d716 100644
--- a/javaEE/build.gradle
+++ b/javaEE/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'java-library'
group 'com.smartdevicelink'
-version 'RC1-4.8.0'
+version new File(projectDir.path, ('/../VERSION')).text.trim()
sourceCompatibility = 1.7
diff --git a/javaSE/bintray.gradle b/javaSE/bintray.gradle
index f151bb9be..ec7dee771 100644
--- a/javaSE/bintray.gradle
+++ b/javaSE/bintray.gradle
@@ -6,6 +6,7 @@ def siteUrl = 'https://github.com/smartdevicelink/sdl_android' // Homepage
def gitUrl = 'https://github.com/smartdevicelink/sdl_android.git' // Git repository URL
group = "com.smartdevicelink" // Maven Group ID for the artifact
def libDescription = 'SmartDeviceLink mobile library'
+def libVersion = new File(projectDir.path, ('/../VERSION')).text.trim()
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
@@ -30,7 +31,7 @@ bintray {
// Authorization
user = props.getProperty("bintray.user")
key = props.getProperty("bintray.key")
- version = "$project.version"
+ version = libVersion
publications = ['mavenPublication']
@@ -43,10 +44,10 @@ bintray {
licenses = ["BSD 3-Clause"]
publish = props.getProperty("bintray.publish") // Will upload to jCenter
version {
- name = "$project.version" // Change to release version
+ name = libVersion // Change to release version
desc = libDescription
released = new Date() // Will be the current date & time
- vcsTag = props.getProperty("bintray.vcs") // Should match git tag
+ vcsTag = libVersion // Should match git tag
}
}
}
@@ -83,7 +84,7 @@ publishing {
}
groupId props.getProperty("bintray.userorg")
artifactId props.getProperty("bintray.artifact")
- version "$project.version"
+ version libVersion
pom.withXml {
def root = asNode()
root.appendNode('description', libDescription)
diff --git a/javaSE/build.gradle b/javaSE/build.gradle
index 88ddaea6f..0db1e309e 100644
--- a/javaSE/build.gradle
+++ b/javaSE/build.gradle
@@ -1,7 +1,7 @@
apply plugin: 'java-library'
group 'com.smartdevicelink'
-version 'RC1-4.8.0'
+version new File(projectDir.path, ('/../VERSION')).text.trim()
sourceCompatibility = 1.7
diff --git a/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java b/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
index 52a8868e7..177977930 100644
--- a/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
+++ b/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
@@ -1,5 +1,5 @@
package com.smartdevicelink;
public final class BuildConfig {
- public static final String VERSION_NAME = "4.7.2";
+ public static final String VERSION_NAME = "RC1-4.8.0";
} \ No newline at end of file
View Lorry Controller Status