Update android, javaSE & javaEE gradle setup to read version for one file (#1764)

bilal-alsharifi · web-flow · commit 93280da174fd · 2021-11-16T10:57:26.000-05:00
* Move VERSION_NAME from gradle.properties to build.gradle

* Fix VERSION_NAME value in build.gradle for Android
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
@@ -40,6 +40,8 @@ android {
     }
 }
 
+ext { VERSION_NAME = "$project.android.defaultConfig.versionName" }
+
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
     //api 'com.livio.taskmaster:taskmaster:0.6.0'
diff --git a/android/sdl_android/gradle.properties b/android/sdl_android/gradle.properties
@@ -1,6 +1,5 @@
 GROUP=com.smartdevicelink
 POM_ARTIFACT_ID=sdl_android
-VERSION_NAME=5.3.0
 
 POM_NAME=sdl_android
 POM_PACKAGING=aar
diff --git a/javaEE/javaEE/build.gradle b/javaEE/javaEE/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'java-library'
 
 group 'com.smartdevicelink'
 version new File(projectDir.path, ('/../../VERSION')).text.trim()
+ext { VERSION_NAME = "$project.version" }
 
 sourceCompatibility = 1.7
 
diff --git a/javaEE/javaEE/gradle.properties b/javaEE/javaEE/gradle.properties
@@ -1,6 +1,5 @@
 GROUP=com.smartdevicelink
 POM_ARTIFACT_ID=sdl_java_ee
-VERSION_NAME=5.3.0
 
 POM_NAME=sdl_java_ee
 POM_PACKAGING=jar
diff --git a/javaSE/javaSE/build.gradle b/javaSE/javaSE/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'java-library'
 
 group 'com.smartdevicelink'
 version new File(projectDir.path, ('/../../VERSION')).text.trim()
+ext { VERSION_NAME = "$project.version" }
 
 sourceCompatibility = 1.7
 
diff --git a/javaSE/javaSE/gradle.properties b/javaSE/javaSE/gradle.properties
@@ -1,6 +1,5 @@
 GROUP=com.smartdevicelink
 POM_ARTIFACT_ID=sdl_java_se
-VERSION_NAME=5.3.0
 
 POM_NAME=sdl_java_se
 POM_PACKAGING=jar

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ android {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ext { VERSION_NAME = "$project.android.defaultConfig.versionName" }`
	`44`	`+`
`43`	`45`	`dependencies {`
`44`	`46`	`api fileTree(dir: 'libs', include: ['*.jar'])`
`45`	`47`	`//api 'com.livio.taskmaster:taskmaster:0.6.0'`