clean up

Author: jaeopt

android-sdk/build.gradle

@@ -100,7 +100,7 @@ dependencies {
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.google.code.gson:gson:$gson_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 

build.gradle

@@ -76,6 +76,17 @@ allprojects {
     configurations.all {
         // no cache for SNAPSHOT dependency
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+        
+        // Exclude conflicting kotlin stdlib versions
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'org.jetbrains.kotlin') {
+                if (details.requested.name == 'kotlin-stdlib-jdk8' || 
+                    details.requested.name == 'kotlin-stdlib-jdk7') {
+                    details.useTarget "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+                    details.because 'Unified kotlin stdlib to avoid conflicts'
+                }
+            }
+        }
     }
 }
 

datafile-handler/build.gradle

@@ -64,5 +64,5 @@ dependencies {
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

event-handler/build.gradle

@@ -72,6 +72,6 @@ dependencies {
     androidTestImplementation "org.mockito:mockito-android:$mockito_ver"
     androidTestImplementation "com.noveogroup.android:android-logger:$android_logger_ver"
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 

odp/build.gradle

@@ -48,7 +48,7 @@ android {
 dependencies {
     api project(':shared')
     implementation "androidx.annotation:annotation:$annotations_ver"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "androidx.work:work-runtime:$work_runtime"
     // Add SLF4J API for Logger interface
     implementation "org.slf4j:slf4j-api:$slf4j_ver"

shared/build.gradle

@@ -50,7 +50,7 @@ dependencies {
     }
 
     implementation "androidx.annotation:annotation:$annotations_ver"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "androidx.work:work-runtime:$work_runtime"
     // the default json parser for java-sdk core-api (app can exclude it to replace with other parsers)
     implementation "com.google.code.gson:gson:$gson_ver"

test-app/build.gradle

@@ -96,6 +96,6 @@ dependencies {
     androidTestImplementation project(':android-sdk')
     androidTestImplementation project(path: ':shared')
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 

user-profile/build.gradle

@@ -45,7 +45,7 @@ dependencies {
     api project(':shared')
 
     implementation "androidx.annotation:annotation:$annotations_ver"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
     compileOnly "com.noveogroup.android:android-logger:$android_logger_ver"