Skip to content

Commit a826222

Browse files
committed
Upgrade project
1 parent 45fe881 commit a826222

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

benchmark/src/main/kotlin/com/maximillianleonov/cinemax/benchmark/BaselineProfileGenerator.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,23 @@
1616

1717
package com.maximillianleonov.cinemax.benchmark
1818

19-
import androidx.benchmark.macro.ExperimentalBaselineProfilesApi
19+
import android.os.Build
20+
import androidx.annotation.RequiresApi
2021
import androidx.benchmark.macro.junit4.BaselineProfileRule
2122
import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
2223
import com.maximillianleonov.cinemax.benchmark.util.PackageName
2324
import org.junit.Rule
2425
import org.junit.Test
2526
import org.junit.runner.RunWith
2627

27-
@OptIn(ExperimentalBaselineProfilesApi::class)
28+
@RequiresApi(Build.VERSION_CODES.P)
2829
@RunWith(AndroidJUnit4ClassRunner::class)
2930
class BaselineProfileGenerator {
3031
@get:Rule
3132
val baselineProfileRule = BaselineProfileRule()
3233

3334
@Test
34-
fun generate() = baselineProfileRule.collectBaselineProfile(packageName = PackageName) {
35+
fun generate() = baselineProfileRule.collect(packageName = PackageName) {
3536
pressHome()
3637
startActivityAndWait()
3738
}

build-logic/plugins/convention/src/main/kotlin/com/maximillianleonov/cinemax/AndroidCompose.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.gradle.kotlin.dsl.dependencies
2323
/**
2424
* Configure Compose-specific options.
2525
*/
26-
internal fun Project.configureAndroidCompose(commonExtension: CommonExtension<*, *, *, *, *>) =
26+
internal fun Project.configureAndroidCompose(commonExtension: CommonExtension<*, *, *, *, *, *>) =
2727
with(commonExtension) {
2828
defaultConfig.vectorDrawables.useSupportLibrary = true
2929
buildFeatures.compose = true

build-logic/plugins/convention/src/main/kotlin/com/maximillianleonov/cinemax/KotlinAndroid.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
2525
/**
2626
* Configure base Kotlin with Android options.
2727
*/
28-
internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension<*, *, *, *, *>) =
28+
internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension<*, *, *, *, *, *>) =
2929
with(commonExtension) {
3030
compileSdk = libs.versions.android.compileSdk.get().toInt()
3131

@@ -47,5 +47,5 @@ internal fun Project.configureKotlinAndroid(commonExtension: CommonExtension<*,
4747
dependencies.add("coreLibraryDesugaring", libs.desugar.jdk.libs)
4848
}
4949

50-
private fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) =
50+
private fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) =
5151
(this as ExtensionAware).extensions.configure("kotlinOptions", block)

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ android-compileSdk = "34"
33
android-minSdk = "21"
44
android-targetSdk = "34"
55

6-
kotlin = "1.9.24"
6+
kotlin = "1.9.23"
77
android-gradle-plugin = "8.4.0"
8-
ksp = "1.9.24-1.0.20"
8+
ksp = "1.9.23-1.0.20"
99
spotless = "6.25.0"
1010
detekt = "1.23.6"
1111
kode-detekt-rules-compose = "1.3.0"

0 commit comments

Comments
 (0)