Merge branch 'main' into 3.x

* main: Update to compile SDK 34. (#1830) Update ktlint to 0.50.0. (#1829)
coil-kt · Jul 26, 2023 · 041ba30 · 041ba30
2 parents c62436d + 043964a
commit 041ba30
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 7 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -14,10 +14,15 @@ ij_kotlin_allow_trailing_comma_on_call_site=true
 ij_kotlin_imports_layout=*
 
 ktlint_standard_annotation=disabled
-ktlint_standard_argument-list-wrapping=disabled
 ktlint_standard_filename=disabled
 ktlint_standard_indent=disabled
 ktlint_standard_max-line-length=disabled
-ktlint_standard_parameter-list-wrapping=disabled
 ktlint_standard_spacing-between-declarations-with-annotations=disabled
+
 ktlint_standard_wrapping=disabled
+ktlint_standard_parameter-wrapping=disabled
+ktlint_standard_property-wrapping=disabled
+ktlint_standard_argument-list-wrapping=disabled
+ktlint_standard_parameter-list-wrapping=disabled
+ktlint_standard_trailing-comma-on-call-site=disabled
+ktlint_standard_trailing-comma-on-declaration-site=disabled
diff --git a/coil-base/src/androidMain/kotlin/coil/util/bitmaps.kt b/coil-base/src/androidMain/kotlin/coil/util/bitmaps.kt
@@ -37,7 +37,11 @@ internal val Bitmap.allocationByteCountCompat: Int
 internal val Bitmap.Config.isHardware: Boolean
     get() = SDK_INT >= 26 && this == Bitmap.Config.HARDWARE
 
-/** Guard against null bitmap configs, which can occur on earlier API levels. */
+/**
+ * Guard against null bitmap configs.
+ *
+ * Don't believe the nullability annotation: [Bitmap.getConfig] is null for static GIF images.
+ */
 @Suppress("USELESS_ELVIS")
 internal val Bitmap.safeConfig: Bitmap.Config
     get() = config ?: Bitmap.Config.ARGB_8888

diff --git a/coil-base/src/androidUnitTest/kotlin/coil/disk/DiskLruCacheTest.kt b/coil-base/src/androidUnitTest/kotlin/coil/disk/DiskLruCacheTest.kt
@@ -34,11 +34,14 @@ import okio.fakefilesystem.FakeFileSystem
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
 
 /**
  * Derived from OkHttp's DiskLruCache tests:
  * https://github.com/square/okhttp/blob/master/okhttp/src/jvmTest/java/okhttp3/internal/cache/DiskLruCacheTest.kt
  */
+@RunWith(RobolectricTestRunner::class)
 class DiskLruCacheTest {
 
     private lateinit var fileSystem: FaultyFileSystem

diff --git a/coil-base/src/test/resources/robolectric.properties b/coil-base/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=33
diff --git a/coil-benchmark/src/main/java/coil/benchmark/BaselineProfileGenerator.kt b/coil-benchmark/src/main/java/coil/benchmark/BaselineProfileGenerator.kt
@@ -19,7 +19,7 @@ class BaselineProfileGenerator {
     val baselineProfileRule = BaselineProfileRule()
 
     @Test
-    fun generate() = baselineProfileRule.collectBaselineProfile(
+    fun generate() = baselineProfileRule.collect(
         packageName = "sample.$PROJECT",
         filterPredicate = newFilterPredicate(),
     ) {

diff --git a/coil-gif/src/test/resources/robolectric.properties b/coil-gif/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=33
diff --git a/coil-singleton/src/test/resources/robolectric.properties b/coil-singleton/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=33
diff --git a/coil-test-roborazzi/src/test/resources/robolectric.properties b/coil-test-roborazzi/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=33
diff --git a/coil-test/src/test/resources/robolectric.properties b/coil-test/src/test/resources/robolectric.properties
@@ -0,0 +1 @@
+sdk=33
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,7 @@
 org.gradle.jvmargs=-Xmx6g -Dfile.encoding=UTF-8
 
-# AndroidX
+# Android
+android.suppressUnsupportedCompileSdk=34
 android.useAndroidX=true
 
 # Disable welcome message.

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidx-compose-compiler = "1.5.0"
 coroutines = "1.7.3"
 jetbrains-compose = "1.4.3"
 jetbrains-compose-compiler = "1.5.0"
-ktlint = "0.48.2"
+ktlint = "0.50.0"
 okio = "3.4.0"
 roborazzi = "1.3.0"
 
@@ -30,7 +30,7 @@ androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
 androidx-appcompat-resources = "androidx.appcompat:appcompat-resources:1.6.1"
 androidx-annotation = "androidx.annotation:annotation:1.6.0"
-androidx-benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha15"
+androidx-benchmark-macro = "androidx.benchmark:benchmark-macro-junit4:1.2.0-beta01"
 androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4"
 androidx-core = "androidx.core:core-ktx:1.10.1"
 androidx-exifinterface = "androidx.exifinterface:exifinterface:1.3.6"