Skip to content

Commit cee9bf7

Browse files
MohammadEhsanMohitEhsan Mohit
andauthored
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 <mohammadehsan.mohit@snapp.cab>
1 parent 18ab014 commit cee9bf7

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

buildSrc/src/main/kotlin/deps.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,4 +134,4 @@ object deps {
134134
const val runtime = "androidx.work:work-runtime:${versions.workManager}"
135135
const val runtime_2_6_0 = "androidx.work:work-runtime:2.6.0"
136136
}
137-
}
137+
}

courier/src/main/java/com/gojek/courier/utils/RuntimePlatform.kt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package com.gojek.courier.utils
22

3+
import android.os.Build.VERSION
4+
import android.os.Build.VERSION_CODES
35
import java.lang.invoke.MethodHandles.Lookup
46
import java.lang.reflect.Method
7+
import java.util.Optional
58

69
internal sealed class RuntimePlatform {
710

@@ -43,8 +46,12 @@ internal sealed class RuntimePlatform {
4346
fun get(): RuntimePlatform = PLATFORM
4447

4548
private fun findPlatform(): RuntimePlatform = try {
46-
Class.forName("java.util.Optional")
47-
Java8()
49+
if (VERSION.SDK_INT >= VERSION_CODES.N) {
50+
Class.forName(Optional::class.java.name)
51+
Java8()
52+
} else {
53+
Default()
54+
}
4855
} catch (ignored: ClassNotFoundException) {
4956
Default()
5057
}

0 commit comments

Comments
 (0)