From 93280da174fd5fddab071cd1179a2276d32b97bb Mon Sep 17 00:00:00 2001
From: Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com>
Date: Tue, 16 Nov 2021 10:57:26 -0500
Subject: Update android, javaSE & javaEE gradle setup to read version for one
 file  (#1764)

* Move VERSION_NAME from gradle.properties to build.gradle

* Fix VERSION_NAME value in build.gradle for Android
---
 android/sdl_android/build.gradle      | 2 ++
 android/sdl_android/gradle.properties | 1 -
 javaEE/javaEE/build.gradle            | 1 +
 javaEE/javaEE/gradle.properties       | 1 -
 javaSE/javaSE/build.gradle            | 1 +
 javaSE/javaSE/gradle.properties       | 1 -
 6 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 489da844e..f3dfdfda1 100644
--- 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
index d93b695d2..d720ac795 100644
--- 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
index a97824e30..c891409a3 100644
--- 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
index 6f84e23f1..4bb0ca403 100644
--- 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
index aa97ea53a..d69a60f59 100644
--- 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
index a9e29ea87..e8c9b58c6 100644
--- 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
-- 
cgit v1.2.1