diff options
| author | Bilal Alsharifi <599206+bilal-alsharifi@users.noreply.github.com> | 2021-11-16 10:57:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 10:57:26 -0500 |
| commit | 93280da174fd5fddab071cd1179a2276d32b97bb (patch) | |
| tree | 27f582b7839ae4c5d10f53aa7ccb7181f4bf931c | |
| parent | 0bda03437ed79d1e4890060ff9a816db3ccd5251 (diff) | |
| download | sdl_android-93280da174fd5fddab071cd1179a2276d32b97bb.tar.gz | |
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
| -rw-r--r-- | android/sdl_android/build.gradle | 2 | ||||
| -rw-r--r-- | android/sdl_android/gradle.properties | 1 | ||||
| -rw-r--r-- | javaEE/javaEE/build.gradle | 1 | ||||
| -rw-r--r-- | javaEE/javaEE/gradle.properties | 1 | ||||
| -rw-r--r-- | javaSE/javaSE/build.gradle | 1 | ||||
| -rw-r--r-- | 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 |