Allow use of Kotlin version from parent project (#164)

Co-authored-by: Karen Tamayo <[email protected]>
Tealium · Nov 16, 2023 · bda7ade · bda7ade
1 parent a8c2ef3
commit bda7ade
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 16 deletions.
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -8,7 +8,8 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 33
         targetSdkVersion = 33
-        kotlin_version = '1.8.22'
+        kotlinVersion = '1.8.22'
+        // kotlin_version = '1.8.22'
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
     }
@@ -20,7 +21,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:7.3.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("de.undercouch:gradle-download-task:5.0.1")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

diff --git a/modules/adobe-visitor/android/build.gradle b/modules/adobe-visitor/android/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-android'
 
 buildscript {
   ext {
-    kotlinVersion = '1.6.0'
+    kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
   }
 
   if (project == rootProject) {

diff --git a/modules/adobe-visitor/package.json b/modules/adobe-visitor/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-native-adobe-visitor",
   "title": "Tealium React Native Adobe Visitor Service",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A native module for using Tealium's Adobe Visitor Service module for Kotlin and Swift libraries.",
   "main": "index.js",
   "types": "*.ts",

diff --git a/modules/crash-reporter/android/build.gradle b/modules/crash-reporter/android/build.gradle
@@ -12,7 +12,7 @@ apply plugin: 'kotlin-android'
 
 buildscript {
   ext {
-    kotlinVersion = '1.6.0'
+    kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
   }
 
   if (project == rootProject) {

diff --git a/modules/crash-reporter/package.json b/modules/crash-reporter/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-native-crash-reporter",
   "title": "Tealium React Native Crash Reporter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "A native module for using Tealium's Crash Reporter Module for Kotlin and Swift libraries.",
   "main": "index.js",
   "types": "*.ts",

diff --git a/modules/location/android/build.gradle b/modules/location/android/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'kotlin-android'
 buildscript {
 
     ext {
-        kotlinVersion = '1.6.0'
+        kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
     }
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a

diff --git a/modules/location/package.json b/modules/location/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-native-location",
   "title": "Tealium React Native Location",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "A native module for using Tealium's Location Module for Kotlin and Swift libraries.",
   "main": "index.js",
   "types": "*.ts",

diff --git a/npm-package/android/build.gradle b/npm-package/android/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'kotlin-android'
 buildscript {
 
     ext {
-        kotlinVersion = '1.6.0'
+        kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
     }
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a

diff --git a/npm-package/package.json b/npm-package/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-native",
   "title": "Tealium React Native",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "A native module for using Tealium's Kotlin and Swift libraries.",
   "main": "index.js",
   "types": "*.ts",

diff --git a/remotecommands/tealium-react-adjust/android/build.gradle b/remotecommands/tealium-react-adjust/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 //  def kotlin_version = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : project.properties['TealiumReactAdjust_kotlinVersion']
 
   ext {
-    kotlinVersion = '1.6.0'
+    kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
   }
 
   if (project == rootProject) {

diff --git a/remotecommands/tealium-react-adjust/package.json b/remotecommands/tealium-react-adjust/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-adjust",
   "title": "Tealium React Adjust",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Package to support the Tealium Adjust Remote Command",
   "main": "index.js",
   "files": [

diff --git a/remotecommands/tealium-react-braze/android/build.gradle b/remotecommands/tealium-react-braze/android/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'kotlin-android'
 buildscript {
 
     ext {
-        kotlinVersion = '1.6.0'
+        kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
     }
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a

diff --git a/remotecommands/tealium-react-braze/package.json b/remotecommands/tealium-react-braze/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-braze",
   "title": "Tealium React Braze",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Package to support the Tealium Braze Remote Command integration",
   "main": "index.js",
   "files": [

diff --git a/remotecommands/tealium-react-firebase/android/build.gradle b/remotecommands/tealium-react-firebase/android/build.gradle
@@ -13,7 +13,7 @@ apply plugin: 'kotlin-android'
 buildscript {
 
     ext {
-        kotlinVersion = '1.6.0'
+        kotlinVersion = rootProject.ext.has('kotlinVersion') ? rootProject.ext.get('kotlinVersion') : '1.6.0'
     }
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a

diff --git a/remotecommands/tealium-react-firebase/package.json b/remotecommands/tealium-react-firebase/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tealium-react-firebase",
   "title": "Tealium React Firebase",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Package to support the Tealium Firebase Remote Command integration",
   "main": "index.js",
   "files": [