provide a Scarlet.Builder extension method to force the default platform

CruGlobal · Sep 25, 2024 · 03de060 · 03de060
1 parent dd15a60
commit 03de060
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 0 deletions.
diff --git a/gto-support-scarlet/build.gradle.kts b/gto-support-scarlet/build.gradle.kts
@@ -11,5 +11,6 @@ dependencies {
     api(libs.scarlet.core)
     compileOnly(libs.scarlet)
 
+    implementation(project(":gto-support-util"))
     implementation(libs.okio)
 }
diff --git a/...ort-scarlet/src/main/java/com/tinder/scarlet/internal/utils/RuntimePlatformInternals.java b/...ort-scarlet/src/main/java/com/tinder/scarlet/internal/utils/RuntimePlatformInternals.java
@@ -0,0 +1,12 @@
+package com.tinder.scarlet.internal.utils;
+
+import androidx.annotation.NonNull;
+
+class RuntimePlatformInternals {
+    /** @noinspection KotlinInternalInJava*/
+    @NonNull
+    @SuppressWarnings("MethodName")
+    static RuntimePlatform Default() {
+        return new RuntimePlatform.Default();
+    }
+}
diff --git a/gto-support-scarlet/src/main/kotlin/com/tinder/scarlet/ScarletBuilderInternals.kt b/gto-support-scarlet/src/main/kotlin/com/tinder/scarlet/ScarletBuilderInternals.kt
@@ -0,0 +1,12 @@
+package com.tinder.scarlet
+
+import org.ccci.gto.android.common.util.getDeclaredFieldOrNull
+import org.ccci.gto.android.common.util.getOrNull
+
+private val platformField = getDeclaredFieldOrNull<Scarlet.Builder>("platform")
+
+internal var Scarlet.Builder.platform: Any?
+    get() = platformField?.getOrNull(this)
+    set(value) {
+        platformField?.set(this, requireNotNull(value))
+    }
diff --git a/...ort-scarlet/src/main/kotlin/com/tinder/scarlet/internal/utils/RuntimePlatformInternals.kt b/...ort-scarlet/src/main/kotlin/com/tinder/scarlet/internal/utils/RuntimePlatformInternals.kt
@@ -0,0 +1,3 @@
+package com.tinder.scarlet.internal.utils
+
+internal fun defaultPlatform() = RuntimePlatformInternals.Default()
diff --git a/gto-support-scarlet/src/main/kotlin/org/ccci/gto/android/common/scarlet/ScarletBuilder.kt b/gto-support-scarlet/src/main/kotlin/org/ccci/gto/android/common/scarlet/ScarletBuilder.kt
@@ -0,0 +1,15 @@
+package org.ccci.gto.android.common.scarlet
+
+import com.tinder.scarlet.Scarlet
+import com.tinder.scarlet.internal.utils.defaultPlatform
+import com.tinder.scarlet.platform
+
+/**
+ * Scarlet improperly detects desugared Android apps as the Java 8 runtime.
+ * This method will force the default platform for Scarlet to be used.
+ *
+ * See:
+ * https://github.com/Tinder/Scarlet/issues/235
+ * https://issuetracker.google.com/issues/342419066
+ */
+fun Scarlet.Builder.forceDefaultPlatform() = apply { platform = defaultPlatform() }