Enable java 8 features on android < 26 (#1035)

Co-authored-by: Gaëtan Muller <[email protected]>

Author: StaehliJ

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidApplicationPlugin.kt

@@ -9,10 +9,12 @@ import ch.srgssr.pillarbox.gradle.internal.VersionConfig
 import ch.srgssr.pillarbox.gradle.internal.configureAndroidLintModule
 import ch.srgssr.pillarbox.gradle.internal.configureAndroidModule
 import ch.srgssr.pillarbox.gradle.internal.configureKotlinModule
+import ch.srgssr.pillarbox.gradle.internal.libs
 import com.android.build.api.dsl.ApplicationExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.extra
 
 /**
@@ -69,5 +71,9 @@ class PillarboxAndroidApplicationPlugin : Plugin<Project> {
                 }
             }
         }
+
+        dependencies {
+            add("coreLibraryDesugaring", libs.findLibrary("desugar_jdk_libs").get())
+        }
     }
 }

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/PillarboxAndroidLibraryPlugin.kt

@@ -6,10 +6,12 @@ package ch.srgssr.pillarbox.gradle
 
 import ch.srgssr.pillarbox.gradle.internal.configureAndroidModule
 import ch.srgssr.pillarbox.gradle.internal.configureKotlinModule
+import ch.srgssr.pillarbox.gradle.internal.libs
 import com.android.build.api.dsl.LibraryExtension
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
 
 /**
  * Custom Gradle plugin to configure an Android library module for Pillarbox.
@@ -22,7 +24,6 @@ class PillarboxAndroidLibraryPlugin : Plugin<Project> {
 
         extensions.configure<LibraryExtension> {
             configureAndroidModule(this)
-
             defaultConfig {
                 consumerProguardFiles("consumer-rules.pro")
             }
@@ -35,7 +36,10 @@ class PillarboxAndroidLibraryPlugin : Plugin<Project> {
                 }
             }
         }
-
         configureKotlinModule()
+
+        dependencies {
+            add("coreLibraryDesugaring", libs.findLibrary("desugar_jdk_libs").get())
+        }
     }
 }

build-logic/plugins/src/main/java/ch/srgssr/pillarbox/gradle/internal/ProjectExtensions.kt

@@ -26,6 +26,7 @@ internal fun Project.configureAndroidModule(extension: CommonExtension<*, *, *,
     compileOptions {
         sourceCompatibility = AppConfig.javaVersion
         targetCompatibility = AppConfig.javaVersion
+        isCoreLibraryDesugaringEnabled = true
     }
 
     buildFeatures {

docs/README.md

@@ -154,6 +154,22 @@ kotlinOptions {
 }
 ```
 
+### Support Android API < 26
+
+If your min SDK version is below 26, you have to enable library desugaring as described in the [Android documentation](https://developer.android.com/studio/write/java8-support#library-desugaring):
+
+```kotlin
+android {
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+    }
+}
+
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+}
+```
+
 ### Integrate Pillarbox
 
 To start using Pillarbox in your project, you can check each module's documentation:

gradle/libs.versions.toml

@@ -17,6 +17,7 @@ androidx-tv-material = "1.0.0"
 coil = "3.2.0"
 comscore = "6.11.1"
 dependency-analysis-gradle-plugin = "2.17.0"
+desugar_jdk_libs = "2.1.5"
 detekt = "1.23.8"
 dokka = "2.0.0"
 guava = "33.3.1-android"
@@ -68,6 +69,7 @@ coil-core = { group = "io.coil-kt.coil3", name = "coil-core", version.ref = "coi
 coil-network-cache-control = { group = "io.coil-kt.coil3", name = "coil-network-cache-control", version.ref = "coil" }
 coil-network-core = { group = "io.coil-kt.coil3", name = "coil-network-core", version.ref = "coil" }
 coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
+desugar_jdk_libs = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar_jdk_libs" }
 dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 json = { module = "org.json:json", version.ref = "json" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }

pillarbox-demo/build.gradle.kts

@@ -95,6 +95,5 @@ dependencies {
     implementation(libs.okhttp)
     implementation(libs.srg.data)
     implementation(libs.srg.dataprovider.retrofit)
-
     debugImplementation(libs.androidx.compose.ui.tooling)
 }