small improvements

Author: Krzysztof Borowy

android/build.gradle

@@ -25,7 +25,7 @@ def getFlagOrDefault(flagName, defaultValue) {
     rootProject.hasProperty(flagName) ? rootProject.properties[flagName] == "true" : defaultValue
 }
 
-def getVersionOfDefault(String flagName, String defaultVersion) {
+def getVersionOrDefault(String flagName, String defaultVersion) {
     rootProject.hasProperty(flagName) ? rootProject.properties[flagName] : defaultVersion
 }
 
@@ -37,9 +37,7 @@ buildscript {
     // kotlin version is dictated by rootProject extension or property in gradle.properties
     ext.asyncStorageKtVersion = rootProject.ext.has('kotlinVersion')
             ? rootProject.ext['kotlinVersion']
-            : rootProject.hasProperty('AsyncStorage_kotlinVersion')
-            ? rootProject.properties['AsyncStorage_kotlinVersion']
-            : '1.5.31'
+            : getVersionOrDefault('AsyncStorage_kotlinVersion', '1.5.31')
 
     repositories {
         google()
@@ -117,13 +115,13 @@ repositories {
 dependencies {
 
     if (useNextStorage) {
-        def room_version = getVersionOfDefault('AsyncStorage_next_roomVersion', '2.3.0')
+        def room_version = getVersionOrDefault('AsyncStorage_next_roomVersion', '2.3.0')
         def coroutines_version = "1.5.2"
         def coroutinesTest_version = "1.5.2"
         // if we don't provide explicit dependency on reflection, kotlin plugin
         // would add one automatically, probably a version that is not compatible with
         // used kotlin
-        def kotlinReflect_version = "1.5.31"
+        def kotlinReflect_version = project.ext.asyncStorageKtVersion
         def junit_version = "4.12"
         def robolectric_version = "4.5.1"
         def truth_version = "1.1.2"

example/android/build.gradle

@@ -42,6 +42,8 @@ buildscript {
         mavenCentral()
         jcenter()
     }
+    ext.kotlinVersion = '1.5.31'
+
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"