From f6f920c3a3d4314c0d65a0b52de4098befc3a3f7 Mon Sep 17 00:00:00 2001 From: Mozart Louis Date: Mon, 23 Sep 2024 15:20:10 -0400 Subject: [PATCH 1/2] Fix build crash issue due to sample fail --- .github/workflows/build.yml | 2 +- app/build.gradle.kts | 4 ++-- build.gradle.kts | 2 +- gradle/libs.versions.toml | 2 ++ .../platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1fed3139..592bd75a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: timeout-minutes: 55 strategy: matrix: - api-level: [34] + api-level: [35] steps: - name: Delete unnecessary tools 🔧 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4e383b1e..39f68564 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -30,12 +30,12 @@ java { android { namespace = "com.example.platform.app" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.example.platform.app" minSdk = 21 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" diff --git a/build.gradle.kts b/build.gradle.kts index 292f0233..4411e036 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -15,7 +15,7 @@ */ buildscript { dependencies { - classpath("de.undercouch:gradle-download-task:4.1.2") + classpath(libs.gradle.download.task) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4d421fed..a710f81c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -21,6 +21,7 @@ androidx-window = "1.2.0" agp = "8.5.2" casa = "0.5.1" coil = "2.4.0" +gradleDownloadTask = "4.1.2" ksp = "1.9.22-1.0.17" compose-bom = "2024.02.00" composeCompiler = "1.5.9" @@ -96,6 +97,7 @@ coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" } google-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" } +gradle-download-task = { module = "de.undercouch:gradle-download-task", version.ref = "gradleDownloadTask" } hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } hilt-compiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" } hilt-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" } diff --git a/samples/graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt b/samples/graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt index becc8c74..a17781fc 100644 --- a/samples/graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt +++ b/samples/graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt @@ -70,7 +70,7 @@ class UltraHDRWithOpenGL : Fragment(), } companion object { - fun fromInt(value: Int) = ExtendedBrightnessValue.values().first { it.value == value } + fun fromInt(value: Int) = entries.first { it.value == value } } } From 7df4c2243a251c83c265f2ca5ff422654fba5a50 Mon Sep 17 00:00:00 2001 From: Mozart Louis Date: Tue, 24 Sep 2024 14:41:58 -0400 Subject: [PATCH 2/2] Switch to API 34 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 592bd75a..1fed3139 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: timeout-minutes: 55 strategy: matrix: - api-level: [35] + api-level: [34] steps: - name: Delete unnecessary tools 🔧