From b12a6bce92ff6ab5927d1af5a8c50798f9a6d951 Mon Sep 17 00:00:00 2001 From: HyunWoo Lee Date: Fri, 1 Nov 2024 02:57:38 +0900 Subject: [PATCH] Bump target SDK to 35, min SDK to 30 --- baselineprofile/build.gradle.kts | 12 ++++++------ .../stamp/feature/mission/list/MissionListScreen.kt | 6 ++---- gradle/libs.versions.toml | 6 +++--- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/baselineprofile/build.gradle.kts b/baselineprofile/build.gradle.kts index e117fa31b..c86303ac9 100644 --- a/baselineprofile/build.gradle.kts +++ b/baselineprofile/build.gradle.kts @@ -32,7 +32,7 @@ plugins { android { namespace = "org.sopt.official.baselineprofile" - compileSdk = 34 + compileSdk = libs.versions.compileSdk.get().toInt() compileOptions { sourceCompatibility = JavaVersion.VERSION_17 @@ -44,8 +44,8 @@ android { } defaultConfig { - minSdk = 28 - targetSdk = 34 + minSdk = libs.versions.minSdk.get().toInt() + targetSdk = libs.versions.targetSdk.get().toInt() testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -56,9 +56,9 @@ android { // To use GMD please invoke generation through the command line: // ./gradlew :app:generateBaselineProfile testOptions.managedDevices.devices { - create("pixel6Api34") { + create("pixel6Api35") { device = "Pixel 6" - apiLevel = 34 + apiLevel = 35 systemImageSource = "google" } } @@ -67,7 +67,7 @@ android { // This is the configuration block for the Baseline Profile plugin. // You can specify to run the generators on a managed devices or connected devices. baselineProfile { - managedDevices += "pixel6Api34" + managedDevices += "pixel6Api35" useConnectedDevices = false } diff --git a/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/list/MissionListScreen.kt b/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/list/MissionListScreen.kt index 59c447be4..8ece624ca 100644 --- a/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/list/MissionListScreen.kt +++ b/feature/soptamp/src/main/java/org/sopt/official/stamp/feature/mission/list/MissionListScreen.kt @@ -49,7 +49,6 @@ import androidx.compose.material3.FabPosition import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf @@ -64,7 +63,6 @@ import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.DpOffset import androidx.compose.ui.unit.dp -import androidx.core.content.ContextCompat.startActivity import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.ramcosta.composedestinations.annotation.Destination @@ -114,7 +112,6 @@ fun MissionListScreen( val context = LocalContext.current - resultRecipient.onNavResult { result -> when (result) { is NavResult.Canceled -> Unit @@ -123,6 +120,7 @@ fun MissionListScreen( } } } + SoptTheme { when (state) { MissionsState.Loading -> LoadingScreen() @@ -153,7 +151,7 @@ fun MissionListScreen( WebViewActivity.INTENT_URL, reportUrl ) - startActivity(context, this, null) + context.startActivity(this) } }, onOnboardingButtonClick = { navigator.navigate(OnboardingScreenDestination) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6ae2e8c0d..6a950e6c4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -compileSdk = "34" -minSdk = "28" -targetSdk = "34" +compileSdk = "35" +minSdk = "30" +targetSdk = "35" appVersion = "2.4.0" versionCode = "20400"