Replace "java.util.Optional" String with class.java.name to prevent… (

#89) * Replace "java.util.Optional" String with `class.java.name` to prevent conflicts when desugaring Set `enable`. * Increase Jfrog builder version from 4.11.0 to 4.23.4 --------- Co-authored-by: Ehsan Mohit <[email protected]>
gojek · Nov 11, 2024 · cee9bf7 · cee9bf7
1 parent 18ab014
commit cee9bf7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/buildSrc/src/main/kotlin/deps.kt b/buildSrc/src/main/kotlin/deps.kt
@@ -134,4 +134,4 @@ object deps {
         const val runtime = "androidx.work:work-runtime:${versions.workManager}"
         const val runtime_2_6_0 = "androidx.work:work-runtime:2.6.0"
     }
-}
+}
diff --git a/courier/src/main/java/com/gojek/courier/utils/RuntimePlatform.kt b/courier/src/main/java/com/gojek/courier/utils/RuntimePlatform.kt
@@ -1,7 +1,10 @@
 package com.gojek.courier.utils
 
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
 import java.lang.invoke.MethodHandles.Lookup
 import java.lang.reflect.Method
+import java.util.Optional
 
 internal sealed class RuntimePlatform {
 
@@ -43,8 +46,12 @@ internal sealed class RuntimePlatform {
         fun get(): RuntimePlatform = PLATFORM
 
         private fun findPlatform(): RuntimePlatform = try {
-            Class.forName("java.util.Optional")
-            Java8()
+            if (VERSION.SDK_INT >= VERSION_CODES.N) {
+                Class.forName(Optional::class.java.name)
+                Java8()
+            } else {
+                Default()
+            }
         } catch (ignored: ClassNotFoundException) {
             Default()
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,4 +134,4 @@ object deps { @@
             const val runtime = "androidx.work:work-runtime:${versions.workManager}"
             const val runtime_2_6_0 = "androidx.work:work-runtime:2.6.0"
         }
-    }
+    }